Fix bug 5802 (http://bugzilla.lyx.org/show_bug.cgi?id=5802)

[lyx.git] / src / mathed / MacroTable.cpp

diff --git a/src/mathed/MacroTable.cpp b/src/mathed/MacroTable.cpp
index babc7b6d651e403c9a8b80fbc9964a3157951d24..b2e50d119168f0d3698199faa22f68428779c6d4 100644 (file)
--- a/src/mathed/MacroTable.cpp
+++ b/src/mathed/MacroTable.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -19,17 +19,19 @@
 #include "InsetMathNest.h"
 
 #include "Buffer.h"
+#include "BufferList.h"
 #include "DocIterator.h"
 #include "InsetList.h"
 #include "Text.h"
 
 #include "support/debug.h"
-
+#include "support/FileName.h"
 #include "support/lassert.h"
 
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -67,12 +69,20 @@ void MacroData::expand(vector<MathData> const & args, MathData & to) const
 {
        updateData();
 
-       InsetMathSqrt inset; // Hack. Any inset with a cell would do.
+       // Hack. Any inset with a cell would do.
+       static Buffer * buffer = 0;
+       if (!buffer) {
+               buffer = theBufferList().newBuffer(
+               FileName::tempName().absFilename() + "_macrodata.internal");
+               buffer->setUnnamed(true);
+       }
+       static InsetMathSqrt inset;
+
        // FIXME UNICODE
        asArray(display_.empty() ? definition_ : display_, inset.cell(0));
        //lyxerr << "MathData::expand: args: " << args << endl;
        //lyxerr << "MathData::expand: ar: " << inset.cell(0) << endl;
-       for (DocIterator it = doc_iterator_begin(inset); it; it.forwardChar()) {
+       for (DocIterator it = doc_iterator_begin(buffer, &inset); it; it.forwardChar()) {
                if (!it.nextInset())
                        continue;
                if (it.nextInset()->lyxCode() != MATHMACROARG_CODE)
@@ -162,9 +172,9 @@ void MacroData::write(odocstream & os, bool overwriteRedefinition) const
        }
                
        // output template
-       MathMacroTemplate const & tmpl 
-       = static_cast<MathMacroTemplate const &>(*inset);
-       WriteStream wi(os, false, true);
+       MathMacroTemplate const & tmpl =
+               static_cast<MathMacroTemplate const &>(*inset);
+       WriteStream wi(os, false, true, false);
        tmpl.write(wi, overwriteRedefinition);
 }