diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-08-16 15:33:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-08-16 21:40:17 +0200 |
| commit | c53f3f8f58f55d0978fb968446975856d72a52f8 (patch) | |
| tree | 2ea9c7dc98b4e50e6af7b96853d7288a829f6438 /sw | |
| parent | db7701a3072117e9808e73bc3a071b236daacfc5 (diff) | |
tdf#126819 Can't retrieve the mouse position written in the statusbar
regression from
commit 77e260f915e0c77ddb1e915e9fd27ab0bdccc763
Date: Mon Jul 8 11:22:12 2019 +0200
tdf#121793 speedup VCLXAccessibleStatusBarItem::GetItemText
Make the custom StatusBarControls set better text on their parent
StatusBar. Also remove some unnecessary work being done in the Paint
methods, to reduce confusion.
Change-Id: I3b0a0af3b01d3b01f85ab335a3eb5993c07a50f4
Reviewed-on: https://gerrit.libreoffice.org/77586
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/utlui/bookctrl.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/tmplctrl.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/zoomctrl.cxx | 6 |
3 files changed, 1 insertions, 7 deletions
diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx index c432e3c6b003..348ffb5f0297 100644 --- a/sw/source/uibase/utlui/bookctrl.cxx +++ b/sw/source/uibase/utlui/bookctrl.cxx @@ -96,7 +96,6 @@ void SwBookmarkControl::StateChanged( void SwBookmarkControl::Paint( const UserDrawEvent& ) { - GetStatusBar().SetItemText( GetId(), sPageNumber ); } void SwBookmarkControl::Command( const CommandEvent& rCEvt ) diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx index 11b304d660be..2ab9883d231f 100644 --- a/sw/source/uibase/utlui/tmplctrl.cxx +++ b/sw/source/uibase/utlui/tmplctrl.cxx @@ -88,7 +88,6 @@ void SwTemplateControl::StateChanged( void SwTemplateControl::Paint( const UserDrawEvent& ) { - GetStatusBar().SetItemText( GetId(), sTemplate ); } void SwTemplateControl::Command( const CommandEvent& rCEvt ) diff --git a/sw/source/uibase/utlui/zoomctrl.cxx b/sw/source/uibase/utlui/zoomctrl.cxx index 967a98ffbf2e..c1e9e95c5140 100644 --- a/sw/source/uibase/utlui/zoomctrl.cxx +++ b/sw/source/uibase/utlui/zoomctrl.cxx @@ -56,12 +56,8 @@ void SwZoomControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, } } -void SwZoomControl::Paint( const UserDrawEvent& rUsrEvt ) +void SwZoomControl::Paint( const UserDrawEvent& ) { - if (sPreviewZoom.isEmpty()) - SvxZoomStatusBarControl::Paint(rUsrEvt); - else - GetStatusBar().SetItemText(GetId(), sPreviewZoom); } void SwZoomControl::Command( const CommandEvent& rCEvt ) |