anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

amend 2c6537ff for C++11 compatibility

Browse Source
This commit is contained in:
Thibaut Cuvelier 2020-11-20 21:59:22 +01:00
parent 1176fab1d4
commit 2bbfc726c4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output_docbook.cpp
View File

@ -805,7 +805,9 @@ std::set<const Inset *> gatherInfo(ParagraphList::const_iterator par)
} else { } else {
auto subpar = inset->paragraphs().begin(); auto subpar = inset->paragraphs().begin();
while (subpar != inset->paragraphs().end()) { while (subpar != inset->paragraphs().end()) {
values.merge(gatherInfo(subpar)); auto subinfos = gatherInfo(subpar);
for (auto & subinfo: subinfos)
values.insert(subinfo);
++subpar; ++subpar;
} }
} }
@ -905,7 +907,9 @@ void outputDocBookInfo(
auto oldPar = paragraphs.iterator_at(p); auto oldPar = paragraphs.iterator_at(p);
auto newPar = makeAny(text, buf, xs2, rp, oldPar); 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). // 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.** // **Make the hypothesis that, when an abstract has a list, all its items are consecutive.**