ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#130428 remove unnecessary usage of SfxItemState::UNKNOWN

Browse Source 
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>
This commit is contained in:
Armin Le Grand (Allotropia)
2021-06-18 11:10:56 +02:00
committed by Armin Le Grand
parent 6317f8cc83
commit 04cd674917
115 changed files with 176 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
avmedia/source/framework/mediatoolbox.cxx
+1 -1
View File
@@ -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() ) );
basctl/source/basicide/IDEComboBox.cxx
+4 -2
View File
@@ -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())))
{
basctl/source/inc/IDEComboBox.hxx
+4 -4
View File
@@ -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
*
cui/source/dialogs/cuihyperdlg.cxx
+1 -1
View File
@@ -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))
cui/source/inc/cuihyperdlg.hxx
+1 -1
View File
@@ -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;
};
include/avmedia/mediatoolbox.hxx
+1 -1
View File
@@ -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:
include/sfx2/ctrlitem.hxx
+2 -2
View File
@@ -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:
include/sfx2/sfxstatuslistener.hxx
+1 -1
View File
@@ -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;
include/sfx2/sidebar/ControllerItem.hxx
+1 -1
View File
@@ -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;
include/sfx2/stbitem.hxx
+1 -1
View File
@@ -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 );
include/sfx2/tbxctrl.hxx
+1 -1
View File
@@ -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();
include/svx/ParaSpacingControl.hxx
+4 -4
View File
@@ -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
include/svx/bmpmask.hxx
+1 -1
View File
@@ -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:
include/svx/clipboardctl.hxx
+1 -1
View File
@@ -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;
};
include/svx/fillctrl.hxx
+1 -1
View File
@@ -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;
};
include/svx/float3d.hxx
+2 -2
View File
@@ -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);
include/svx/fontwork.hxx
+1 -1
View File
@@ -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:
include/svx/formatpaintbrushctrl.hxx
+1 -1
View File
@@ -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 );
include/svx/grafctrl.hxx
+2 -2
View File
@@ -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;
};
include/svx/imapdlg.hxx
+1 -1
View File
@@ -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;
include/svx/insctrl.hxx
+2 -2
View File
@@ -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();
include/svx/linectrl.hxx
+1 -1
View File
@@ -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;
};
include/svx/modctrl.hxx
+2 -2
View File
@@ -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;
include/svx/pszctrl.hxx
+1 -1
View File
@@ -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:
include/svx/selctrl.hxx
+2 -2
View File
@@ -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;
include/svx/tbxctl.hxx
+1 -1
View File
@@ -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;
};
include/svx/xmlsecctrl.hxx
+1 -1
View File
@@ -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;
};
include/svx/zoomctrl.hxx
+2 -2
View File
@@ -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;
include/svx/zoomsliderctrl.hxx
+1 -1
View File
@@ -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;
reportdesign/source/ui/misc/statusbarcontroller.cxx
+2 -2
View File
@@ -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);
}
}
}
sc/inc/NumberFormatControl.hxx
+1 -1
View File
@@ -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;
};
sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+1 -1
View File
@@ -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();
sc/source/ui/inc/navcitem.hxx
+1 -1
View File
@@ -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:
sc/source/ui/inc/tbzoomsliderctrl.hxx
+1 -1
View File
@@ -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;
};
sc/source/ui/navipi/navcitem.cxx
+1 -1
View File
@@ -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() )
sc/source/ui/sidebar/NumberFormatControl.cxx
+1 -1
View File
@@ -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();
sd/source/ui/app/scalectrl.cxx
+2 -2
View File
@@ -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;
sd/source/ui/app/tmplctrl.cxx
+1 -1
View File
@@ -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() )
sd/source/ui/dlg/animobjs.cxx
+1 -1
View File
@@ -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 )
sd/source/ui/dlg/diactrl.cxx
+1 -1
View File
@@ -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() ) );
sd/source/ui/dlg/gluectrl.cxx
+2 -2
View File
@@ -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 )
sd/source/ui/dlg/navigatr.cxx
+2 -2
View File
@@ -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 )
sd/source/ui/inc/animobjs.hxx
+1 -1
View File
@@ -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;
sd/source/ui/inc/diactrl.hxx
+2 -2
View File
@@ -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();
sd/source/ui/inc/gluectrl.hxx
+2 -2
View File
@@ -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();
sd/source/ui/inc/navigatr.hxx
+2 -2
View File
@@ -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:
sd/source/ui/inc/scalectrl.hxx
+2 -2
View File
@@ -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();
sd/source/ui/inc/tmplctrl.hxx
+1 -1
View File
@@ -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();
sd/source/ui/view/sdruler.cxx
+2 -2
View File
@@ -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 )
{
sfx2/inc/inettbc.hxx
+1 -1
View File
@@ -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
sfx2/inc/unoctitm.hxx
+1 -1
View File
@@ -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,
sfx2/source/control/ctrlitem.cxx
+3 -3
View File
@@ -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 );
}
sfx2/source/control/sfxstatuslistener.cxx
+2 -2
View File
@@ -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: */
sfx2/source/control/statcach.cxx
+5 -5
View File
@@ -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 )
sfx2/source/control/unoctitm.cxx
+2 -2
View File
@@ -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 );
}
sfx2/source/dialog/tplcitem.cxx
+1 -1
View File
@@ -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)
sfx2/source/inc/tplcitem.hxx
+1 -1
View File
@@ -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);
sfx2/source/inet/inettbc.cxx
+1 -1
View File
@@ -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,
sfx2/source/sidebar/ControllerItem.cxx
+1 -1
View File
@@ -40,7 +40,7 @@ ControllerItem::~ControllerItem()
dispose();
}
void ControllerItem::StateChanged (
void ControllerItem::StateChangedAtToolBoxControl (
sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState)
sfx2/source/statbar/stbitem.cxx
+2 -2
View File
@@ -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,
sfx2/source/toolbox/tbxitem.cxx
+2 -2
View File
@@ -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,
sfx2/source/view/viewfrm2.cxx
+1 -1
View File
@@ -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();
}
}
starmath/inc/view.hxx
+2 -2
View File
@@ -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
starmath/source/view.cxx
+4 -4
View File
@@ -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);
}
/**************************************************************************/
svx/source/dialog/_bmpmask.cxx
+1 -1
View File
@@ -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 )
svx/source/dialog/_contdlg.cxx
+1 -1
View File
@@ -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 ) )
{
svx/source/dialog/contimp.hxx
+1 -1
View File
@@ -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:
svx/source/dialog/fontwork.cxx
+1 -1
View File
@@ -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() )
svx/source/dialog/imapdlg.cxx
+1 -1
View File
@@ -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 )
svx/source/dialog/rlrcitem.cxx
+1 -1
View File
@@ -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
svx/source/dialog/rlrcitem.hxx
+1 -1
View File
@@ -29,7 +29,7 @@ private:
SvxRuler& rRuler;
protected:
virtual void StateChanged( sal_uInt16,
virtual void StateChangedAtToolBoxControl( sal_uInt16,
SfxItemState, const SfxPoolItem* pState ) override;
public:
svx/source/dialog/srchctrl.cxx
+1 -1
View File
@@ -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 )
svx/source/dialog/srchctrl.hxx
+2 -1
View File
@@ -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);
svx/source/engine3d/float3d.cxx
+2 -2
View File
@@ -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)
svx/source/form/datanavi.cxx
+1 -1
View File
@@ -2012,7 +2012,7 @@ namespace svxform
SfxDockingWindow::dispose();
}
void DataNavigator::StateChanged( sal_uInt16 , SfxItemState , const SfxPoolItem* )
void DataNavigator::StateChangedAtToolBoxControl( sal_uInt16 , SfxItemState , const SfxPoolItem* )
{
}
svx/source/form/filtnav.cxx
+1 -1
View File
@@ -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;
svx/source/form/fmPropBrw.cxx
+1 -1
View File
@@ -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;
svx/source/form/fmexpl.cxx
+1 -1
View File
@@ -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;
svx/source/form/tabwin.cxx
+1 -1
View File
@@ -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;
svx/source/form/tbxform.cxx
+4 -4
View File
@@ -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 );
svx/source/inc/StylesPreviewWindow.hxx
+1 -1
View File
@@ -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
svx/source/inc/datanavi.hxx
+1 -1
View File
@@ -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;
};
svx/source/inc/filtnav.hxx
+1 -1
View File
@@ -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;
};
svx/source/inc/fmPropBrw.hxx
+1 -1
View File
@@ -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;
svx/source/inc/fmexpl.hxx
+1 -1
View File
@@ -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;
};
svx/source/inc/tabwin.hxx
+1 -1
View File
@@ -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 *);
svx/source/inc/tbxform.hxx
+4 -4
View File
@@ -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
svx/source/mnuctrls/clipboardctl.cxx
+1 -1
View File
@@ -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 )
{
svx/source/sidebar/paragraph/ParaSpacingControl.cxx
+2 -2
View File
@@ -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();
svx/source/stbctrls/insctrl.cxx
+1 -1
View File
@@ -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 )
svx/source/stbctrls/modctrl.cxx
+1 -1
View File
@@ -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 )
svx/source/stbctrls/pszctrl.cxx
+1 -1
View File
@@ -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
svx/source/stbctrls/selctrl.cxx
+1 -1
View File
@@ -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;
svx/source/stbctrls/xmlsecctrl.cxx
+2 -2
View File
@@ -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;
}
svx/source/stbctrls/zoomctrl.cxx
+1 -1
View File
@@ -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 )
svx/source/stbctrls/zoomsliderctrl.cxx
+1 -1
View File
@@ -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() )
{
svx/source/tbxctrls/StylesPreviewWindow.cxx
+2 -1
View File
@@ -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)
svx/source/tbxctrls/fillctrl.cxx
+1 -1
View File
@@ -84,7 +84,7 @@ SvxFillToolBoxControl::~SvxFillToolBoxControl()
{
}
void SvxFillToolBoxControl::StateChanged(
void SvxFillToolBoxControl::StateChangedAtToolBoxControl(
sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState)
svx/source/tbxctrls/formatpaintbrushctrl.cxx
+2 -2
View File
@@ -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 );
}
svx/source/tbxctrls/grafctrl.cxx
+2 -2
View File
@@ -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() ) );

Some files were not shown because too many files have changed in this diff Show More