[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-2' - svx/source

[László Németh]

 svx/source/stbctrls/zoomsliderctrl.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 99a73cff9e9be6a39292d4d959ea2c0079cde0fe
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Fri Sep 4 16:30:56 2015 +0200

    tdf#92843: fix disappearing zoom slider
    
    Change-Id: I2b45b7cf96af7950cf097c2b6a880e9eda021184
    Reviewed-on: https://gerrit.libreoffice.org/18448
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: László Németh <nemeth at numbertext.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index fcc6e5d..526bed7 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -44,7 +44,6 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
     Image                    maIncreaseButton;
     Image                    maDecreaseButton;
     bool                     mbValuesSet;
-    bool                     mbOmitPaint;
     bool                     mbDraggingStarted;
 
     SvxZoomSliderControl_Impl() :
@@ -58,7 +57,6 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
         maIncreaseButton(),
         maDecreaseButton(),
         mbValuesSet( false ),
-        mbOmitPaint( false ),
         mbDraggingStarted( false ) {}
 };
 
@@ -242,13 +240,12 @@ void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eStat
         }
     }
 
-    if (!mxImpl->mbOmitPaint)
-        forceRepaint();
+    forceRepaint();
 }
 
 void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt )
 {
-    if ( !mxImpl->mbValuesSet || mxImpl->mbOmitPaint )
+    if ( !mxImpl->mbValuesSet )
         return;
 
     const Rectangle     aControlRect = getControlRect();
@@ -408,9 +405,6 @@ void SvxZoomSliderControl::repaintAndExecute()
 {
     forceRepaint();
 
-    mxImpl->mbOmitPaint = true; // optimization: paint before executing command,
-                                // then omit painting which is triggered by the execute function
-
     // commit state change
     SvxZoomSliderItem aZoomSliderItem(mxImpl->mnCurrentZoom);
 
@@ -422,8 +416,6 @@ void SvxZoomSliderControl::repaintAndExecute()
     aArgs[0].Value = any;
 
     execute(aArgs);
-
-    mxImpl->mbOmitPaint = false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */