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

Fix bug #6563: Change tracking and moving labels

Browse Source 
Do not warn that a label already exists if it is in a deleted part of the document.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33714 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-03-11 18:20:57 +00:00
parent d8bb69e74e
commit 7c8510f02e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Buffer.cpp
View File

@ -3854,7 +3854,8 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
InsetList::const_iterator end = parit->insetList().end();
for (; iit != end; ++iit) {
parit.pos() = iit->pos;
iit->inset->updateBuffer(parit, utype);
if (!parit->isDeleted(iit->pos))
iit->inset->updateBuffer(parit, utype);
}
}
}

5
src/insets/InsetLabel.cpp
View File

@ -50,7 +50,9 @@ namespace lyx {
InsetLabel::InsetLabel(Buffer * buf, InsetCommandParams const & p)
: InsetCommand(buf, p, "label")
{}
{
screen_label_ = p["name"];
}
void InsetLabel::initView()
@ -101,6 +103,7 @@ void InsetLabel::updateCommand(docstring const & new_label, bool updaterefs)
// We need an update of the Buffer reference cache. This is achieved by
// updateBuffer().
buffer().updateBuffer();
screen_label_ = label;
}