From: Richard Heck <rgheck@comcast.net>
Date: Tue, 19 Oct 2010 15:36:11 +0000 (+0000)
Subject: Make updateMacros() descend into tables. Fixes #6897.
X-Git-Tag: 2.0.0~2340
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=00e6dfb14b6ca42637b12b80afbadcb817ea3281;p=features.git

Make updateMacros() descend into tables. Fixes #6897.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35718 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index b2c3d8ddd8..c9277d642f 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -70,6 +70,7 @@
 #include "insets/InsetBibtex.h"
 #include "insets/InsetBranch.h"
 #include "insets/InsetInclude.h"
+#include "insets/InsetTabular.h"
 #include "insets/InsetText.h"
 
 #include "mathed/InsetMathHull.h"
@@ -2732,6 +2733,17 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope)
 				it.pop_back();
 				continue;
 			}
+			
+			if (iit->inset->asInsetTabular()) {
+				CursorSlice slice(*iit->inset);
+				size_t const numcells = slice.nargs();
+				for (; slice.idx() < numcells; slice.forwardIdx()) {
+					it.push_back(slice);
+					updateMacros(it, scope);
+					it.pop_back();
+				}
+				continue;
+			}
 
 			// is it an external file?
 			if (iit->inset->lyxCode() == INCLUDE_CODE) {