From: Enrico Forestieri <forenr@lyx.org>
Date: Tue, 22 Dec 2009 21:44:14 +0000 (+0000)
Subject: Allow spaces in path names for LFUN_SERVER_GOTO_FILE_ROW.
X-Git-Tag: 2.0.0~4737
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=570352c616f6245219ea3d4960e7e091cac12fd5;p=features.git

Allow spaces in path names for LFUN_SERVER_GOTO_FILE_ROW.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32615 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 862870c7f9..cbb0e38fd6 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2599,9 +2599,18 @@ bool GuiView::goToFileRow(string const & argument)
 {
 	string file_name;
 	int row;
-	istringstream is(argument);
-	is >> file_name >> row;
-	file_name = os::internal_path(file_name);
+	size_t i = argument.find_last_of(' ');
+	if (i != string::npos) {
+		file_name = os::internal_path(trim(argument.substr(0, i)));
+		istringstream is(argument.substr(i + 1));
+		is >> row;
+		if (is.fail())
+			i = string::npos;
+	}
+	if (i == string::npos) {
+		LYXERR0("Wrong argument: " << argument);
+		return false;
+	}
 	Buffer * buf = 0;
 	string const abstmp = package().temp_dir().absFilename();
 	string const realtmp = package().temp_dir().realPath();