From cdc5fe87ec8f4670600f86ad9cacac21d627c40f Mon Sep 17 00:00:00 2001 From: László Németh Date: Fri, 4 Sep 2015 16:30:56 +0200 Subject: tdf#92843: fix disappearing zoom slider Change-Id: I2b45b7cf96af7950cf097c2b6a880e9eda021184 Reviewed-on: https://gerrit.libreoffice.org/18342 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- svx/source/stbctrls/zoomsliderctrl.cxx | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index fcc6e5dd8619..526bed7030ae 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: */ -- cgit v1.2.3