The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 76c96c22ac6078bf1c0c11402222ef50a7d15d0f Author: Richard Heck <[email protected]> Date: Sat Apr 27 18:12:27 2013 -0400 Another assertion that got changed wrongly. I've read back through that patch, and everything else looks good. diff --git a/src/frontends/qt4/Dialog.cpp b/src/frontends/qt4/Dialog.cpp index c081427..17db593 100644 --- a/src/frontends/qt4/Dialog.cpp +++ b/src/frontends/qt4/Dialog.cpp @@ -125,7 +125,7 @@ Buffer const & Dialog::buffer() const Buffer const & Dialog::documentBuffer() const { - LAPPERR(lyxview_->currentBufferView()); + LAPPERR(lyxview_->documentBufferView()); return lyxview_->documentBufferView()->buffer(); } diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp index bb076df..445fa4a 100644 --- a/src/frontends/qt4/GuiClipboard.cpp +++ b/src/frontends/qt4/GuiClipboard.cpp @@ -149,9 +149,9 @@ FileName GuiClipboard::getPastedGraphicsFileName(Cursor const & cur, types.push_back(Clipboard::PngGraphicsType); if (hasGraphicsContents(Clipboard::JpegGraphicsType)) types.push_back(Clipboard::JpegGraphicsType); - + LASSERT(!types.empty(), return FileName()); - + // select prefered type if AnyGraphicsType was passed if (type == Clipboard::AnyGraphicsType) type = types.front(); ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/Dialog.cpp | 2 +- src/frontends/qt4/GuiClipboard.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- The LyX Source Repository
