summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorArmin Le Grand (Allotropia) <armin.le.grand@me.com>2021-06-17 10:17:25 +0200
committerArmin Le Grand <Armin.Le.Grand@me.com>2021-06-18 11:10:56 +0200
commit04cd6749177f886f382e8bcd026f95112ee22473 (patch)
treeb74693c1a738add2df00cedc85397720598f3021 /include
parent6317f8cc83ec92b8700785ab67c4c66ed1aa8fb2 (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>
Diffstat (limited to 'include')
-rw-r--r--include/avmedia/mediatoolbox.hxx2
-rw-r--r--include/sfx2/ctrlitem.hxx4
-rw-r--r--include/sfx2/sfxstatuslistener.hxx2
-rw-r--r--include/sfx2/sidebar/ControllerItem.hxx2
-rw-r--r--include/sfx2/stbitem.hxx2
-rw-r--r--include/sfx2/tbxctrl.hxx2
-rw-r--r--include/svx/ParaSpacingControl.hxx8
-rw-r--r--include/svx/bmpmask.hxx2
-rw-r--r--include/svx/clipboardctl.hxx2
-rw-r--r--include/svx/fillctrl.hxx2
-rw-r--r--include/svx/float3d.hxx4
-rw-r--r--include/svx/fontwork.hxx2
-rw-r--r--include/svx/formatpaintbrushctrl.hxx2
-rw-r--r--include/svx/grafctrl.hxx4
-rw-r--r--include/svx/imapdlg.hxx2
-rw-r--r--include/svx/insctrl.hxx4
-rw-r--r--include/svx/linectrl.hxx2
-rw-r--r--include/svx/modctrl.hxx4
-rw-r--r--include/svx/pszctrl.hxx2
-rw-r--r--include/svx/selctrl.hxx4
-rw-r--r--include/svx/tbxctl.hxx2
-rw-r--r--include/svx/xmlsecctrl.hxx2
-rw-r--r--include/svx/zoomctrl.hxx4
-rw-r--r--include/svx/zoomsliderctrl.hxx2
24 files changed, 34 insertions, 34 deletions
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;