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

revert r38098

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38099 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2011-03-28 21:06:46 +00:00
parent 98e317ef1d
commit 8a53cc7bea
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/CutAndPaste.cpp
View File

@ -672,19 +672,13 @@ void switchBetweenClasses(DocumentClass const * const oldone,
n == DocumentClass::plainInsetLayout().name(); n == DocumentClass::plainInsetLayout().name();
if (!is_undefined) if (!is_undefined)
continue; continue;
// The flex inset is undefined in newtc // The flex inset is undefined in newtc
docstring const oldname = from_utf8(oldtc.name()); docstring const s = bformat(_(
docstring const newname = from_utf8(newtc.name()); "Flex inset %1$s is "
docstring s; "undefined because of class "
if (oldname == newname) "conversion from\n%2$s to %3$s"),
s = bformat(_("Flex inset %1$s is undefined after " it->name(), from_utf8(oldtc.name()),
"reloading `%2$s' layout."), from_utf8(newtc.name()));
it->name(), oldname);
else
s = bformat(_("Flex inset %1$s is undefined because of "
"conversion from `%2$s' layout to `%3$s'."),
it->name(), oldname, newname);
// To warn the user that something had to be done. // To warn the user that something had to be done.
errorlist.push_back(ErrorItem( errorlist.push_back(ErrorItem(
_("Undefined flex inset"), _("Undefined flex inset"),