Merge branch 'master' into biblatex2

[lyx.git] / src / insets / RenderPreview.cpp

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index 60346f92c82dacfa62de1f42ff8097259d301471..e985d290a27391427a44df676147d0f8b4c56b95 100644 (file)
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -77,7 +77,7 @@ RenderPreview::RenderPreview(Inset const * inset)
 RenderPreview::RenderPreview(RenderPreview const & other,
                             Inset const * inset)
        : RenderBase(other),
-         boost::signals::trackable(),
+         boost::signals2::trackable(),
          snippet_(other.snippet_),
          parent_(inset)
 {}
@@ -104,6 +104,9 @@ docstring const statusMessage(BufferView const * bv, string const & snippet)
 
        Buffer const & buffer = bv->buffer();
        graphics::PreviewLoader const * loader = buffer.loader();
+       // please coverity (probably worth the check anyway)
+       if (!loader)
+               return docstring();
        graphics::PreviewLoader::Status const status = loader->status(snippet);
 
        docstring message;
@@ -190,6 +193,8 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
                             y - theFontMetrics(font).maxAscent() - 4,
                             stat, font);
        }
+       pi.change_.paintCue(pi, x, y - dim_.asc,
+                           x + dim_.width(), y - dim_.asc + dim_.height());
 }
 
 
@@ -257,24 +262,6 @@ void RenderPreview::removePreview(Buffer const & buffer)
 }
 
 
-void RenderPreview::addMacroDef(docstring const & latex_snippet,
-                               Buffer const & buffer)
-{
-       graphics::PreviewLoader * loader = buffer.loader();
-       LASSERT(loader, return);
-       loader->addMacroDef(latex_snippet);
-}
-
-
-bool RenderPreview::hasMacroDef(docstring const & latex_snippet,
-                               Buffer const & buffer)
-{
-       graphics::PreviewLoader * loader = buffer.loader();
-       LASSERT(loader, return false);
-       return loader->hasMacroDef(latex_snippet);
-}
-
-
 void RenderPreview::imageReady(graphics::PreviewImage const & pimage)
 {
        // Check the current snippet is the same as that previewed.
@@ -302,7 +289,7 @@ void RenderMonitoredPreview::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-boost::signals::connection
+boost::signals2::connection
 RenderMonitoredPreview::fileChanged(slot_type const & slot)
 {
        return monitor_.connect(slot);