X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FExporter.cpp;h=a5a153aacdd7e0c069d5c3c279a2a1e5f0b8987c;hb=a5b01f8f96efc95633a8da1cf4748aa473a89f1a;hp=cf036fc550533549da2ca2f4d98d35f0814bc7cf;hpb=72a6c77a510de0651056ea7f0cb58e25d80a8b53;p=lyx.git 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; }