From 06445c964e1d6ca9e405f4f2b787df21283e27f7 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Wed, 21 Jul 2010 21:58:54 +0000
Subject: [PATCH] Next step in fixing problems noted by Vincent: Remove magic
 boolean from updateMacros().

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35000 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/Buffer.cpp | 14 ++++++--------
 src/Buffer.h   |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 392efd762a..ba77061463 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -164,8 +164,7 @@ public:
 
 	/// Update macro table starting with position of it \param it in some
 	/// text inset.
-	void updateMacros(DocIterator & it, DocIterator & scope,
-			bool record_docits = false);
+	void updateMacros(DocIterator & it, DocIterator & scope);
 	///
 	void setLabel(ParIterator & it, UpdateType utype) const;
 	///
@@ -1576,7 +1575,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
 	updateBuffer(UpdateMaster, OutputUpdate);
 	checkBibInfoCache();
 	d->bibinfo_.makeCitationLabels(*this);
-	updateMacros(true);
+	updateMacros();
 	updateMacroInstances();
 
 	if (!only_body) {
@@ -2668,8 +2667,7 @@ MacroData const * Buffer::getMacro(docstring const & name,
 }
 
 
-void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope,
-		bool record_docits)
+void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope)
 {
 	pit_type const lastpit = it.lastpit();
 
@@ -2723,7 +2721,7 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope,
 				continue;
 			}
 
-			if (record_docits && iit->inset->asInsetMath()) {
+			if (doing_export && iit->inset->asInsetMath()) {
 				InsetMath * im = static_cast<InsetMath *>(iit->inset);
 				if (im->asHullInset()) {
 					InsetMathHull * hull = static_cast<InsetMathHull *>(im);
@@ -2762,7 +2760,7 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope,
 }
 
 
-void Buffer::updateMacros(bool record_docit) const
+void Buffer::updateMacros() const
 {
 	if (d->macro_lock)
 		return;
@@ -2781,7 +2779,7 @@ void Buffer::updateMacros(bool record_docit) const
 	DocIterator it = par_iterator_begin();
 	DocIterator outerScope = it;
 	outerScope.pit() = outerScope.lastpit() + 2;
-	d->updateMacros(it, outerScope, record_docit);
+	d->updateMacros(it, outerScope);
 }
 
 
diff --git a/src/Buffer.h b/src/Buffer.h
index dafb61ec88..54e66ab3dd 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -427,7 +427,7 @@ public:
 	// Macro handling
 	//
 	/// Collect macro definitions in paragraphs
-	void updateMacros(bool record_docit = false) const;
+	void updateMacros() const;
 	/// Iterate through the whole buffer and try to resolve macros
 	void updateMacroInstances() const;