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

Fix crash reported by Scott. Forgot to change some pointers to

Browse Source 
shared_ptr.
This commit is contained in:
Richard Heck 2012-06-04 12:25:02 -04:00
parent ad7deaabeb
commit 1078dba130
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/frontends/qt4/LayoutBox.cpp
View File

@ -24,6 +24,7 @@
#include "BufferParams.h" #include "BufferParams.h"
#include "BufferView.h" #include "BufferView.h"
#include "Cursor.h" #include "Cursor.h"
#include "DocumentClassPtr.h"
#include "FuncRequest.h" #include "FuncRequest.h"
#include "FuncStatus.h" #include "FuncStatus.h"
#include "LyX.h" #include "LyX.h"
@ -127,7 +128,7 @@ struct LayoutBox::Private
/// ///
GuiView & owner_; GuiView & owner_;
/// ///
DocumentClass const * text_class_; DocumentClassConstPtr text_class_;
/// ///
Inset const * inset_; Inset const * inset_;
@ -530,11 +531,11 @@ void LayoutBox::setIconSize(QSize size)
void LayoutBox::set(docstring const & layout) void LayoutBox::set(docstring const & layout)
{ {
d->resetFilter(); d->resetFilter();
if (!d->text_class_) if (!d->text_class_.get())
return; return;
if (!(*d->text_class_).hasLayout(layout)) if (!d->text_class_->hasLayout(layout))
return; return;
Layout const & lay = (*d->text_class_)[layout]; Layout const & lay = (*d->text_class_)[layout];
@ -628,13 +629,13 @@ void LayoutBox::updateContents(bool reset)
if (!bv) { if (!bv) {
d->model_->clear(); d->model_->clear();
setEnabled(false); setEnabled(false);
d->text_class_ = 0; d->text_class_.reset();
d->inset_ = 0; d->inset_ = 0;
return; return;
} }
// we'll only update the layout list if the text class has changed // we'll only update the layout list if the text class has changed
// or we've moved from one inset to another // or we've moved from one inset to another
DocumentClass const * text_class = &(bv->buffer().params().documentClass()); DocumentClassConstPtr text_class = bv->buffer().params().documentClassPtr();
Inset const * inset = &(bv->cursor().innerText()->inset()); Inset const * inset = &(bv->cursor().innerText()->inset());
if (!reset && d->text_class_ == text_class && d->inset_ == inset) { if (!reset && d->text_class_ == text_class && d->inset_ == inset) {
set(bv->cursor().innerParagraph().layout().name()); set(bv->cursor().innerParagraph().layout().name());
@ -686,7 +687,7 @@ void LayoutBox::selected(int index)
d->model_->itemFromIndex(mindex)->text()); d->model_->itemFromIndex(mindex)->text());
d->owner_.setFocus(); d->owner_.setFocus();
if (!d->text_class_) { if (!d->text_class_.get()) {
updateContents(false); updateContents(false);
d->resetFilter(); d->resetFilter();
return; return;