From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Sun, 6 Nov 2011 22:36:14 +0000 (+0000)
Subject: Fix shortenng of file names in MakeDisplayPath: it is not a good idea to slice an... 
X-Git-Tag: 2.1.0beta1~2392
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d7320ad89b26bb89f8f133801c6a452005e5bff3;p=features.git

Fix shortenng of file names in MakeDisplayPath: it is not a good idea to slice an utf8 string at arbitrary offsets, we have to work on a docstring instead. We need unfortunately to switch back and orth between utf8 and docstring.

This is a candidate for branch too, although the bug is minor.


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

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index bb531b807c..5891e79fec 100644
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -802,25 +802,26 @@ docstring const makeDisplayPath(string const & path, unsigned int threshold)
 		return from_utf8(os::external_path(str));
 
 	string const prefix = ".../";
-	string temp;
+	docstring dstr = from_utf8(str);
+	docstring temp;
 
-	while (str.length() > threshold)
-		str = split(str, temp, '/');
+	while (dstr.length() > threshold)
+		dstr = split(dstr, temp, '/');
 
 	// Did we shorten everything away?
-	if (str.empty()) {
+	if (dstr.empty()) {
 		// Yes, filename itself is too long.
 		// Pick the start and the end of the filename.
-		str = onlyFileName(path);
-		string const head = str.substr(0, threshold / 2 - 3);
+		dstr = from_utf8(onlyFileName(path));
+		docstring const head = dstr.substr(0, threshold / 2 - 3);
 
-		string::size_type len = str.length();
-		string const tail =
-			str.substr(len - threshold / 2 - 2, len - 1);
-		str = head + "..." + tail;
+		docstring::size_type len = dstr.length();
+		docstring const tail =
+			dstr.substr(len - threshold / 2 - 2, len - 1);
+		dstr = head + from_ascii("...") + tail;
 	}
 
-	return from_utf8(os::external_path(prefix + str));
+	return from_utf8(os::external_path(prefix + to_utf8(dstr)));
 }