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>

39 files changed, 54 insertions, 52 deletions

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() )