From: Uwe Stöhr <uwestoehr@web.de>
Date: Wed, 21 Apr 2010 01:54:08 +0000 (+0000)
Subject: Exporter.cpp: revert r34230 because this interferes with Enrico's new LyXVC feature... 
X-Git-Tag: 2.0.0~3379
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3c957e1bb1ca487cb5bb9b02145c009a7f5fe02d;p=lyx.git

Exporter.cpp: revert r34230 because this interferes with Enrico's new LyXVC feature to setup what LyX should do on export

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

diff --git a/src/Exporter.cpp b/src/Exporter.cpp
index cf036fc550..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;
 		}