mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-13 01:08:45 +00:00
branch: Fix bug #6462: Out-of-bounds index in GuiErrorList::goTo when new buffer is active.
Cache the buffer and errorList in the GuiErrorList? dialog. Now, we can check whether the active buffer is also the buffer for which the errors are shown. We switch back to the correct buffer, when one clicks on an item or clicks "View complete log". see r33726. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@33757 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
0a7616e65c
commit
4060153d69
@ -15,7 +15,9 @@
|
|||||||
#include "qt_helpers.h"
|
#include "qt_helpers.h"
|
||||||
|
|
||||||
#include "Buffer.h"
|
#include "Buffer.h"
|
||||||
|
#include "BufferList.h"
|
||||||
#include "BufferView.h"
|
#include "BufferView.h"
|
||||||
|
#include "FuncRequest.h"
|
||||||
#include "ParIterator.h"
|
#include "ParIterator.h"
|
||||||
#include "Text.h"
|
#include "Text.h"
|
||||||
|
|
||||||
@ -91,8 +93,9 @@ void GuiErrorList::paramsToDialog()
|
|||||||
errorsLW->clear();
|
errorsLW->clear();
|
||||||
descriptionTB->setPlainText(QString());
|
descriptionTB->setPlainText(QString());
|
||||||
|
|
||||||
ErrorList::const_iterator it = errorList().begin();
|
ErrorList const & el = errorList();
|
||||||
ErrorList::const_iterator end = errorList().end();
|
ErrorList::const_iterator it = el.begin();
|
||||||
|
ErrorList::const_iterator end = el.end();
|
||||||
for (; it != end; ++it)
|
for (; it != end; ++it)
|
||||||
errorsLW->addItem(toqstr(it->error));
|
errorsLW->addItem(toqstr(it->error));
|
||||||
errorsLW->setCurrentRow(0);
|
errorsLW->setCurrentRow(0);
|
||||||
@ -101,17 +104,19 @@ void GuiErrorList::paramsToDialog()
|
|||||||
|
|
||||||
ErrorList const & GuiErrorList::errorList() const
|
ErrorList const & GuiErrorList::errorList() const
|
||||||
{
|
{
|
||||||
return bufferview()->buffer().errorList(error_type_);
|
if (bufferview() && &bufferview()->buffer() == buf_)
|
||||||
|
error_list_ = bufferview()->buffer().errorList(error_type_);
|
||||||
|
return error_list_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool GuiErrorList::initialiseParams(string const & error_type)
|
bool GuiErrorList::initialiseParams(string const & error_type)
|
||||||
{
|
{
|
||||||
error_type_ = error_type;
|
error_type_ = error_type;
|
||||||
Buffer const & buf = bufferview()->buffer();
|
buf_ = &bufferview()->buffer();
|
||||||
name_ = bformat(_("%1$s Errors (%2$s)"),
|
name_ = bformat(_("%1$s Errors (%2$s)"),
|
||||||
_(guiErrorType(error_type)),
|
_(guiErrorType(error_type)),
|
||||||
from_utf8(buf.absFileName()));
|
from_utf8(buf_->absFileName()));
|
||||||
paramsToDialog();
|
paramsToDialog();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -119,15 +124,20 @@ bool GuiErrorList::initialiseParams(string const & error_type)
|
|||||||
|
|
||||||
bool GuiErrorList::goTo(int item)
|
bool GuiErrorList::goTo(int item)
|
||||||
{
|
{
|
||||||
|
if (!bufferview() || &buffer() != buf_) {
|
||||||
|
if (!theBufferList().isLoaded(buf_))
|
||||||
|
return false;
|
||||||
|
FuncRequest fr(LFUN_BUFFER_SWITCH, buf_->absFileName());
|
||||||
|
dispatch(fr);
|
||||||
|
}
|
||||||
ErrorItem const & err = errorList()[item];
|
ErrorItem const & err = errorList()[item];
|
||||||
|
|
||||||
if (err.par_id == -1)
|
if (err.par_id == -1)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
Buffer const & buf = buffer();
|
DocIterator dit = buf_->getParFromID(err.par_id);
|
||||||
DocIterator dit = buf.getParFromID(err.par_id);
|
|
||||||
|
|
||||||
if (dit == doc_iterator_end(buf.inset())) {
|
if (dit == doc_iterator_end(buf_->inset())) {
|
||||||
// FIXME: Happens when loading a read-only doc with
|
// FIXME: Happens when loading a read-only doc with
|
||||||
// unknown layout. Should this be the case?
|
// unknown layout. Should this be the case?
|
||||||
LYXERR0("par id " << err.par_id << " not found");
|
LYXERR0("par id " << err.par_id << " not found");
|
||||||
|
@ -57,6 +57,10 @@ private:
|
|||||||
std::string error_type_;
|
std::string error_type_;
|
||||||
/// the parent document name
|
/// the parent document name
|
||||||
docstring name_;
|
docstring name_;
|
||||||
|
///
|
||||||
|
Buffer const * buf_;
|
||||||
|
///
|
||||||
|
mutable ErrorList error_list_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace frontend
|
} // namespace frontend
|
||||||
|
Loading…
Reference in New Issue
Block a user