anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Use swap in InsetText::updateBuffer for notes ad friends"

Browse Source 
This reverts commit 05d3a64952.
This commit is contained in:
Jean-Marc Lasgouttes 2018-09-18 23:07:48 +02:00
parent 0920872ebd
commit f5f2f5b7ea
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Counters.cpp
View File

@ -697,12 +697,4 @@ void Counters::endEnvironment()
}
void swap(Counters & c1, Counters & c2)
{
Counters tmp = move(c1);
c1 = move(c2);
c2 = move(tmp);
}
} // namespace lyx

3
src/Counters.h
View File

@ -239,9 +239,6 @@ private:
std::vector<docstring> counter_stack_;
/// Same, but for last layout.
std::vector<Layout const *> layout_stack_;
///
friend void swap(Counters &, Counters &);
};
} // namespace lyx

4
src/insets/InsetText.cpp
View File

@ -814,13 +814,13 @@ void InsetText::updateBuffer(ParIterator const & it, UpdateType utype)
// Note that we do not need to call:
// tclass.counters().clearLastLayout()
// since we are saving and restoring the existing counters, etc.
Counters savecnt = tclass.counters();
Counters const savecnt = tclass.counters();
tclass.counters().reset();
// we need float information even in note insets (#9760)
tclass.counters().current_float(savecnt.current_float());
tclass.counters().isSubfloat(savecnt.isSubfloat());
buffer().updateBuffer(it2, utype);
swap(tclass.counters(), savecnt);
tclass.counters() = savecnt;
}
}