X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FExporter.cpp;h=a5a153aacdd7e0c069d5c3c279a2a1e5f0b8987c;hb=c99a8a702c285bbc961171d402dcffb458a12c0c;hp=9e18d27def674bb1a58d2107143e2d4339d8019b;hpb=893a4d082b4c208604d40e463640d580a5d7adc2;p=lyx.git

diff --git a/src/Exporter.cpp b/src/Exporter.cpp
index 9e18d27def..a5a153aacd 100644
--- a/src/Exporter.cpp
+++ b/src/Exporter.cpp
@@ -44,11 +44,11 @@ static int checkOverwrite(FileName const & filename)
 
 	docstring text = bformat(_("The file %1$s already exists.\n\n"
 				   "Do you want to overwrite that file?"),
-				   makeDisplayPath(filename.absFilename()));
+				   makeDisplayPath(filename.absFileName()));
 	return Alert::prompt(_("Overwrite file?"),
 				text, 0, 3,
-				_("&Overwrite"), _("Overwrite &all"),
-				_("&Keep file"), _("&Cancel export"));
+				_("&Keep file"), _("&Overwrite"),
+				_("Overwrite &all"), _("&Cancel export"));
 }
 
 
@@ -72,20 +72,20 @@ CopyStatus copyFile(string const & format,
 	// other directories than the document directory is desired.
 	// Also don't overwrite files that already exist and are identical
 	// to the source files.
-	if (!prefixIs(onlyPath(sourceFile.absFilename()), package().temp_dir().absFilename())
+	if (!prefixIs(onlyPath(sourceFile.absFileName()), package().temp_dir().absFileName())
 	    || sourceFile.checksum() == destFile.checksum())
 		return ret;
 
 	if (!force) {
 		switch(checkOverwrite(destFile)) {
 		case 0:
+			return SUCCESS;
+		case 1:
 			ret = SUCCESS;
 			break;
-		case 1:
+		case 2:
 			ret = FORCE;
 			break;
-		case 2:
-			return SUCCESS;
 		default:
 			return CANCEL;
 		}
@@ -95,8 +95,8 @@ CopyStatus copyFile(string const & format,
 	if (!mover.copy(sourceFile, destFile, latexFile))
 		Alert::error(_("Couldn't copy file"),
 			     bformat(_("Copying %1$s to %2$s failed."),
-				     makeDisplayPath(sourceFile.absFilename()),
-				     makeDisplayPath(destFile.absFilename())));
+				     makeDisplayPath(sourceFile.absFileName()),
+				     makeDisplayPath(destFile.absFileName())));
 
 	return ret;
 }
@@ -131,7 +131,7 @@ void ExportData::addExternalFile(string const & format,
 void ExportData::addExternalFile(string const & format,
 				 FileName const & sourceName)
 {
-	addExternalFile(format, sourceName, onlyFilename(sourceName.absFilename()));
+	addExternalFile(format, sourceName, onlyFileName(sourceName.absFileName()));
 }