anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-21 07:12:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

factorize some code

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7367 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Alfredo Braunstein 2003-07-26 20:09:56 +00:00
parent 1d371a287d
commit 78ba1836ad
2 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2003-07.26 Alfredo Braunstein <abraunst@libero.it>
* buffer.C (openFileWrite): factorize some code
2003-07-26 Angus Leeming <leeming@lyx.org>
* lyx_cb.C:

54
src/buffer.C
View File

@ -116,6 +116,20 @@ namespace {
const int LYX_FORMAT = 224;
bool openFileWrite(ofstream & ofs, string const & fname)
{
ofs.open(fname.c_str());
if (!ofs) {
string const file = MakeDisplayPath(fname, 50);
string text = bformat(_("Could not open the specified "
"document\n%1$s."), file);
Alert::error(_("Could not open file"), text);
return false;
}
return true;
}
} // namespace anon
Buffer::Buffer(string const & file, bool ronly)
@ -622,9 +636,8 @@ bool Buffer::writeFile(string const & fname) const
}
ofstream ofs(fname.c_str());
if (!ofs) {
if (!ofs)
return false;
}
#ifdef HAVE_LOCALE
// Use the standard "C" locale for file output.
@ -875,13 +888,9 @@ string const Buffer::asciiParagraph(Paragraph const & par,
void Buffer::writeFileAscii(string const & fname, int linelen)
{
ofstream ofs(fname.c_str());
if (!ofs) {
string const file = MakeDisplayPath(fname, 50);
string text = bformat(_("Could not save the document\n%1$s."), file);
Alert::error(_("Could not save document"), text);
ofstream ofs;
if (!::openFileWrite(ofs, fname))
return;
}
writeFileAscii(ofs, linelen);
}
@ -898,7 +907,6 @@ void Buffer::writeFileAscii(ostream & os, int linelen)
}
void Buffer::makeLaTeXFile(string const & fname,
string const & original_path,
LatexRunParams const & runparams,
@ -906,14 +914,9 @@ void Buffer::makeLaTeXFile(string const & fname,
{
lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl;
ofstream ofs(fname.c_str());
if (!ofs) {
string const file = MakeDisplayPath(fname, 50);
string text = bformat(_("Could not open the specified document\n%1$s."),
file);
Alert::error(_("Could not open file"), text);
ofstream ofs;
if (!::openFileWrite(ofs, fname))
return;
}
makeLaTeXFile(ofs, original_path,
runparams, only_body, only_preamble);
@ -1068,15 +1071,9 @@ bool Buffer::isSGML() const
void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
{
ofstream ofs(fname.c_str());
if (!ofs) {
string const file = MakeDisplayPath(fname, 50);
string text = bformat(_("Could not save the specified document\n%1$s.\n"),
file);
Alert::error(_("Could not save document"), text);
ofstream ofs;
if (!::openFileWrite(ofs, fname))
return;
}
niceFile = nice; // this will be used by included files.
@ -1504,14 +1501,9 @@ void Buffer::simpleLinuxDocOnePar(ostream & os,
void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
{
ofstream ofs(fname.c_str());
if (!ofs) {
string const file = MakeDisplayPath(fname, 50);
string text = bformat(_("Could not save the specified document\n%1$s.\n"),
file);
Alert::error(_("Could not save document"), text);
ofstream ofs;
if (!::openFileWrite(ofs, fname))
return;
}
niceFile = nice; // this will be used by Insetincludes.