X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FExporter.cpp;h=a5a153aacdd7e0c069d5c3c279a2a1e5f0b8987c;hb=dad3c8ce74d1ebea92973bea5ca44f97d660d38e;hp=b1343e2c485cba3d0b4a7f73d1bd09e522702b4a;hpb=62ca7f3ae55ad2e0c395cb554d71afab87de1ee3;p=lyx.git

diff --git a/src/Exporter.cpp b/src/Exporter.cpp
index b1343e2c48..a5a153aacd 100644
--- a/src/Exporter.cpp
+++ b/src/Exporter.cpp
@@ -47,8 +47,8 @@ static int checkOverwrite(FileName const & filename)
 				   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"));
 }
 
 
@@ -79,13 +79,13 @@ CopyStatus copyFile(string const & format,
 	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;
 		}
@@ -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()));
 }