[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sw/source

[Cédric Bosdonnat]

 sw/source/ui/index/cnttab.cxx  |    3 +++
 sw/source/ui/uiview/scroll.cxx |    5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e611a2edceffba59e153e802ca15e8041301a117
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Fri Jan 13 16:08:17 2012 +0100

    fdo#38515: Fixed crasher in dialog destructor

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index dfb2ab5..30f3a84 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -356,6 +356,9 @@ SwMultiTOXTabDialog::~SwMultiTOXTabDialog()
 {
     SW_MOD()->GetModuleConfig()->SetShowIndexPreview(aShowExampleCB.IsChecked());
 
+    // fdo#38515 Avoid setting focus on deleted controls in the destructors
+    EnableInput( sal_False );
+
     for(sal_uInt16 i = 0; i < nTypeCount; i++)
     {
         delete pFormArr[i];
commit f80ed35b8b2f12a89dee257b82022141e0486362
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Fri Jan 13 12:00:19 2012 +0100

    fdo#30788: why not showing horizontal scrollbar when needed?

diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx
index cd33e92..2bf1d6d 100644
--- a/sw/source/ui/uiview/scroll.cxx
+++ b/sw/source/ui/uiview/scroll.cxx
@@ -132,10 +132,7 @@ void SwScrollbar::AutoShow()
             if(ScrollBar::IsVisible())
                 ScrollBar::Show(sal_False);
         }
-        else if ( !ScrollBar::IsVisible() &&
-                  (!bHori || nVis) )        //Optimierung fuer Browser.
-                                            //Horizontaler Scrollbar per
-                                            //default aus.
+        else if ( !ScrollBar::IsVisible() )
         {
             ScrollBar::Show(sal_True);
         }