anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert [9370135c3e/lyxgit] and fix #8499 properly

Browse Source 
Fixes #11920
This commit is contained in:
Juergen Spitzmueller 2020-08-04 16:52:58 +02:00
parent 6dcd4ca4f1
commit 7250aad280
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Buffer.cpp
View File

@ -5242,11 +5242,6 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype, bool const dele
// to resolve macros in it.
parit.text()->setMacrocontextPosition(parit);
// Reset bibitem counter in master (#8499)
Buffer const * const master = masterBuffer();
if (master == this && !d->ignore_parent)
master->params().documentClass().counters().reset(from_ascii("bibitem"));
depth_type maxdepth = 0;
pit_type const lastpit = parit.lastpit();
bool changed = false;

4
src/Paragraph.cpp
View File

@ -4065,7 +4065,7 @@ bool Paragraph::brokenBiblio() const
int Paragraph::fixBiblio(Buffer const & buffer)
{
// FIXME: when there was already an inset at 0, the return value is 1,
// which does not tell whether another inset has been remove; the
// which does not tell whether another inset has been removed; the
// cursor cannot be correctly updated.
bool const track_changes = buffer.params().track_changes;
@ -4097,6 +4097,8 @@ int Paragraph::fixBiblio(Buffer const & buffer)
// than keep the first? (JMarc)
Inset * inset = releaseInset(bibitem_pos);
d->insetlist_.begin()->inset = inset;
// This needs to be done to update the counter (#8499)
buffer.updateBuffer();
return -bibitem_pos;
}