Fix bug #10951.

The Buffer member for the remembered definition_ was not being set.

(cherry picked from commit f130f7713fae326daa05795a5bf4761d33aee649)

diff --git a/src/mathed/InsetMathMacro.cpp b/src/mathed/InsetMathMacro.cpp
index 3abd751d9c2b73e29f8c823f100680dd0f395fe1..3a8ec4de0acd8ddda52d837a8db8c58de56f747e 100644 (file)
--- a/src/mathed/InsetMathMacro.cpp
+++ b/src/mathed/InsetMathMacro.cpp
@@ -1318,4 +1318,10 @@ void InsetMathMacro::completionPosAndDim(Cursor const & cur, int & x, int & y,
 }
 
 
+void InsetMathMacro::setBuffer(Buffer & buffer)
+{
+       d->definition_.setBuffer(buffer);
+       InsetMathNest::setBuffer(buffer);
+}
+
 } // namespace lyx

diff --git a/src/mathed/InsetMathMacro.h b/src/mathed/InsetMathMacro.h
index 7880aa01aac570a6c621503668aa0d5c11de19e5..80340df6f761f26db52c7b9b77796676e5635d09 100644 (file)
--- a/src/mathed/InsetMathMacro.h
+++ b/src/mathed/InsetMathMacro.h
@@ -149,6 +149,8 @@ public:
        /// This is not used for display; however whether it is mathrel determines
        /// how to split equations intelligently.
        MathClass mathClass() const; //override
+       /// Override so as to set Buffer for defnition_ member, too.
+       void setBuffer(Buffer &);
 
 protected:
        friend class MathData;

diff --git a/src/mathed/MathData.h b/src/mathed/MathData.h
index 2f6ab22acd3967d76fad2b55b1405422343251a6..31bb787c98f4d82c56e14193c2358aaa4c180f3e 100644 (file)
--- a/src/mathed/MathData.h
+++ b/src/mathed/MathData.h
@@ -178,6 +178,8 @@ public:
        void updateMacros(Cursor * cur, MacroContext const & mc, UpdateType, int nesting);
        ///
        void updateBuffer(ParIterator const &, UpdateType);
+       ///
+       void setBuffer(Buffer & b) { buffer_ = &b; }
 
 protected:
        /// cached values for super/subscript placement