mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
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
This commit is contained in:
parent
e1cabbf70e
commit
3c957e1bb1
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user