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

Let Buffer::preview return an error value

Browse Source 
TODO:
 - Also let the public function return an error value,
 - Move all user interaction (Alerts etc.) out of Buffer.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40044 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2011-10-27 20:00:08 +00:00
parent bf3871933a
commit e74468b4be
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Buffer.cpp
View File

@ -3744,20 +3744,27 @@ bool Buffer::preview(string const & format) const
bool const update_unincluded =
params().maintain_unincluded_children
&& !params().getIncludedChildren().empty();
return preview(format, update_unincluded);
ExportStatus const status = preview(format, update_unincluded);
return (status == PreviewSuccess);
}
bool Buffer::preview(string const & format, bool includeall) const
Buffer::ExportStatus Buffer::preview(string const & format, bool includeall) const
{
MarkAsExporting exporting(this);
string result_file;
// (1) export with all included children (omit \includeonly)
if (includeall && (doExport(format, true, true) != ExportSuccess))
return false;
if (includeall) {
ExportStatus const status = doExport(format, true, true);
if (status != ExportSuccess)
return status;
}
// (2) export with included children only
if (doExport(format, true, false, result_file) != ExportSuccess)
return false;
return formats.view(*this, FileName(result_file), format);
ExportStatus const status = doExport(format, true, false, result_file);
if (status != ExportSuccess)
return status;
if (!formats.view(*this, FileName(result_file), format))
return PreviewError;
return PreviewSuccess;
}

8
src/Buffer.h
View File

@ -123,11 +123,15 @@ public:
};
enum ExportStatus {
// export
ExportSuccess,
ExportError,
ExportNoPathToFormat,
ExportTexPathHasSpaces,
ExportConverterError
ExportConverterError,
// preview
PreviewSuccess,
PreviewError
};
/// Method to check if a file is externally modified, used by
@ -623,7 +627,7 @@ private:
ExportStatus doExport(std::string const & target, bool put_in_tempdir,
bool includeall) const;
///
bool preview(std::string const & format, bool includeall = false) const;
ExportStatus preview(std::string const & format, bool includeall = false) const;
public:
/// mark the buffer as busy exporting something, or not