commit 2bbfc726c4840f491c8299101143cecd107948c2
Author: Thibaut Cuvelier <tcuvel...@lyx.org>
Date: Fri Nov 20 21:59:22 2020 +0100
amend 2c6537ff for C++11 compatibility
---
src/output_docbook.cpp | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index df27a64..95d6aaa 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -805,7 +805,9 @@ std::set<const Inset *>
gatherInfo(ParagraphList::const_iterator par)
} else {
auto subpar = inset->paragraphs().begin();
while (subpar != inset->paragraphs().end()) {
- values.merge(gatherInfo(subpar));
+ auto subinfos = gatherInfo(subpar);
+ for (auto & subinfo: subinfos)
+ values.insert(subinfo);
++subpar;
}
}
@@ -905,7 +907,9 @@ void outputDocBookInfo(
auto oldPar = paragraphs.iterator_at(p);
auto newPar = makeAny(text, buf, xs2, rp,
oldPar);
- infoInsets.merge(gatherInfo(oldPar));
+ auto subinfos = gatherInfo(oldPar);
+ for (auto & subinfo: subinfos)
+ infoInsets.insert(subinfo);
// Insert the indices of all the paragraphs
that were just generated (typically, one).
// **Make the hypothesis that, when an abstract
has a list, all its items are consecutive.**
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
