Avoid code duplication

diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index e772bc1b04eec024a6dceee9e0f2a2f950971af5..918a9896e66f6a009a2aa2ab4dd3942490b4a516 100644 (file)
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -192,6 +192,18 @@ void MathMacro::Private::updateChildren(MathMacro * owner)
                if (p)
                        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))
 {
        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);
        *d = *that.d;
        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;
 }