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

cmake/merge: fix compile, this split conflicts with the others

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22137 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2007-12-13 21:57:37 +00:00
parent 4d30504965
commit 78caccb1c5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/FuncRequest.cpp
View File

@ -70,7 +70,7 @@ mouse_button::state FuncRequest::button() const
}
void split(vector<string> & args, string const & str)
void splitArg(vector<string> & args, string const & str)
{
istringstream is(str);
while (is) {
@ -93,7 +93,7 @@ void split(vector<string> & args, string const & str)
string FuncRequest::getArg(unsigned int i) const
{
vector<string> args;
split(args, to_utf8(argument_));
splitArg(args, to_utf8(argument_));
return i < args.size() ? args[i] : string();
}

2
src/factory.cpp
View File

@ -363,7 +363,7 @@ Inset * createInset(Buffer & buf, FuncRequest const & cmd)
if (message.type_ == ErrorException) {
Alert::error(message.title_, message.details_);
LyX::cref().emergencyCleanup();
abort();
support::abort();
} else if (message.type_ == WarningException) {
Alert::warning(message.title_, message.details_);
return 0;