X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=14cca99832573202556feb5aec5a02fb89949df6;hb=ca6838b288daf07eec7d7a381d74c639c0de3a46;hp=ffe3ce6ab6f16211857172a1d1f42a95ed2e77cf;hpb=ed99f752f9b4ce52cf55cac2a94658fb087c7383;p=lyx.git

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index ffe3ce6ab6..14cca99832 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -59,7 +59,6 @@
 
 namespace lyx {
 
-using support::addName;
 using support::bformat;
 using support::FileFilterList;
 using support::FileName;
@@ -123,12 +122,12 @@ bool menuWrite(Buffer * buffer)
 
 
 
-bool writeAs(Buffer * buffer, string const & filename)
+bool writeAs(Buffer * buffer, string const & newname)
 {
 	string fname = buffer->fileName();
 	string const oldname = fname;
 
-	if (filename.empty()) {
+	if (newname.empty()) {
 
 		// FIXME UNICODE
 		FileDialog fileDlg(_("Choose a filename to save document as"),
@@ -155,13 +154,14 @@ bool writeAs(Buffer * buffer, string const & filename)
 			return false;
 
 		// Make sure the absolute filename ends with appropriate suffix
-		fname = makeAbsPath(fname);
+		fname = makeAbsPath(fname).absFilename();
 		if (!isLyXFilename(fname))
 			fname += ".lyx";
 	} else
-		fname = filename;
+		fname = newname;
 
-	if (fs::exists(fname)) {
+	FileName const filename(fname);
+	if (fs::exists(filename.toFilesystemEncoding())) {
 		docstring const file = makeDisplayPath(fname, 30);
 		docstring text = bformat(_("The document %1$s already exists.\n\n"
 						     "Do you want to over-write that document?"), file);
@@ -232,7 +232,7 @@ int AutoSaveBuffer::generateChild()
 		// anyway.
 		bool failed = false;
 
-		FileName const tmp_ret(tempName(string(), "lyxauto"));
+		FileName const tmp_ret(tempName(FileName(), "lyxauto"));
 		if (!tmp_ret.empty()) {
 			bv_.buffer()->writeFile(tmp_ret);
 			// assume successful write of tmp_ret
@@ -345,7 +345,7 @@ void insertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
 // Insert ascii file (if filename is empty, prompt for one)
 string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagraph)
 {
-	string fname = f;
+	FileName fname(f);
 
 	if (fname.empty()) {
 		FileDialog fileDlg(_("Select file to insert"),
@@ -358,25 +358,25 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 		if (result.first == FileDialog::Later)
 			return string();
 
-		fname = to_utf8(result.second);
+		fname = makeAbsPath(to_utf8(result.second));
 
 		if (fname.empty())
 			return string();
 	}
 
-	if (!fs::is_readable(fname)) {
+	if (!fs::is_readable(fname.toFilesystemEncoding())) {
 		docstring const error = from_ascii(strerror(errno));
-		docstring const file = makeDisplayPath(fname, 50);
+		docstring const file = makeDisplayPath(fname.absFilename(), 50);
 		docstring const text = bformat(_("Could not read the specified document\n"
 							   "%1$s\ndue to the error: %2$s"), file, error);
 		Alert::error(_("Could not read file"), text);
 		return string();
 	}
 
-	ifstream ifs(fname.c_str());
+	ifstream ifs(fname.toFilesystemEncoding().c_str());
 	if (!ifs) {
 		docstring const error = from_ascii(strerror(errno));
-		docstring const file = makeDisplayPath(fname, 50);
+		docstring const file = makeDisplayPath(fname.absFilename(), 50);
 		docstring const text = bformat(_("Could not open the specified document\n"
 							   "%1$s\ndue to the error: %2$s"), file, error);
 		Alert::error(_("Could not open file"), text);