Exporter.cpp: revert r34230 because this interferes with Enrico's new LyXVC feature...

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 cf036fc550533549da2ca2f4d98d35f0814bc7cf..a5a153aacdd7e0c069d5c3c279a2a1e5f0b8987c 100644 (file)
--- 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;
                }