anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 11:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Temptatively fix bug 3546 by testing for more exceptionm types and by unifying the possible errors. I think the reason why we did not have a crash on windows is because we don't use wchar_t and the related basic_filebuf etc.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18366 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2007-05-16 10:39:41 +00:00
parent df73111092
commit 961db56ed8
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Buffer.cpp
View File

@ -34,6 +34,7 @@
#include "LyXAction.h" #include "LyXAction.h"
#include "Lexer.h" #include "Lexer.h"
#include "Text.h" #include "Text.h"
#include "LyX.h"
#include "LyXRC.h" #include "LyXRC.h"
#include "LyXVC.h" #include "LyXVC.h"
#include "Messages.h" #include "Messages.h"
@ -888,24 +889,34 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
if (!openFileWrite(ofs, fname)) if (!openFileWrite(ofs, fname))
return false; return false;
bool failed_export = false;
try { try {
writeLaTeXSource(ofs, original_path, writeLaTeXSource(ofs, original_path,
runparams, output_preamble, output_body); runparams, output_preamble, output_body);
} }
catch (iconv_codecvt_facet_exception &) { catch (iconv_codecvt_facet_exception & e) {
Alert::error(_("Encoding error"), lyxerr << "Caught iconv exception: " << e.what() << endl;
_("Some characters of your document are not " failed_export = true;
"representable in the chosen encoding.\n" }
"Changing the document encoding to utf8 could help.")); catch (std::exception const & e) {
return false; lyxerr << "Caught \"normal\" exception: " << e.what() << endl;
failed_export = true;
}
catch (...) {
lyxerr << "Caught some really weird exception..." << endl;
LyX::cref().emergencyCleanup();
abort();
} }
ofs.close(); ofs.close();
if (ofs.fail()) { if (ofs.fail()) {
failed_export = true;
lyxerr << "File '" << fname << "' was not closed properly." << endl; lyxerr << "File '" << fname << "' was not closed properly." << endl;
Alert::error(_("Error closing file"), }
_("The output file could not be closed properly.\n"
" Probably some characters of your document are not " if (failed_export) {
Alert::error(_("Encoding error"),
_("Some characters of your document are probably not "
"representable in the chosen encoding.\n" "representable in the chosen encoding.\n"
"Changing the document encoding to utf8 could help.")); "Changing the document encoding to utf8 could help."));
return false; return false;