anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-30 13:20:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Work around dangling pointer

Browse Source 
This pointer has been removed in master, but backporting the workaround is
enough.

(cherry picked from commit 79a947c904)
This commit is contained in:
Guillaume Munch 2016-09-28 21:57:54 +02:00
parent e5954386d2
commit adb00dbcf8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontends/qt4/GuiViewSource.cpp
View File

@ -309,11 +309,11 @@ void ViewSourceWidget::realUpdateView()
} }
docstring ViewSourceWidget::currentFormatName() const docstring ViewSourceWidget::currentFormatName(BufferView const * bv) const
{ {
// Compute the actual format used // Compute the actual format used
string const format = !bv_ ? "" string const format = !bv ? ""
: flavor2format(bv_->buffer().params().getOutputFlavor(view_format_)); : flavor2format(bv->buffer().params().getOutputFlavor(view_format_));
Format const * f = formats.getFormat(format.empty() ? view_format_ : format); Format const * f = formats.getFormat(format.empty() ? view_format_ : format);
return from_utf8(f ? f->prettyname() : view_format_); return from_utf8(f ? f->prettyname() : view_format_);
} }
@ -453,7 +453,7 @@ bool GuiViewSource::initialiseParams(string const & /*source*/)
void GuiViewSource::updateTitle() void GuiViewSource::updateTitle()
{ {
docstring const format = widget_->currentFormatName(); docstring const format = widget_->currentFormatName(bufferview());
QString const title = format.empty() ? qt_("Code Preview") QString const title = format.empty() ? qt_("Code Preview")
: qt_("%1[[preview format name]] Preview") : qt_("%1[[preview format name]] Preview")
.arg(toqstr(translateIfPossible(format))); .arg(toqstr(translateIfPossible(format)));

2
src/frontends/qt4/GuiViewSource.h
View File

@ -65,7 +65,7 @@ public Q_SLOTS:
/// ///
void gotoCursor(); void gotoCursor();
/// Name of the current format. Empty if none. /// Name of the current format. Empty if none.
docstring currentFormatName() const; docstring currentFormatName(BufferView const * bv) const;
Q_SIGNALS: Q_SIGNALS:
void formatChanged() const; void formatChanged() const;