anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid code duplication

Browse Source
This commit is contained in:
Enrico Forestieri 2015-06-30 19:27:38 +02:00
parent 305a712bbb
commit 2072de8349
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mathed/MathMacro.cpp
View File

@ -192,6 +192,18 @@ void MathMacro::Private::updateChildren(MathMacro * owner)
if (p) if (p)
p->setOwner(owner); p->setOwner(owner);
} }
if (macro_ && lyxrc.preview == LyXRC::PREVIEW_ON) {
// We need to update macro_ by ourselves because in this case
// MathData::metrics() is not called when selecting a math inset
DocIterator const & pos = macroBackup_.pos();
Buffer const * buf = pos.buffer();
if (buf && !theBufferList().isLoaded(buf))
buf = 0;
macro_ = buf ? buf->getMacro(owner->name(), pos) : 0;
if (!macro_)
macro_ = &macroBackup_;
}
} }
@ -204,17 +216,6 @@ MathMacro::MathMacro(MathMacro const & that)
: InsetMathNest(that), d(new Private(*that.d)) : InsetMathNest(that), d(new Private(*that.d))
{ {
d->updateChildren(this); d->updateChildren(this);
if (d->macro_ && lyxrc.preview == LyXRC::PREVIEW_ON) {
// We need to update d->macro_ by ourselves because in this case
// MathData::metrics() is not called when selecting a math inset
DocIterator const & pos = d->macroBackup_.pos();
Buffer const * buf = pos.buffer();
if (buf && !theBufferList().isLoaded(buf))
buf = 0;
d->macro_ = buf ? buf->getMacro(name(), pos) : 0;
if (!d->macro_)
d->macro_ = &d->macroBackup_;
}
} }
@ -225,17 +226,6 @@ MathMacro & MathMacro::operator=(MathMacro const & that)
InsetMathNest::operator=(that); InsetMathNest::operator=(that);
*d = *that.d; *d = *that.d;
d->updateChildren(this); d->updateChildren(this);
if (d->macro_ && lyxrc.preview == LyXRC::PREVIEW_ON) {
// We need to update d->macro_ by ourselves because in this case
// MathData::metrics() is not called when selecting a math inset
DocIterator const & pos = d->macroBackup_.pos();
Buffer const * buf = pos.buffer();
if (buf && !theBufferList().isLoaded(buf))
buf = 0;
d->macro_ = buf ? buf->getMacro(name(), pos) : 0;
if (!d->macro_)
d->macro_ = &d->macroBackup_;
}
return *this; return *this;
} }