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

Move the error message out of LayoutFileList::load() and have it be

Browse Source 
reported by the caller. Otherwise, you could get the error message the
first time, and then it would succeed the second!!


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35019 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-07-28 21:03:27 +00:00
parent 2d776b0de1
commit 523056c092
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/BufferView.cpp
View File

@ -1239,9 +1239,15 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
}
case LFUN_TEXTCLASS_APPLY: {
if (!LayoutFileList::get().load(argument, buffer_.temppath()) &&
!LayoutFileList::get().load(argument, buffer_.filePath()))
bool success = LayoutFileList::get().load(argument, buffer_.temppath());
if (!success)
success = LayoutFileList::get().load(argument, buffer_.filePath());
if (!success) {
docstring s = bformat(_("The document class `%1$s' "
"could not be loaded."), from_utf8(argument));
frontend::Alert::error(_("Could not load class"), s);
break;
}
LayoutFile const * old_layout = buffer_.params().baseClass();
LayoutFile const * new_layout = &(LayoutFileList::get()[argument]);
@ -1250,7 +1256,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
// nothing to do
break;
//Save the old, possibly modular, layout for use in conversion.
// Save the old, possibly modular, layout for use in conversion.
DocumentClass const * const oldDocClass =
buffer_.params().documentClassPtr();
cur.recordUndoFullDocument();
@ -1262,10 +1268,17 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
break;
}
case LFUN_TEXTCLASS_LOAD:
LayoutFileList::get().load(argument, buffer_.temppath()) ||
LayoutFileList::get().load(argument, buffer_.filePath());
case LFUN_TEXTCLASS_LOAD: {
bool success = LayoutFileList::get().load(argument, buffer_.temppath());
if (!success)
success = LayoutFileList::get().load(argument, buffer_.filePath());
if (!success) {
docstring s = bformat(_("The document class `%1$s' "
"could not be loaded."), from_utf8(argument));
frontend::Alert::error(_("Could not load class"), s);
}
break;
}
case LFUN_LAYOUT_RELOAD: {
DocumentClass const * const oldClass = buffer_.params().documentClassPtr();

8
src/LayoutFile.cpp
View File

@ -314,13 +314,7 @@ bool LayoutFileList::load(string const & name, string const & buf_path)
}
LayoutFile * tc = classmap_[name];
if (!tc->load(buf_path)) {
docstring s = bformat(_("The document class %1$s "
"could not be loaded."), from_utf8(name));
frontend::Alert::error(_("Could not load class"), s);
return false;
}
return true;
return tc->load(buf_path);
}