anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix problem with static error list.

Browse Source 
It's amazing we haven't seen problems with this before. The basic problem is that buf.errorList("whatever") would always return the same global, static error list, if it did not already exist. So, to a significant extent, there was only one global error list!

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38982 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-06-08 00:44:55 +00:00
parent 5ede5d3749
commit 50fc0ea9bb
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Buffer.cpp
View File

@ -3106,9 +3106,9 @@ void Buffer::getSourceCode(odocstream & os, string const format,
}
ErrorList & Buffer::errorList(string const & type) const
ErrorList const & Buffer::errorList(string const & type) const
{
static ErrorList emptyErrorList;
static const ErrorList emptyErrorList;
map<string, ErrorList>::iterator it = d->errorLists.find(type);
if (it == d->errorLists.end())
return emptyErrorList;
@ -3117,6 +3117,12 @@ ErrorList & Buffer::errorList(string const & type) const
}
ErrorList & Buffer::errorList(string const & type)
{
return d->errorLists[type];
}
void Buffer::updateTocItem(std::string const & type,
DocIterator const & dit) const
{

3
src/Buffer.h
View File

@ -556,7 +556,8 @@ public:
/// errors (like parsing or LateX compilation). This method is const
/// because modifying the returned ErrorList does not touch the document
/// contents.
ErrorList & errorList(std::string const & type) const;
ErrorList & errorList(std::string const & type);
ErrorList const & errorList(std::string const & type) const;
/// The Toc backend.
/// This is useful only for screen visualisation of the Buffer. This

4
src/frontends/qt4/GuiView.cpp
View File

@ -1451,13 +1451,13 @@ void GuiView::errors(string const & error_type, bool from_master)
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
// We are called with from_master == false by default, so we
// have to figure out whether that is the case or not.
ErrorList & el = bv->buffer().errorList(error_type);
ErrorList & el = const_cast<ErrorList &>(bv->buffer().errorList(error_type));
if (el.empty()) {
el = bv->buffer().masterBuffer()->errorList(error_type);
from_master = true;
}
#else
ErrorList & el = from_master ?
ErrorList const & el = from_master ?
bv->buffer().masterBuffer()->errorList(error_type) :
bv->buffer().errorList(error_type);
#endif

2
src/insets/InsetInclude.cpp
View File

@ -627,7 +627,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
"was not exported correctly.\nWarning: "
"LaTeX export is probably incomplete."),
included_file.displayName());
ErrorList & el = tmp->errorList("Export");
ErrorList const & el = tmp->errorList("Export");
if (!el.empty())
msg = bformat(from_ascii("%1$s\n\n%2$s\n\n%3$s"),
msg, el.begin()->error,