anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-27 03:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/insets/InsetLabel.cpp:

Browse Source 
- minor fixes to the label validation.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23406 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2008-03-03 08:19:36 +00:00
parent 264ee9f584
commit eef138f77b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/insets/InsetLabel.cpp
View File

@ -53,11 +53,19 @@ void InsetLabel::update(docstring const & new_label)
{ {
docstring const old_label = getParam("name"); docstring const old_label = getParam("name");
docstring label = new_label; docstring label = new_label;
int i = 0; int i = 1;
while (buffer().insetLabel(label)) { while (buffer().insetLabel(label)) {
label = new_label + '-' + convert<docstring>(i); label = new_label + '-' + convert<docstring>(i);
++i; ++i;
} }
if (label != new_label) {
// Warn the user that the label has been changed to something else.
frontend::Alert::warning(_("Label names must be unique!"),
bformat(_("The label %1$s already exists,\n"
"it will been changed to %2$s."), new_label, label));
}
setParam("name", label); setParam("name", label);
Buffer::References const & refs = buffer().references(old_label); Buffer::References const & refs = buffer().references(old_label);
@ -66,12 +74,6 @@ void InsetLabel::update(docstring const & new_label)
for (; it != end; ++it) for (; it != end; ++it)
it->first->setParam("reference", label); it->first->setParam("reference", label);
if (label != new_label) {
// Warn the user that the label has been changed to something else.
frontend::Alert::warning(_("Label names must be unique!"),
bformat(_("The label %1$s already exists,\n"
"it will been changed to %2$s."), new_label, label));
}
// We need an update of the Buffer reference cache. This is achieved by // We need an update of the Buffer reference cache. This is achieved by
// updateLabel(). // updateLabel().
lyx::updateLabels(buffer()); lyx::updateLabels(buffer());