This file failed to go in r38615 due to its still being in conflict.

Why don't you get a warning about this in QtCreator?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38617 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 615f2b02078752632c7197085933d158cee99df5..45cd9dbdc6f0f3d1c4d6a4ac99c57ada75eed43b 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -830,7 +830,7 @@ bool Buffer::readDocument(Lexer & lex)
        }
        usermacros.clear();
        updateMacros();
-       updateMacroInstances();
+       updateMacroInstances(InternalUpdate);
        return res;
 }
 
@@ -1350,7 +1350,7 @@ void Buffer::writeLaTeXSource(otexstream & os,
 
        // fold macros if possible, still with parent buffer as the
        // macros will be put in the prefix anyway.
-       updateMacroInstances();
+       updateMacroInstances(OutputUpdate);
 
        // There are a few differences between nice LaTeX and usual files:
        // usual is \batchmode and has a
@@ -1615,7 +1615,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
        updateBuffer(UpdateMaster, OutputUpdate);
        d->bibinfo_.makeCitationLabels(*this);
        updateMacros();
-       updateMacroInstances();
+       updateMacroInstances(OutputUpdate);
 
        if (!only_body) {
                os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -2920,7 +2920,7 @@ void Buffer::getUsedBranches(std::list<docstring> & result, bool const from_mast
 }
 
 
-void Buffer::updateMacroInstances() const
+void Buffer::updateMacroInstances(UpdateType utype) const
 {
        LYXERR(Debug::MACROS, "updateMacroInstances for "
                << d->filename.onlyFileName());
@@ -2938,7 +2938,7 @@ void Buffer::updateMacroInstances() const
                MacroContext mc = MacroContext(this, it);
                for (DocIterator::idx_type i = 0; i < n; ++i) {
                        MathData & data = minset->cell(i);
-                       data.updateMacros(0, mc);
+                       data.updateMacros(0, mc, utype);
                }
        }
 }
@@ -3524,7 +3524,7 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 
        // fix macros
        updateMacros();
-       updateMacroInstances();
+       updateMacroInstances(OutputUpdate);
 
        // Plain text backend
        if (backend_format == "text") {