Fix bug 3101 and 3108

[lyx.git] / src / frontends / WorkArea.C

diff --git a/src/frontends/WorkArea.C b/src/frontends/WorkArea.C
index a4b870e7ea1f92bcefe1ed37b6db2bda12ff3eeb..135dd2071e259a00b61bb15cdb64f244b4200935 100644 (file)
--- a/src/frontends/WorkArea.C
+++ b/src/frontends/WorkArea.C
@@ -40,14 +40,12 @@
 #include "rowpainter.h"
 
 #include "gettext.h"
-#include "support/filetools.h" // LibFileSearch
 #include "support/forkedcontr.h"
 
 #include <boost/utility.hpp>
 #include <boost/bind.hpp>
 #include <boost/current_function.hpp>
 
-using lyx::support::libFileSearch;
 using lyx::support::ForkedcallsController;
 
 using std::endl;
@@ -142,7 +140,7 @@ void WorkArea::redraw()
 
        // No need to do anything if this is the current view. The BufferView 
        // metrics are already up to date.
-       if (&lyx_view_ != &theApp()->currentView())
+       if (&lyx_view_ != theApp()->currentView())
                // FIXME: it would be nice to optimize for the off-screen case.
                buffer_view_->updateMetrics(false);
 
@@ -195,7 +193,7 @@ void WorkArea::dispatch(FuncRequest const & cmd0)
 
        theLyXFunc().setLyXView(&lyx_view_);
 
-       std::pair<bool, bool> needRedraw = buffer_view_->workAreaDispatch(cmd0);
+       bool needRedraw = buffer_view_->workAreaDispatch(cmd0);
 
        // Skip these when selecting
        if (cmd0.action != LFUN_MOUSE_MOTION) {
@@ -218,7 +216,7 @@ void WorkArea::dispatch(FuncRequest const & cmd0)
                toggleCursor();
        }
 
-       if (needRedraw.first)
+       if (needRedraw)
                redraw();
 }
 
@@ -229,7 +227,6 @@ void WorkArea::resizeBufferView()
        lyx_view_.message(_("Formatting document..."));
        buffer_view_->workAreaResize(width(), height());
        lyx_view_.updateLayoutChoice();
-       redraw();
        lyx_view_.busy(false);
        lyx_view_.clearMessage();
 }