anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix error message (bug 1963)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10384 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-08-02 22:31:56 +00:00
parent 9d3d5d016f
commit cbec96ae3a
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2005-08-02 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* lyxfunc.C (dispatch): use InsetIncludeMailer for the include
inset. (bug 1963)
2005-08-02 Martin Vermeer <martin.vermeer@hut.fi>
* BufferView_pimpl.C (updateScrollbar): scrollbar fixes

4
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2005-08-02 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* insetinclude.C (string2params): fix typo in error message (bug 1963).
2005-07-28 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* insettabular.C (getStatus): disable line and paragraph breaks

2
src/insets/insetinclude.C
View File

@ -761,7 +761,7 @@ void InsetIncludeMailer::string2params(string const & in,
string id;
lex >> id;
if (!lex || id != "Include")
return print_mailer_error("InsetBoxMailer", in, 2, "Include");
return print_mailer_error("InsetIncludeMailer", in, 2, "Include");
InsetInclude inset(params);
inset.read(lex);

5
src/lyxfunc.C
View File

@ -64,6 +64,7 @@
#include "insets/insetexternal.h"
#include "insets/insetfloat.h"
#include "insets/insetgraphics.h"
#include "insets/insetinclude.h"
#include "insets/insetnote.h"
#include "insets/insettabular.h"
#include "insets/insetvspace.h"
@ -1138,7 +1139,6 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
string data = trim(cmd.argument.substr(name.size()));
if (name == "bibitem" ||
name == "bibtex" ||
name == "include" ||
name == "index" ||
name == "label" ||
name == "ref" ||
@ -1146,6 +1146,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
name == "url") {
InsetCommandParams p(name);
data = InsetCommandMailer::params2string(name, p);
} else if (name == "include") {
InsetCommandParams p(data);
data = InsetIncludeMailer::params2string(p);
} else if (name == "box") {
// \c data == "Boxed" || "Frameless" etc
InsetBoxParams p(data);