X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=bd7305701785929e0afe9bc9cb65aa89cb375e28;hb=f503ce67fc2d2f945a519a277c479a769c0d522c;hp=aa12dbed6783bc7f2d82ee69c111259b98830d50;hpb=97a4f77443cc0ce6d965ccb36e353d353b7209ee;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index aa12dbed67..bd73057017 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -127,7 +127,7 @@ namespace {
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-int const LYX_FORMAT = 373; // jspitzm: merge g-brief class
+int const LYX_FORMAT = 374; // rgheck: HTML output options
 
 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
@@ -2331,9 +2331,8 @@ DocIterator Buffer::firstChildPosition(Buffer const * child)
 }
 
 
-std::vector<Buffer *> Buffer::getChildren(bool grand_children) const
+void Buffer::getChildren(std::vector<Buffer *> & clist, bool grand_children) const
 {
-	std::vector<Buffer *> clist;
 	// loop over children
 	Impl::BufferPositionMap::iterator it = d->children_positions.begin();
 	Impl::BufferPositionMap::iterator end = d->children_positions.end();
@@ -2348,7 +2347,14 @@ std::vector<Buffer *> Buffer::getChildren(bool grand_children) const
 				clist.push_back(*git);
 		}
 	}
-	return clist;
+}
+
+
+std::vector<Buffer *> Buffer::getChildren(bool grand_children) const
+{
+	std::vector<Buffer *> v;
+	getChildren(v, grand_children);
+	return v;
 }