Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / frontends / qt4 / GuiWorkArea.cpp

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 0fe721f21ada35114200cc68fb7b13642d0dfe74..79277e7ff10582389b04b94e1f2331348ab842d1 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -307,7 +307,7 @@ GuiWorkArea::~GuiWorkArea()
 
 void GuiWorkArea::fixVerticalScrollBar()
 {
-       if (!buffer_view_->fullScreen())
+       if (!isFullScreen())
                setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
 }
 
@@ -558,11 +558,11 @@ void GuiWorkArea::updateScrollbar()
 {
        ScrollbarParameters const & scroll_ = buffer_view_->scrollbarParameters();
 
+       // Block the scrollbar signal to prevent recursive signal/slot calling.
+       verticalScrollBar()->blockSignals(true);
        verticalScrollBar()->setRange(scroll_.min, scroll_.max);
        verticalScrollBar()->setPageStep(scroll_.page_step);
        verticalScrollBar()->setSingleStep(scroll_.single_step);
-       // Block the scrollbar signal to prevent recursive signal/slot calling.
-       verticalScrollBar()->blockSignals(true);
        verticalScrollBar()->setValue(scroll_.position);
        verticalScrollBar()->setSliderPosition(scroll_.position);
        verticalScrollBar()->blockSignals(false);
@@ -1256,7 +1256,7 @@ GuiWorkArea * TabWorkArea::currentWorkArea()
                return 0;
 
        GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(currentWidget()); 
-       BOOST_ASSERT(wa);
+       LASSERT(wa, /**/);
        return wa;
 }
 
@@ -1265,7 +1265,7 @@ GuiWorkArea * TabWorkArea::workArea(Buffer & buffer)
 {
        for (int i = 0; i != count(); ++i) {
                GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(i));
-               BOOST_ASSERT(wa);
+               LASSERT(wa, return 0);
                if (&wa->bufferView().buffer() == &buffer)
                        return wa;
        }
@@ -1277,7 +1277,7 @@ void TabWorkArea::closeAll()
 {
        while (count()) {
                GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(0));
-               BOOST_ASSERT(wa);
+               LASSERT(wa, /**/);
                removeTab(0);
                delete wa;
        }
@@ -1286,7 +1286,7 @@ void TabWorkArea::closeAll()
 
 bool TabWorkArea::setCurrentWorkArea(GuiWorkArea * work_area)
 {
-       BOOST_ASSERT(work_area);
+       LASSERT(work_area, /**/);
        int index = indexOf(work_area);
        if (index == -1)
                return false;
@@ -1326,7 +1326,7 @@ GuiWorkArea * TabWorkArea::addWorkArea(Buffer & buffer, GuiView & view)
 
 bool TabWorkArea::removeWorkArea(GuiWorkArea * work_area)
 {
-       BOOST_ASSERT(work_area);
+       LASSERT(work_area, return false);
        int index = indexOf(work_area);
        if (index == -1)
                return false;
@@ -1343,8 +1343,9 @@ bool TabWorkArea::removeWorkArea(GuiWorkArea * work_area)
                else
                        // Hide tabbar if there's only one tab.
                        showBar(count() > 1);
-       } else
+       } else {
                lastWorkAreaRemoved();
+       }
 
        return true;
 }
@@ -1352,8 +1353,11 @@ bool TabWorkArea::removeWorkArea(GuiWorkArea * work_area)
 
 void TabWorkArea::on_currentTabChanged(int i)
 {
+       // returns e.g. on application destruction
+       if (i == -1)
+               return;
        GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(i));
-       BOOST_ASSERT(wa);
+       LASSERT(wa, return);
        BufferView & bv = wa->bufferView();
        bv.cursor().fixIfBroken();
        bv.updateMetrics();
@@ -1383,7 +1387,7 @@ void TabWorkArea::closeCurrentTab()
                removeWorkArea(currentWorkArea());
        else {
                GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(clicked_tab_)); 
-               BOOST_ASSERT(wa);
+               LASSERT(wa, /**/);
                removeWorkArea(wa);
        }
 }