diff options
| author | Armin Le Grand (Allotropia) <armin.le.grand@me.com> | 2021-06-17 10:17:25 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@me.com> | 2021-06-18 11:10:56 +0200 |
| commit | 04cd6749177f886f382e8bcd026f95112ee22473 (patch) | |
| tree | b74693c1a738add2df00cedc85397720598f3021 | |
| parent | 6317f8cc83ec92b8700785ab67c4c66ed1aa8fb2 (diff) | |
tdf#130428 remove unnecessary usage of SfxItemState::UNKNOWN
Rename ::StateChanged methods using SfxItemState to allow
better analysis of SfxItemState/SfxPoolItem usage(s),
discussion see tdf#130428 comment 30
Change-Id: I736be0160ad7a9b7882c1c8a4cc05d9396ee3305
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117366
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
115 files changed, 176 insertions, 172 deletions
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx index 74049cf9bf7e..55a19ac6601d 100644 --- a/avmedia/source/framework/mediatoolbox.cxx +++ b/avmedia/source/framework/mediatoolbox.cxx @@ -80,7 +80,7 @@ MediaToolBoxControl::~MediaToolBoxControl() } -void MediaToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) +void MediaToolBoxControl::StateChangedAtToolBoxControl( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { MediaToolBoxControl_Impl* pCtrl = static_cast< MediaToolBoxControl_Impl* >( GetToolBox().GetItemWindow( GetId() ) ); diff --git a/basctl/source/basicide/IDEComboBox.cxx b/basctl/source/basicide/IDEComboBox.cxx index cff0e58a206e..87a45e5a9c22 100644 --- a/basctl/source/basicide/IDEComboBox.cxx +++ b/basctl/source/basicide/IDEComboBox.cxx @@ -64,7 +64,8 @@ LibBoxControl::LibBoxControl(sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTb { } -void LibBoxControl::StateChanged(sal_uInt16, SfxItemState eState, const SfxPoolItem* pState) +void LibBoxControl::StateChangedAtToolBoxControl(sal_uInt16, SfxItemState eState, + const SfxPoolItem* pState) { LibBox* pBox = static_cast<LibBox*>(GetToolBox().GetItemWindow(GetId())); @@ -364,7 +365,8 @@ LanguageBoxControl::LanguageBoxControl(sal_uInt16 nSlotId, ToolBoxItemId nId, To { } -void LanguageBoxControl::StateChanged(sal_uInt16, SfxItemState eState, const SfxPoolItem* pItem) +void LanguageBoxControl::StateChangedAtToolBoxControl(sal_uInt16, SfxItemState eState, + const SfxPoolItem* pItem) { if (LanguageBox* pBox = static_cast<LanguageBox*>(GetToolBox().GetItemWindow(GetId()))) { diff --git a/basctl/source/inc/IDEComboBox.hxx b/basctl/source/inc/IDEComboBox.hxx index 3f1072511b8e..a5e7008a42e9 100644 --- a/basctl/source/inc/IDEComboBox.hxx +++ b/basctl/source/inc/IDEComboBox.hxx @@ -61,8 +61,8 @@ public: * @param eState -- enum value which contains ComboBox state * @param pState -- */ - virtual void StateChanged(sal_uInt16 nSlotID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSlotID, SfxItemState eState, + const SfxPoolItem* pState) override; /*! * Create combobox of Macro and Dialog Library * @@ -205,8 +205,8 @@ public: * @param eState -- enum value which contains ComboBox state * @param pState -- */ - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; /*! * Create ComboBox of Language * diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index d8e1790f5b20..91ec19f7725f 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -58,7 +58,7 @@ void SvxHlinkCtrl::dispose() ::SfxControllerItem::dispose(); } -void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState, +void SvxHlinkCtrl::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if (!(eState == SfxItemState::DEFAULT && pParent)) diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 490fbb26e4e3..9d6e1ee358d1 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -49,7 +49,7 @@ public: SvxHlinkCtrl( sal_uInt16 nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg); virtual void dispose() override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; }; diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx index 0a742abd6214..434d202ca967 100644 --- a/include/avmedia/mediatoolbox.hxx +++ b/include/avmedia/mediatoolbox.hxx @@ -39,7 +39,7 @@ public: MediaToolBoxControl( sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbX ); virtual ~MediaToolBoxControl() override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window* pParent ) override; private: diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index da9f86f93e1c..27f2d69422ea 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -62,7 +62,7 @@ public: void SetId( sal_uInt16 nItemId ); sal_uInt16 GetId() const { return nId; } - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void GetControlState( sal_uInt16 nSID, boost::property_tree::ptree& ); @@ -84,7 +84,7 @@ class SFX2_DLLPUBLIC SfxStatusForwarder final : public SfxControllerItem { SfxControllerItem* pMaster; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; public: diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx index 1361f2f165a6..a9c30d46ca53 100644 --- a/include/sfx2/sfxstatuslistener.hxx +++ b/include/sfx2/sfxstatuslistener.hxx @@ -47,7 +47,7 @@ class UNLESS_MERGELIBS(SFX2_DLLPUBLIC) SfxStatusListener : public cppu::WeakImpl void UnBind(); void ReBind(); - virtual void StateChanged( SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChangedAtStatusListener( SfxItemState eState, const SfxPoolItem* pState ); // XComponent virtual void SAL_CALL dispose() override; diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx index 05e5910ff55d..a8f82195a496 100644 --- a/include/sfx2/sidebar/ControllerItem.hxx +++ b/include/sfx2/sidebar/ControllerItem.hxx @@ -68,7 +68,7 @@ public: private: - virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) override; virtual void GetControlState (sal_uInt16 nSId, boost::property_tree::ptree& rState) override; ItemUpdateReceiverInterface& mrItemUpdateReceiver; diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index dc3cd7497bb4..67c88c68710d 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -92,7 +92,7 @@ protected: virtual void SAL_CALL doubleClick( const css::awt::Point& aPos ) override; // Old sfx2 interface - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, + virtual void StateChangedAtStatusBarControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Click(); virtual void Command( const CommandEvent& rCEvt ); diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 6de697a12197..e3953c4e5b7a 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -78,7 +78,7 @@ friend struct SfxTbxCtrlFactory; protected: // old SfxToolBoxControl methods - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Select( sal_uInt16 nSelectModifier ); virtual void DoubleClick(); diff --git a/include/svx/ParaSpacingControl.hxx b/include/svx/ParaSpacingControl.hxx index c6d7af27fa49..3a5c1d0fa861 100644 --- a/include/svx/ParaSpacingControl.hxx +++ b/include/svx/ParaSpacingControl.hxx @@ -44,8 +44,8 @@ public: ParaULSpacingControl(sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx); virtual ~ParaULSpacingControl() override; - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override = 0; }; @@ -75,8 +75,8 @@ public: virtual void SAL_CALL dispose() override; - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override = 0; // XContextChangeEventListener diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index 118b3c79deec..78dbbbea83b8 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -49,7 +49,7 @@ class SvxBmpMaskSelectItem final : public SfxControllerItem { SvxBmpMask &rBmpMask; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; public: diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx index 2c93dedfaf86..44c79040de9d 100644 --- a/include/svx/clipboardctl.hxx +++ b/include/svx/clipboardctl.hxx @@ -41,7 +41,7 @@ public: virtual ~SvxClipBoardControl() override; void CreatePopupWindow() override; - virtual void StateChanged( sal_uInt16 nSID, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; }; diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index ad428a10529f..750257dd06f7 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -68,7 +68,7 @@ public: SvxFillToolBoxControl(sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx); virtual ~SvxFillToolBoxControl() override; - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; void Update(); virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override; }; diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 50e1a26aaddf..fbc74e6e31a6 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -259,7 +259,7 @@ public: class Svx3DCtrlItem : public SfxControllerItem { protected: - virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) override; public: @@ -278,7 +278,7 @@ class SvxConvertTo3DItem : public SfxControllerItem bool bState; protected: - virtual void StateChanged(sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) override; public: SvxConvertTo3DItem(sal_uInt16 nId, SfxBindings* pBindings); diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index 31d350fa13cc..7fe65fd452d0 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -49,7 +49,7 @@ class SvxFontWorkControllerItem final : public SfxControllerItem { SvxFontWorkDialog &rFontWorkDlg; - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; public: diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx index a9bb530da25c..461ce46e7b00 100644 --- a/include/svx/formatpaintbrushctrl.hxx +++ b/include/svx/formatpaintbrushctrl.hxx @@ -40,7 +40,7 @@ public: virtual void Click() override; virtual void Select(sal_uInt16 nSelectModifier) override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; private: DECL_LINK( WaitDoubleClickHdl, Timer*, void ); diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index ad3187c6dcb3..bdb49f323e18 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -31,7 +31,7 @@ public: SvxGrafToolBoxControl( sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx ); virtual ~SvxGrafToolBoxControl() override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window *pParent ) override; }; @@ -99,7 +99,7 @@ public: SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx ); virtual ~SvxGrafModeToolBoxControl() override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window *pParent ) override; }; diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index edd80a41285e..3032018de9df 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -68,7 +68,7 @@ class SvxIMapDlgItem final : public SfxControllerItem { SvxIMapDlg& rIMap; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; diff --git a/include/svx/insctrl.hxx b/include/svx/insctrl.hxx index 1e02601350dd..b2a5102ca158 100644 --- a/include/svx/insctrl.hxx +++ b/include/svx/insctrl.hxx @@ -26,8 +26,8 @@ class SVX_DLLPUBLIC SvxInsertStatusBarControl final : public SfxStatusBarControl { public: - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtStatusBarControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; virtual void Paint(const UserDrawEvent& rEvt) override; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index 2fd24305ca2e..e2cd9e6c8852 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -82,7 +82,7 @@ public: SvxLineWidthToolBoxControl( sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx ); virtual ~SvxLineWidthToolBoxControl() override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window *pParent ) override; }; diff --git a/include/svx/modctrl.hxx b/include/svx/modctrl.hxx index 64423c920d71..f5b66c980f92 100644 --- a/include/svx/modctrl.hxx +++ b/include/svx/modctrl.hxx @@ -30,8 +30,8 @@ class Timer; class SVX_DLLPUBLIC SvxModifyControl final : public SfxStatusBarControl { public: - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtStatusBarControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; virtual void Paint(const UserDrawEvent& rUsrEvt) override; virtual void Click() override; diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx index 0961f3b5b867..c4b077a2a064 100644 --- a/include/svx/pszctrl.hxx +++ b/include/svx/pszctrl.hxx @@ -36,7 +36,7 @@ public: SvxPosSizeStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); virtual ~SvxPosSizeStatusBarControl() override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void StateChangedAtStatusBarControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual void Paint( const UserDrawEvent& rEvt ) override; virtual void Command( const CommandEvent& rCEvt ) override; private: diff --git a/include/svx/selctrl.hxx b/include/svx/selctrl.hxx index 4deea5880901..8136418e67f1 100644 --- a/include/svx/selctrl.hxx +++ b/include/svx/selctrl.hxx @@ -31,8 +31,8 @@ public: SvxSelectionModeControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb); - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtStatusBarControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; virtual bool MouseButtonDown(const MouseEvent& rEvt) override; virtual void Paint(const UserDrawEvent& rEvt) override; virtual void Click() override; diff --git a/include/svx/tbxctl.hxx b/include/svx/tbxctl.hxx index f2e28c9ec47d..09af66c61165 100644 --- a/include/svx/tbxctl.hxx +++ b/include/svx/tbxctl.hxx @@ -45,7 +45,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); virtual void Select(sal_uInt16 nSelectModifier) override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; }; diff --git a/include/svx/xmlsecctrl.hxx b/include/svx/xmlsecctrl.hxx index 5ba255a5ee9c..b9019cf25d0d 100644 --- a/include/svx/xmlsecctrl.hxx +++ b/include/svx/xmlsecctrl.hxx @@ -38,7 +38,7 @@ public: XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ); virtual ~XmlSecStatusBarControl() override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void StateChangedAtStatusBarControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual void Paint( const UserDrawEvent& rEvt ) override; virtual void Command( const CommandEvent& rCEvt ) override; }; diff --git a/include/svx/zoomctrl.hxx b/include/svx/zoomctrl.hxx index f7a565affeb7..0c64db1e5efa 100644 --- a/include/svx/zoomctrl.hxx +++ b/include/svx/zoomctrl.hxx @@ -31,8 +31,8 @@ private: SvxZoomEnableFlags nValueSet; public: - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtStatusBarControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; virtual void Paint(const UserDrawEvent& rEvt) override; virtual void Command(const CommandEvent& rCEvt) override; diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx index dd13029a548a..ba300e26116a 100644 --- a/include/svx/zoomsliderctrl.hxx +++ b/include/svx/zoomsliderctrl.hxx @@ -44,7 +44,7 @@ public: SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ); virtual ~SvxZoomSliderControl() override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void StateChangedAtStatusBarControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual void Paint( const UserDrawEvent& rEvt ) override; virtual bool MouseButtonDown( const MouseEvent & ) override; virtual bool MouseButtonUp( const MouseEvent & ) override; diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index ce00f4f654ea..22f2d771412e 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -129,7 +129,7 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv { SvxZoomSliderItem aZoomSlider(100,20,400); aZoomSlider.PutValue(_aEvent.State, 0); - static_cast<SvxZoomSliderControl*>(m_rController.get())->StateChanged(m_nSlotId,SfxItemState::DEFAULT,&aZoomSlider); + static_cast<SvxZoomSliderControl*>(m_rController.get())->StateChangedAtStatusBarControl(m_nSlotId,SfxItemState::DEFAULT,&aZoomSlider); } } else if ( m_aCommandURL == ".uno:Zoom" ) @@ -139,7 +139,7 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv { SvxZoomItem aZoom; aZoom.PutValue(_aEvent.State, 0 ); - static_cast<SvxZoomStatusBarControl*>(m_rController.get())->StateChanged(m_nSlotId,SfxItemState::DEFAULT,&aZoom); + static_cast<SvxZoomStatusBarControl*>(m_rController.get())->StateChangedAtStatusBarControl(m_nSlotId,SfxItemState::DEFAULT,&aZoom); } } } diff --git a/sc/inc/NumberFormatControl.hxx b/sc/inc/NumberFormatControl.hxx index 55002b48d686..868a6ca00288 100644 --- a/sc/inc/NumberFormatControl.hxx +++ b/sc/inc/NumberFormatControl.hxx @@ -32,7 +32,7 @@ public: ScNumberFormatControl(sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx); virtual ~ScNumberFormatControl() override; - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window *pParent ) override; }; diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index ee0a5021fc66..b87c090d2fd4 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -48,7 +48,7 @@ ScZoomSliderControl::~ScZoomSliderControl() } -void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, +void ScZoomSliderControl::StateChangedAtToolBoxControl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { ToolBoxItemId nId = GetId(); diff --git a/sc/source/ui/inc/navcitem.hxx b/sc/source/ui/inc/navcitem.hxx index 1ae445fb5bc8..17131afbaee8 100644 --- a/sc/source/ui/inc/navcitem.hxx +++ b/sc/source/ui/inc/navcitem.hxx @@ -30,7 +30,7 @@ public: ScNavigatorDlg& rDlg, SfxBindings& rBindings ); protected: - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pItem ) override; private: diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 1a18fc80cee1..1ef4d521c672 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -35,7 +35,7 @@ public: ScZoomSliderControl( sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx ); virtual ~ScZoomSliderControl() override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window *pParent ) override; }; diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx index ba996ce1df79..871fbd445e9b 100644 --- a/sc/source/ui/navipi/navcitem.cxx +++ b/sc/source/ui/navipi/navcitem.cxx @@ -34,7 +34,7 @@ ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16 nIdP, { } -void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemState /* eState */, +void ScNavigatorControllerItem::StateChangedAtToolBoxControl( sal_uInt16 /* nSID */, SfxItemState /* eState */, const SfxPoolItem* pItem ) { switch( GetId() ) diff --git a/sc/source/ui/sidebar/NumberFormatControl.cxx b/sc/source/ui/sidebar/NumberFormatControl.cxx index 0337ec5cad04..1060f0f5db45 100644 --- a/sc/source/ui/sidebar/NumberFormatControl.cxx +++ b/sc/source/ui/sidebar/NumberFormatControl.cxx @@ -35,7 +35,7 @@ ScNumberFormatControl::~ScNumberFormatControl() { } -void ScNumberFormatControl::StateChanged(sal_uInt16, SfxItemState eState, +void ScNumberFormatControl::StateChangedAtToolBoxControl(sal_uInt16, SfxItemState eState, const SfxPoolItem* pState) { ToolBoxItemId nId = GetId(); diff --git a/sd/source/ui/app/scalectrl.cxx b/sd/source/ui/app/scalectrl.cxx index d1b8dc277fce..6d61f351d145 100644 --- a/sd/source/ui/app/scalectrl.cxx +++ b/sd/source/ui/app/scalectrl.cxx @@ -44,8 +44,8 @@ SdScaleControl::SdScaleControl(sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& SdScaleControl::~SdScaleControl() {} -void SdScaleControl::StateChanged(sal_uInt16 /*nSID*/, SfxItemState eState, - const SfxPoolItem* pState) +void SdScaleControl::StateChangedAtStatusBarControl(sal_uInt16 /*nSID*/, SfxItemState eState, + const SfxPoolItem* pState) { if (eState != SfxItemState::DEFAULT || pState->IsVoidItem()) return; diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index a6b89fb1dad4..1f645bf66ee1 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -48,7 +48,7 @@ SdTemplateControl::~SdTemplateControl() { } -void SdTemplateControl::StateChanged( +void SdTemplateControl::StateChangedAtStatusBarControl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { if( eState != SfxItemState::DEFAULT || pState->IsVoidItem() ) diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 001e7c5d02e0..6a158445a7fa 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -1113,7 +1113,7 @@ AnimationControllerItem::AnimationControllerItem( { } -void AnimationControllerItem::StateChanged( sal_uInt16 nSId, +void AnimationControllerItem::StateChangedAtToolBoxControl( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) { if( eState >= SfxItemState::DEFAULT && nSId == SID_ANIMATOR_STATE ) diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index 6dd4fb84516d..aa2296edeb5d 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -148,7 +148,7 @@ SdTbxCtlDiaPages::~SdTbxCtlDiaPages() { } -void SdTbxCtlDiaPages::StateChanged( sal_uInt16, +void SdTbxCtlDiaPages::StateChangedAtToolBoxControl( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { SdPagesField* pFld = static_cast<SdPagesField*>( GetToolBox().GetItemWindow( GetId() ) ); diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 23e1e4b98317..87ac30fb7cda 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -142,7 +142,7 @@ SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir( /** * Represents state in the listbox of the controller */ -void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId, +void SdTbxCtlGlueEscDir::StateChangedAtToolBoxControl( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) { if( eState == SfxItemState::DEFAULT ) @@ -172,7 +172,7 @@ void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId, } } - SfxToolBoxControl::StateChanged( nSId, eState, pState ); + SfxToolBoxControl::StateChangedAtToolBoxControl( nSId, eState, pState ); } VclPtr<InterimItemWindow> SdTbxCtlGlueEscDir::CreateItemWindow( vcl::Window *pParent ) diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index d9f7c5040f7e..78525efe54f2 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -628,7 +628,7 @@ SdNavigatorControllerItem::SdNavigatorControllerItem( { } -void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId, +void SdNavigatorControllerItem::StateChangedAtToolBoxControl( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) { if( eState < SfxItemState::DEFAULT || nSId != SID_NAVIGATOR_STATE ) @@ -707,7 +707,7 @@ SdPageNameControllerItem::SdPageNameControllerItem( { } -void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId, +void SdPageNameControllerItem::StateChangedAtToolBoxControl( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) { if( eState < SfxItemState::DEFAULT || nSId != SID_NAVIGATOR_PAGENAME ) diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index af304228af42..b44a5fb3dc08 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -152,7 +152,7 @@ public: AnimationControllerItem( sal_uInt16, AnimationWindow*, SfxBindings* ); protected: - virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) override; private: VclPtr<AnimationWindow> pAnimationWin; diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 6d7b5b9453a7..12e76762e1f3 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -55,8 +55,8 @@ public: class SdTbxCtlDiaPages : public SfxToolBoxControl { public: - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index b70aab865785..58aa13944b50 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -56,8 +56,8 @@ private: static sal_uInt16 GetEscDirPos(SdrEscapeDirection nEscDir); public: - virtual void StateChanged(sal_uInt16 nSId, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSId, SfxItemState eState, + const SfxPoolItem* pState) override; virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index b19748c8cbf7..e6032f8b846d 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -178,7 +178,7 @@ public: const SdNavigatorWin::UpdateRequestFunctor& rUpdateRequest); protected: - virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) override; private: @@ -195,7 +195,7 @@ public: SdPageNameControllerItem( sal_uInt16, SdNavigatorWin*, SfxBindings*); protected: - virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) override; private: diff --git a/sd/source/ui/inc/scalectrl.hxx b/sd/source/ui/inc/scalectrl.hxx index 85c93017172f..96745973f6d1 100644 --- a/sd/source/ui/inc/scalectrl.hxx +++ b/sd/source/ui/inc/scalectrl.hxx @@ -27,8 +27,8 @@ public: SdScaleControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb); virtual ~SdScaleControl() override; - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtStatusBarControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx index 206ec7324824..2366a8c693dc 100644 --- a/sd/source/ui/inc/tmplctrl.hxx +++ b/sd/source/ui/inc/tmplctrl.hxx @@ -26,7 +26,7 @@ public: SdTemplateControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); virtual ~SdTemplateControl() override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void StateChangedAtStatusBarControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual void Paint( const UserDrawEvent& rEvt ) override; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 8490a05d2bd0..571ffb37f8eb 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -41,7 +41,7 @@ class RulerCtrlItem : public SfxControllerItem Ruler &rRuler; protected: - virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pItem ) override; public: @@ -54,7 +54,7 @@ RulerCtrlItem::RulerCtrlItem(Ruler& rRlr, SfxBindings& rBind) { } -void RulerCtrlItem::StateChanged( sal_uInt16 nSId, SfxItemState, const SfxPoolItem* pState ) +void RulerCtrlItem::StateChangedAtToolBoxControl( sal_uInt16 nSId, SfxItemState, const SfxPoolItem* pState ) { switch( nSId ) { diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index 0eb4feecbe44..1e695a9e47b4 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -56,7 +56,7 @@ public: virtual ~SfxURLToolBoxControl_Impl() override; virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; }; #endif diff --git a/sfx2/inc/unoctitm.hxx b/sfx2/inc/unoctitm.hxx index c180150325cc..8259329e9e18 100644 --- a/sfx2/inc/unoctitm.hxx +++ b/sfx2/inc/unoctitm.hxx @@ -129,7 +129,7 @@ public: static OUString getSlaveCommand( const css::util::URL& rURL ); void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, SfxSlotServer const * pServ ); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; void setMasterSlaveCommand( bool bSet ); /// @throws css::uno::RuntimeException void dispatch( const css::util::URL& aURL, diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index 308706f95b8c..b55ceda7d349 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -199,7 +199,7 @@ void SfxControllerItem::dispose() UnBind(); } -void SfxControllerItem::StateChanged +void SfxControllerItem::StateChangedAtToolBoxControl ( sal_uInt16, // <SID> of the triggering slot SfxItemState, // <SfxItemState> of 'pState' @@ -234,7 +234,7 @@ void SfxControllerItem::GetControlState { } -void SfxStatusForwarder::StateChanged +void SfxStatusForwarder::StateChangedAtToolBoxControl ( sal_uInt16 nSID, // <SID> of the triggering slot SfxItemState eState, // <SfxItemState> of 'pState' @@ -242,7 +242,7 @@ void SfxStatusForwarder::StateChanged ) { - pMaster->StateChanged( nSID, eState, pState ); + pMaster->StateChangedAtToolBoxControl( nSID, eState, pState ); } diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index 9452d9e7ad91..ff436cbd52a0 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -62,7 +62,7 @@ SfxStatusListener::~SfxStatusListener() } // old sfx controller item C++ API -void SfxStatusListener::StateChanged( SfxItemState, const SfxPoolItem* ) +void SfxStatusListener::StateChangedAtStatusListener( SfxItemState, const SfxPoolItem* ) { // must be implemented by sub class } @@ -220,7 +220,7 @@ void SAL_CALL SfxStatusListener::statusChanged( const FeatureStateEvent& rEvent) } } - StateChanged( eState, pItem.get() ); + StateChangedAtStatusListener( eState, pItem.get() ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 6942818096ea..79d4a1eaf6b6 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -136,7 +136,7 @@ void SAL_CALL BindDispatch_Impl::statusChanged( const css::frame::FeatureStateE for ( SfxControllerItem *pCtrl = pCache->GetItemLink(); pCtrl; pCtrl = pCtrl->GetItemLink() ) - pCtrl->StateChanged( nId, eState, pItem.get() ); + pCtrl->StateChangedAtToolBoxControl( nId, eState, pItem.get() ); } } @@ -372,11 +372,11 @@ void SfxStateCache::SetVisibleState( bool bShow ) for ( SfxControllerItem *pCtrl = pController; pCtrl; pCtrl = pCtrl->GetItemLink() ) - pCtrl->StateChanged( nId, eState, pState ); + pCtrl->StateChangedAtToolBoxControl( nId, eState, pState ); } if ( pInternalController ) - pInternalController->StateChanged( nId, eState, pState ); + pInternalController->StateChangedAtToolBoxControl( nId, eState, pState ); if ( bDeleteItem ) delete pState; @@ -420,7 +420,7 @@ void SfxStateCache::SetState_Impl for ( SfxControllerItem *pCtrl = pController; pCtrl; pCtrl = pCtrl->GetItemLink() ) - pCtrl->StateChanged( nId, eState, pState ); + pCtrl->StateChangedAtToolBoxControl( nId, eState, pState ); } if ( pInternalController ) @@ -462,7 +462,7 @@ void SfxStateCache::SetCachedState( bool bAlways ) for ( SfxControllerItem *pCtrl = pController; pCtrl; pCtrl = pCtrl->GetItemLink() ) - pCtrl->StateChanged( nId, eLastState, pLastItem ); + pCtrl->StateChangedAtToolBoxControl( nId, eLastState, pLastItem ); } if ( pInternalController ) diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index d973da794d71..50034333bcd5 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -791,7 +791,7 @@ void SfxDispatchController_Impl::dispatch( const css::util::URL& aURL, { const SfxPoolItem* pState=nullptr; SfxItemState eState = pDispatcher->QueryState( GetId(), pState ); - StateChanged( GetId(), eState, pState ); + StateChangedAtToolBoxControl( GetId(), eState, pState ); } } @@ -975,7 +975,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt } } -void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) +void SfxDispatchController_Impl::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { StateChanged( nSID, eState, pState, nullptr ); } diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index 2a1a1d28a55f..af86e46b9736 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -51,7 +51,7 @@ SfxTemplateControllerItem::~SfxTemplateControllerItem() // Notice about change of status, is propagated through the Controller // passed on by the constructor -void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, +void SfxTemplateControllerItem::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pItem ) { switch(nSID) diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx index 9b13f8ce3acf..7ce479936e6d 100644 --- a/sfx2/source/inc/tplcitem.hxx +++ b/sfx2/source/inc/tplcitem.hxx @@ -33,7 +33,7 @@ class SfxTemplateControllerItem : public SfxControllerItem { DECL_LINK(SetWaterCanStateHdl_Impl, void*, void); protected: - virtual void StateChanged(sal_uInt16, SfxItemState, const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl(sal_uInt16, SfxItemState, const SfxPoolItem* pState) override; public: SfxTemplateControllerItem(sal_uInt16 nId, SfxCommonTemplateDialog_Impl& rDialog, SfxBindings& rBindings); diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 6027819ede7f..52b1d7ad1341 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -217,7 +217,7 @@ IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, OpenHdl, weld::ComboBox&, bool) return true; } -void SfxURLToolBoxControl_Impl::StateChanged +void SfxURLToolBoxControl_Impl::StateChangedAtToolBoxControl ( sal_uInt16 nSID, SfxItemState eState, diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx index a2953e807e61..e02276ec0cdd 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -40,7 +40,7 @@ ControllerItem::~ControllerItem() dispose(); } -void ControllerItem::StateChanged ( +void ControllerItem::StateChangedAtToolBoxControl ( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index b5f37270e9d9..6e31b10bc7b1 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -268,7 +268,7 @@ void SAL_CALL SfxStatusBarControl::statusChanged( const frame::FeatureStateEvent } } - StateChanged( nSlotID, eState, pItem.get() ); + StateChangedAtStatusBarControl( nSlotID, eState, pItem.get() ); } } @@ -356,7 +356,7 @@ void SAL_CALL SfxStatusBarControl::doubleClick( const awt::Point& ) } // old sfx2 interface -void SfxStatusBarControl::StateChanged +void SfxStatusBarControl::StateChangedAtStatusBarControl ( sal_uInt16 nSID, SfxItemState eState, diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 0ac302d49ce3..2db988e1518a 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -435,7 +435,7 @@ void SAL_CALL SfxToolBoxControl::statusChanged( const FeatureStateEvent& rEvent } } - StateChanged( nSlotId, eState, pItem.get() ); + StateChangedAtToolBoxControl( nSlotId, eState, pItem.get() ); } } @@ -471,7 +471,7 @@ Reference< css::awt::XWindow > SAL_CALL SfxToolBoxControl::createItemWindow( con return VCLUnoHelper::GetInterface( CreateItemWindow( VCLUnoHelper::GetWindow( rParent ))); } -void SfxToolBoxControl::StateChanged +void SfxToolBoxControl::StateChangedAtToolBoxControl ( sal_uInt16 /*nSlotId*/, SfxItemState eState, diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index ac2bf3411497..370459a3ec0f 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -341,7 +341,7 @@ void SfxViewFrame::INetExecute_Impl( SfxRequest &rRequest ) SfxControllerItem* pCtrl = pCache->GetItemLink(); while( pCtrl ) { - pCtrl->StateChanged( SID_FOCUSURLBOX, SfxItemState::UNKNOWN, nullptr ); + pCtrl->StateChangedAtToolBoxControl( SID_FOCUSURLBOX, SfxItemState::UNKNOWN, nullptr ); pCtrl = pCtrl->GetItemLink(); } } diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 3f77dd76c29c..e0a939478d2d 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -166,7 +166,7 @@ class SmGraphicController final : public SfxControllerItem SmGraphicWidget &rGraphic; public: SmGraphicController(SmGraphicWidget &, sal_uInt16, SfxBindings & ); - virtual void StateChanged(sal_uInt16 nSID, + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; }; @@ -178,7 +178,7 @@ class SmEditController final : public SfxControllerItem public: SmEditController(SmEditWindow &, sal_uInt16, SfxBindings & ); - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; }; class SmCmdBoxWindow : public SfxDockingWindow diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index e0b79fc42d07..338c667cdbd7 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -782,11 +782,11 @@ SmGraphicController::SmGraphicController(SmGraphicWidget &rSmGraphic, { } -void SmGraphicController::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) +void SmGraphicController::StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { rGraphic.SetTotalSize(); rGraphic.Invalidate(); - SfxControllerItem::StateChanged (nSID, eState, pState); + SfxControllerItem::StateChangedAtToolBoxControl (nSID, eState, pState); } /**************************************************************************/ @@ -798,13 +798,13 @@ SmEditController::SmEditController(SmEditWindow &rSmEdit, { } -void SmEditController::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) +void SmEditController::StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { const SfxStringItem *pItem = dynamic_cast<const SfxStringItem*>( pState); if ((pItem != nullptr) && (rEdit.GetText() != pItem->GetValue())) rEdit.SetText(pItem->GetValue()); - SfxControllerItem::StateChanged (nSID, eState, pState); + SfxControllerItem::StateChangedAtToolBoxControl (nSID, eState, pState); } /**************************************************************************/ diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 4a4aedc722c8..7f65bb697517 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -320,7 +320,7 @@ SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( SvxBmpMask& rMask, { } -void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, +void SvxBmpMaskSelectItem::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) { if ( ( nSID == SID_BMPMASK_EXEC ) && pItem ) diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index c61041949d14..c6fcde5d1dfc 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -45,7 +45,7 @@ SvxContourDlgItem::SvxContourDlgItem( SvxSuperContourDlg& rContourDlg, SfxBindin { } -void SvxContourDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) +void SvxContourDlgItem::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) { if ( pItem && ( SID_CONTOUR_EXEC == nSID ) ) { diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index 91579a2c901f..1c7e10959758 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -31,7 +31,7 @@ class SvxContourDlgItem : public SfxControllerItem protected: - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; public: diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 23d7a6782bb2..af1f25649c14 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -59,7 +59,7 @@ SvxFontWorkControllerItem::SvxFontWorkControllerItem // StateChanged method for FontWork items -void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*eState*/, +void SvxFontWorkControllerItem::StateChangedAtToolBoxControl( sal_uInt16 /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pItem ) { switch ( GetId() ) diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index d0555edf6334..ea30dfef1b97 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -67,7 +67,7 @@ SvxIMapDlgItem::SvxIMapDlgItem( SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) : { } -void SvxIMapDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, +void SvxIMapDlgItem::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) { if ( ( nSID == SID_IMAP_EXEC ) && pItem ) diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index f5309e843f0b..873663b27e30 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -38,7 +38,7 @@ SvxRulerItem::SvxRulerItem(sal_uInt16 _nId, SvxRuler &rRul, SfxBindings &rBindin } -void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, +void SvxRulerItem::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { // SfxItemState::DONTCARE => pState == -1 => PTR_CAST buff diff --git a/svx/source/dialog/rlrcitem.hxx b/svx/source/dialog/rlrcitem.hxx index 574d7fe91325..0fde86f0ca8e 100644 --- a/svx/source/dialog/rlrcitem.hxx +++ b/svx/source/dialog/rlrcitem.hxx @@ -29,7 +29,7 @@ private: SvxRuler& rRuler; protected: - virtual void StateChanged( sal_uInt16, + virtual void StateChangedAtToolBoxControl( sal_uInt16, SfxItemState, const SfxPoolItem* pState ) override; public: diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index 28747acd75f4..51c8d0333784 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -39,7 +39,7 @@ SvxSearchController::SvxSearchController } -void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState, +void SvxSearchController::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if ( SfxItemState::DEFAULT == eState ) diff --git a/svx/source/dialog/srchctrl.hxx b/svx/source/dialog/srchctrl.hxx index ec220a52fb8f..042757537718 100644 --- a/svx/source/dialog/srchctrl.hxx +++ b/svx/source/dialog/srchctrl.hxx @@ -27,7 +27,8 @@ class SvxSearchController : public SfxControllerItem SvxSearchDialog& rSrchDlg; protected: - virtual void StateChanged(sal_uInt16, SfxItemState, const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl(sal_uInt16, SfxItemState, + const SfxPoolItem* pState) override; public: SvxSearchController(sal_uInt16 nId, SfxBindings& rBnd, SvxSearchDialog& rDlg); diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 26de48ed4315..a3bd5f9ce430 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2893,7 +2893,7 @@ Svx3DCtrlItem::Svx3DCtrlItem( sal_uInt16 _nId, } -void Svx3DCtrlItem::StateChanged( sal_uInt16 /*nSId*/, +void Svx3DCtrlItem::StateChangedAtToolBoxControl( sal_uInt16 /*nSId*/, SfxItemState /*eState*/, const SfxPoolItem* /*pItem*/ ) { } @@ -2906,7 +2906,7 @@ SvxConvertTo3DItem::SvxConvertTo3DItem(sal_uInt16 _nId, SfxBindings* _pBindings) { } -void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/) +void SvxConvertTo3DItem::StateChangedAtToolBoxControl(sal_uInt16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/) { bool bNewState = (eState != SfxItemState::DISABLED); if(bNewState != bState) diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 56b85adbea38..1e1d366250b5 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2012,7 +2012,7 @@ namespace svxform SfxDockingWindow::dispose(); } - void DataNavigator::StateChanged( sal_uInt16 , SfxItemState , const SfxPoolItem* ) + void DataNavigator::StateChangedAtToolBoxControl( sal_uInt16 , SfxItemState , const SfxPoolItem* ) { } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index f5cc1e1358df..898db01ff396 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1771,7 +1771,7 @@ void FmFilterNavigatorWin::UpdateContent(FmFormShell const * pFormShell) } } -void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) +void FmFilterNavigatorWin::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if( !pState || SID_FM_FILTER_NAVIGATOR_CONTROL != nSID ) return; diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 478057eadf1e..8f793c4ce7f8 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -522,7 +522,7 @@ void FmPropBrw::impl_ensurePropertyBrowser_nothrow( FmFormShell* _pFormShell ) } -void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) +void FmPropBrw::StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { if (!pState || SID_FM_PROPERTY_CONTROL != nSID) return; diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 1d4e3db2a160..41ee0ced7931 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -462,7 +462,7 @@ namespace svxform m_xNavigatorTree->UpdateContent(pFormShell); } - void NavigatorFrame::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) + void NavigatorFrame::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if( !pState || SID_FM_FMEXPLORER_CONTROL != nSID ) return; diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 811fc8ea01a8..19fb11131751 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -180,7 +180,7 @@ void FmFieldWin::_propertyChanged(const css::beans::PropertyChangeEvent& evt) UpdateContent(xForm); } -void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) +void FmFieldWin::StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { if (!pState || SID_FM_FIELDS_CONTROL != nSID) return; diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 7f354f16d2d0..d38922a3b79a 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -64,7 +64,7 @@ SvxFmTbxCtlAbsRec::~SvxFmTbxCtlAbsRec() { } -void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) +void SvxFmTbxCtlAbsRec::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { ToolBoxItemId nId = GetId(); ToolBox* pToolBox = &GetToolBox(); @@ -86,7 +86,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons // enabling/disabling of the window pToolBox->EnableItem(nId, bEnable); - SfxToolBoxControl::StateChanged( nSID, eState,pState ); + SfxToolBoxControl::StateChangedAtToolBoxControl( nSID, eState,pState ); } VclPtr<InterimItemWindow> SvxFmTbxCtlAbsRec::CreateItemWindow( vcl::Window* pParent ) @@ -160,7 +160,7 @@ VclPtr<InterimItemWindow> SvxFmTbxCtlRecTotal::CreateItemWindow( vcl::Window* pP return m_xFixedText; } -void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) +void SvxFmTbxCtlRecTotal::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { // setting the FixedText if (GetSlotId() != SID_FM_RECORD_TOTAL) @@ -174,7 +174,7 @@ void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, co m_xFixedText->set_label(aText); - SfxToolBoxControl::StateChanged( nSID, eState,pState ); + SfxToolBoxControl::StateChangedAtToolBoxControl( nSID, eState,pState ); } SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxNextRec, SfxBoolItem ); diff --git a/svx/source/inc/StylesPreviewWindow.hxx b/svx/source/inc/StylesPreviewWindow.hxx index 533ff40601b4..5d46a9482726 100644 --- a/svx/source/inc/StylesPreviewWindow.hxx +++ b/svx/source/inc/StylesPreviewWindow.hxx @@ -38,7 +38,7 @@ public: StylesPreviewWindow_Base* pPreviewControl, const css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider); - void StateChanged(SfxItemState eState, const SfxPoolItem* pState) override; + void StateChangedAtStatusListener(SfxItemState eState, const SfxPoolItem* pState) override; }; /// Listener for styles creation or modification diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 762059515a87..a1e23dd05cb6 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -329,7 +329,7 @@ namespace svxform using SfxDockingWindow::StateChanged; - void StateChanged( sal_uInt16 nSID, SfxItemState eState, + void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; }; diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 04b4d1991f71..adc9cda6593d 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -321,7 +321,7 @@ public: virtual void dispose() override; void UpdateContent( FmFormShell const * pFormShell ); - void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; void FillInfo( SfxChildWinInfo& rInfo ) const override; }; diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index 86408e46fd5a..8fa9f0951e6a 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -59,7 +59,7 @@ class FmPropBrw final : public SfxModelessDialogController, public SfxController css::uno::Reference< css::frame::XController > m_xBrowserController; - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; virtual void FillInfo( SfxChildWinInfo& rInfo ) const override; virtual void Close() override; diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 1c755960e5e5..9dc28709a71a 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -534,7 +534,7 @@ namespace svxform virtual void dispose() override; void UpdateContent( FmFormShell* pFormShell ); - void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; void FillInfo( SfxChildWinInfo& rInfo ) const override; }; diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index 68cef73c0709..5de4bc33357b 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -56,7 +56,7 @@ public: virtual ~FmFieldWin() override; - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; void UpdateContent(FmFormShell const *); diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx index 6c60d806415c..4afc994c20fb 100644 --- a/svx/source/inc/tbxform.hxx +++ b/svx/source/inc/tbxform.hxx @@ -43,8 +43,8 @@ public: virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override; - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; }; class SvxFmTbxCtlRecText : public SfxToolBoxControl @@ -82,8 +82,8 @@ public: virtual ~SvxFmTbxCtlRecTotal() override; virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override; - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; }; class SvxFmTbxNextRec : public SfxToolBoxControl diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 1cf26601bb12..5726f4c036d2 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -93,7 +93,7 @@ void SvxClipBoardControl::CreatePopupWindow() GetToolBox().EndSelection(); } -void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) +void SvxClipBoardControl::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if ( SID_CLIPBOARD_FORMAT_ITEMS == nSID ) { diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx index 14cdd79a72c2..5b4c40969847 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx @@ -52,7 +52,7 @@ ParaULSpacingControl::~ParaULSpacingControl() { } -void ParaULSpacingControl::StateChanged(sal_uInt16 nSID, SfxItemState eState, +void ParaULSpacingControl::StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { ToolBoxItemId nId = GetId(); @@ -133,7 +133,7 @@ void SAL_CALL ParaLRSpacingControl::dispose() SfxToolBoxControl::dispose(); } -void ParaLRSpacingControl::StateChanged(sal_uInt16 nSID, SfxItemState eState, +void ParaLRSpacingControl::StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { ToolBoxItemId nId = GetId(); diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 8139d6329df8..3ad0fdc1e4a1 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -41,7 +41,7 @@ SvxInsertStatusBarControl::~SvxInsertStatusBarControl() { } -void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState, +void SvxInsertStatusBarControl::StateChangedAtStatusBarControl( sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) { if ( SfxItemState::DEFAULT != eState ) diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 62e96afa7d12..fa91f98588cf 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -73,7 +73,7 @@ SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, Status } -void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, +void SvxModifyControl::StateChangedAtStatusBarControl( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { if ( SfxItemState::DEFAULT != eState ) diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index e3539a5e7c5b..c492baff6d44 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -262,7 +262,7 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl() */ -void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, +void SvxPosSizeStatusBarControl::StateChangedAtStatusBarControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { // Because the combi-controller, always sets the current Id as HelpId diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 6e56e22f8d2f..9a77a9431225 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -112,7 +112,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId, GetStatusBar().SetQuickHelpText(GetId(), u""); } -void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState, +void SvxSelectionModeControl::StateChangedAtStatusBarControl( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { mbFeatureEnabled = SfxItemState::DEFAULT == eState; diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 20c6e7d50ed4..b79afa7eeaff 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -64,7 +64,7 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl() { } -void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) +void XmlSecStatusBarControl::StateChangedAtStatusBarControl( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { if( SfxItemState::DEFAULT != eState ) { @@ -76,7 +76,7 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, cons } else { - SAL_WARN( "svx.stbcrtls", "+XmlSecStatusBarControl::StateChanged(): invalid item type" ); + SAL_WARN( "svx.stbcrtls", "+XmlSecStatusBarControl::StateChangedAtStatusBarControl(): invalid item type" ); mpImpl->mnState = SignatureState::UNKNOWN; } diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 7fcf7bcbabe9..01b1fab1ee96 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -116,7 +116,7 @@ SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId, ImplUpdateItemText(); } -void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, +void SvxZoomStatusBarControl::StateChangedAtStatusBarControl( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { if( SfxItemState::DEFAULT != eState ) diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 3003eaace9bf..78c2951f764f 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -163,7 +163,7 @@ SvxZoomSliderControl::~SvxZoomSliderControl() { } -void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) +void SvxZoomSliderControl::StateChangedAtStatusBarControl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { if ( (SfxItemState::DEFAULT != eState) || pState->IsVoidItem() ) { diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx b/svx/source/tbxctrls/StylesPreviewWindow.cxx index cdeee7e3c772..228fc3f05102 100644 --- a/svx/source/tbxctrls/StylesPreviewWindow.cxx +++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx @@ -65,7 +65,8 @@ StyleStatusListener::StyleStatusListener( ReBind(); } -void StyleStatusListener::StateChanged(SfxItemState /*eState*/, const SfxPoolItem* pState) +void StyleStatusListener::StateChangedAtStatusListener(SfxItemState /*eState*/, + const SfxPoolItem* pState) { const SfxTemplateItem* pStateItem = dynamic_cast<const SfxTemplateItem*>(pState); if (pStateItem) diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 5541475c78c8..3748265457d8 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -84,7 +84,7 @@ SvxFillToolBoxControl::~SvxFillToolBoxControl() { } -void SvxFillToolBoxControl::StateChanged( +void SvxFillToolBoxControl::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index ef7298cf0328..3fa94d551807 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -91,12 +91,12 @@ void FormatPaintBrushToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/) } -void FormatPaintBrushToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, +void FormatPaintBrushToolBoxControl::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if( eState != SfxItemState::DEFAULT && eState != SfxItemState::SET ) m_bPersistentCopy = false; - SfxToolBoxControl::StateChanged( nSID, eState, pState ); + SfxToolBoxControl::StateChangedAtToolBoxControl( nSID, eState, pState ); } diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 724c96db4cf8..7d68069e8507 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -385,7 +385,7 @@ SvxGrafToolBoxControl::~SvxGrafToolBoxControl() { } -void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) +void SvxGrafToolBoxControl::StateChangedAtToolBoxControl( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { ImplGrafControl* pCtrl = static_cast<ImplGrafControl*>( GetToolBox().GetItemWindow( GetId() ) ); DBG_ASSERT( pCtrl, "Control not found" ); @@ -471,7 +471,7 @@ SvxGrafModeToolBoxControl::~SvxGrafModeToolBoxControl() { } -void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) +void SvxGrafModeToolBoxControl::StateChangedAtToolBoxControl( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { ImplGrafModeControl* pCtrl = static_cast<ImplGrafModeControl*>( GetToolBox().GetItemWindow( GetId() ) ); diff --git a/svx/source/tbxctrls/linewidthctrl.cxx b/svx/source/tbxctrls/linewidthctrl.cxx index b0e1a897f415..166f4bb451c9 100644 --- a/svx/source/tbxctrls/linewidthctrl.cxx +++ b/svx/source/tbxctrls/linewidthctrl.cxx @@ -47,7 +47,7 @@ SvxLineWidthToolBoxControl::~SvxLineWidthToolBoxControl() { } -void SvxLineWidthToolBoxControl::StateChanged( +void SvxLineWidthToolBoxControl::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { SvxMetricField* pFld = static_cast<SvxMetricField*>( diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 1b94df39887d..4521be0db733 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -821,7 +821,7 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener SvxStyleToolBoxControl& rTbxCtl ); protected: - virtual void StateChanged( SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void StateChangedAtStatusListener( SfxItemState eState, const SfxPoolItem* pState ) override; private: SvxStyleToolBoxControl& rControl; @@ -2494,7 +2494,7 @@ SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl( { } -void SfxStyleControllerItem_Impl::StateChanged( +void SfxStyleControllerItem_Impl::StateChangedAtStatusListener( SfxItemState eState, const SfxPoolItem* pState ) { switch ( GetId() ) diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index c6fa77b0553a..7eb116161165 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -55,11 +55,11 @@ void SAL_CALL SvxTbxCtlDraw::initialize( const css::uno::Sequence< css::uno::Any } -void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState, +void SvxTbxCtlDraw::StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { GetToolBox().EnableItem( GetId(), ( eState != SfxItemState::DISABLED ) ); - SfxToolBoxControl::StateChanged( nSID, eState, pState ); + SfxToolBoxControl::StateChangedAtToolBoxControl( nSID, eState, pState ); Reference< XLayoutManager > xLayoutMgr = getLayoutManager(); if ( xLayoutMgr.is() ) diff --git a/sw/source/uibase/inc/bookctrl.hxx b/sw/source/uibase/inc/bookctrl.hxx index d35252ceac4c..3b064a1daa22 100644 --- a/sw/source/uibase/inc/bookctrl.hxx +++ b/sw/source/uibase/inc/bookctrl.hxx @@ -27,8 +27,8 @@ class SwBookmarkControl final : public SfxStatusBarControl virtual void Command(const CommandEvent& rCEvt) override; public: - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtStatusBarControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; virtual void Paint(const UserDrawEvent& rEvt) override; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/uibase/inc/tmplctrl.hxx b/sw/source/uibase/inc/tmplctrl.hxx index dfd0af308625..df8ed5170b04 100644 --- a/sw/source/uibase/inc/tmplctrl.hxx +++ b/sw/source/uibase/inc/tmplctrl.hxx @@ -26,8 +26,8 @@ class SwTemplateControl final : public SfxStatusBarControl virtual void Command(const CommandEvent& rCEvt) override; public: - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtStatusBarControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; virtual void Paint(const UserDrawEvent& rEvt) override; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/uibase/inc/viewlayoutctrl.hxx b/sw/source/uibase/inc/viewlayoutctrl.hxx index 716b5fdbfbf5..a13f9ff52b2c 100644 --- a/sw/source/uibase/inc/viewlayoutctrl.hxx +++ b/sw/source/uibase/inc/viewlayoutctrl.hxx @@ -36,7 +36,7 @@ public: SwViewLayoutControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); virtual ~SwViewLayoutControl() override; - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; + virtual void StateChangedAtStatusBarControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual void Paint( const UserDrawEvent& rEvt ) override; virtual bool MouseButtonDown( const MouseEvent & ) override; virtual bool MouseMove( const MouseEvent & ) override; diff --git a/sw/source/uibase/inc/wordcountctrl.hxx b/sw/source/uibase/inc/wordcountctrl.hxx index 2079729741e9..8074253b3645 100644 --- a/sw/source/uibase/inc/wordcountctrl.hxx +++ b/sw/source/uibase/inc/wordcountctrl.hxx @@ -27,8 +27,8 @@ public: SwWordCountStatusBarControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb); virtual ~SwWordCountStatusBarControl() override; - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtStatusBarControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; }; #endif diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index 1ffa50ead702..d478f6ba997a 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -60,7 +60,7 @@ public: virtual ~SwTbxAutoTextCtrl() override; virtual void CreatePopupWindow() override; - virtual void StateChanged( sal_uInt16 nSID, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; @@ -75,7 +75,7 @@ public: SwPreviewZoomControl( sal_uInt16 nSlotId, ToolBoxItemId nId, ToolBox& rTbx ); virtual ~SwPreviewZoomControl() override; - virtual void StateChanged( sal_uInt16 nSID, + virtual void StateChangedAtToolBoxControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; diff --git a/sw/source/uibase/inc/zoomctrl.hxx b/sw/source/uibase/inc/zoomctrl.hxx index 38119e0b5a68..58dccbcbdbb4 100644 --- a/sw/source/uibase/inc/zoomctrl.hxx +++ b/sw/source/uibase/inc/zoomctrl.hxx @@ -28,8 +28,8 @@ private: public: virtual void Command(const CommandEvent& rCEvt) override; - virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState) override; + virtual void StateChangedAtStatusBarControl(sal_uInt16 nSID, SfxItemState eState, + const SfxPoolItem* pState) override; virtual void Paint(const UserDrawEvent& rEvt) override; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 52c3a572dee2..2c7e08c23a56 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -128,7 +128,7 @@ void SwTbxAutoTextCtrl::CreatePopupWindow() GetToolBox().EndSelection(); } -void SwTbxAutoTextCtrl::StateChanged( sal_uInt16, +void SwTbxAutoTextCtrl::StateChangedAtToolBoxControl( sal_uInt16, SfxItemState, const SfxPoolItem* pState ) { @@ -495,7 +495,7 @@ SwPreviewZoomControl::~SwPreviewZoomControl() { } -void SwPreviewZoomControl::StateChanged( sal_uInt16 /*nSID*/, +void SwPreviewZoomControl::StateChangedAtToolBoxControl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx index c82d40acfae8..8fb7f59f2a9a 100644 --- a/sw/source/uibase/utlui/bookctrl.cxx +++ b/sw/source/uibase/utlui/bookctrl.cxx @@ -49,7 +49,7 @@ SwBookmarkControl::~SwBookmarkControl() { } -void SwBookmarkControl::StateChanged( +void SwBookmarkControl::StateChangedAtStatusBarControl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { if( eState != SfxItemState::DEFAULT || pState->IsVoidItem() ) diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx index 21cbcfc5a116..da9887745f17 100644 --- a/sw/source/uibase/utlui/tmplctrl.cxx +++ b/sw/source/uibase/utlui/tmplctrl.cxx @@ -48,7 +48,7 @@ SwTemplateControl::~SwTemplateControl() { } -void SwTemplateControl::StateChanged( +void SwTemplateControl::StateChangedAtStatusBarControl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { const SfxStringItem* pItem = nullptr; diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx index 9f010e73861d..22346de6b03b 100644 --- a/sw/source/uibase/utlui/viewlayoutctrl.cxx +++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx @@ -59,7 +59,7 @@ SwViewLayoutControl::~SwViewLayoutControl() { } -void SwViewLayoutControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) +void SwViewLayoutControl::StateChangedAtStatusBarControl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { if ( SfxItemState::DEFAULT != eState || pState->IsVoidItem() ) GetStatusBar().SetItemText( GetId(), OUString() ); diff --git a/sw/source/uibase/utlui/wordcountctrl.cxx b/sw/source/uibase/utlui/wordcountctrl.cxx index d617c611c500..66d520d99a21 100644 --- a/sw/source/uibase/utlui/wordcountctrl.cxx +++ b/sw/source/uibase/utlui/wordcountctrl.cxx @@ -27,7 +27,7 @@ SwWordCountStatusBarControl::~SwWordCountStatusBarControl() { } -void SwWordCountStatusBarControl::StateChanged( +void SwWordCountStatusBarControl::StateChangedAtStatusBarControl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { if (eState == SfxItemState::DEFAULT) // Can access pState diff --git a/sw/source/uibase/utlui/zoomctrl.cxx b/sw/source/uibase/utlui/zoomctrl.cxx index 493b2f9b7828..3f7ff7021fcf 100644 --- a/sw/source/uibase/utlui/zoomctrl.cxx +++ b/sw/source/uibase/utlui/zoomctrl.cxx @@ -36,7 +36,7 @@ SwZoomControl::~SwZoomControl() { } -void SwZoomControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, +void SwZoomControl::StateChangedAtStatusBarControl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { const SfxStringItem* pItem = nullptr; @@ -48,7 +48,7 @@ void SwZoomControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, else { sPreviewZoom.clear(); - SvxZoomStatusBarControl::StateChanged(nSID, eState, pState); + SvxZoomStatusBarControl::StateChangedAtStatusBarControl(nSID, eState, pState); } } |