anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Tolerate formats that are not supported by lyx2lyx."

Browse Source 
This reverts commit 2f5396c871.
This commit is contained in:
Tommaso Cucinotta 2017-05-06 09:21:58 +02:00
parent 0fc8bd0c5f
commit 1f241dc849
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Buffer.cpp
View File

@ -1179,22 +1179,14 @@ Buffer::ReadStatus Buffer::readFile(FileName const & fn)
if (file_format != LYX_FORMAT) {
FileName tmpFile;
ReadStatus ret_clf = convertLyXFormat(fn, tmpFile, file_format);
if (ret_clf != ReadSuccess)
return ret_clf;
ret_clf = readFile(tmpFile);
if (ret_clf == ReadSuccess) {
ret_clf = readFile(tmpFile);
if (ret_clf == ReadSuccess) {
d->file_format = file_format;
d->need_format_backup = true;
return ret_clf;
}
}
if (ret_clf != ReadSuccess) {
int const ret = Alert::prompt(_("Document format failure"),
_("Fileformat unrecognized by lyx2lyx. Trying to load anyway, "
"but some contents might be lost and LyX might crash!\n"
"Would you like to proceed ?"), 0, 1, _("&No"), _("&Yes"));
if (ret == 0)
return ret_clf;
d->file_format = file_format;
d->need_format_backup = true;
}
return ret_clf;
}
// FIXME: InsetInfo needs to know whether the file is under VCS