mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sfx2/tbxctrl.hxx: sal_Bool->bool

Browse Source 
and clean up the mess around the two different Select methods
which just led to confusion in the overriding classes.

Change-Id: Iea0ea85752180d0dc50d2b4ddb3d861e8447fb0a
This commit is contained in:
Noel Grandin
2014-04-02 15:18:03 +02:00
parent 508cbb96a1
commit c3a89936ab
14 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/sfx2/tbxctrl.hxx
View File

@@ -195,8 +195,7 @@ protected:
// old SfxToolBoxControl methods // old SfxToolBoxControl methods
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual void Select( bool bMod1 = false ); virtual void Select( sal_uInt16 nSelectModifier );
virtual void Select( sal_uInt16 nModifier );
virtual void DoubleClick(); virtual void DoubleClick();
virtual void Click(); virtual void Click();
@@ -311,8 +310,7 @@ public:
SFX_DECL_TOOLBOX_CONTROL(); SFX_DECL_TOOLBOX_CONTROL();
SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox ); SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox );
virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE;
using SfxToolBoxControl::Select; virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
virtual void Select( bool bMod1 = false ) SAL_OVERRIDE;
}; };
@@ -341,8 +339,7 @@ protected:
class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl
{ {
protected: protected:
using SfxToolBoxControl::Select; virtual void Select(sal_uInt16 nSelectModifier ) SAL_OVERRIDE;
virtual void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE;
public: public:
SFX_DECL_TOOLBOX_CONTROL(); SFX_DECL_TOOLBOX_CONTROL();
@@ -365,8 +362,7 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl
protected: protected:
virtual void Click() SAL_OVERRIDE; virtual void Click() SAL_OVERRIDE;
using SfxToolBoxControl::Select; virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
virtual void Select( bool ) SAL_OVERRIDE;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
DECL_LINK( Activate, Menu * ); DECL_LINK( Activate, Menu * );
public: public:

4
include/svx/fontworkgallery.hxx
View File

@@ -50,14 +50,12 @@ namespace svx
class SVX_DLLPUBLIC FontWorkShapeTypeControl : public SfxToolBoxControl class SVX_DLLPUBLIC FontWorkShapeTypeControl : public SfxToolBoxControl
{ {
using SfxToolBoxControl::Select;
public: public:
SFX_DECL_TOOLBOX_CONTROL(); SFX_DECL_TOOLBOX_CONTROL();
FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
virtual ~FontWorkShapeTypeControl(); virtual ~FontWorkShapeTypeControl();
virtual void Select( sal_Bool bMod1 = sal_False ); virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE;
}; };

4
include/svx/formatpaintbrushctrl.hxx
View File

@@ -37,8 +37,6 @@ namespace svx
class SVX_DLLPUBLIC FormatPaintBrushToolBoxControl : public SfxToolBoxControl class SVX_DLLPUBLIC FormatPaintBrushToolBoxControl : public SfxToolBoxControl
{ {
using SfxToolBoxControl::Select;
public: public:
SFX_DECL_TOOLBOX_CONTROL(); SFX_DECL_TOOLBOX_CONTROL();
FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
@@ -46,7 +44,7 @@ public:
virtual void DoubleClick() SAL_OVERRIDE; virtual void DoubleClick() SAL_OVERRIDE;
virtual void Click() SAL_OVERRIDE; virtual void Click() SAL_OVERRIDE;
virtual void Select( sal_Bool bMod1 = sal_False ); virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE; const SfxPoolItem* pState ) SAL_OVERRIDE;

3
include/svx/tbcontrl.hxx
View File

@@ -266,7 +266,6 @@ public:
class SVX_DLLPUBLIC SvxColorExtToolBoxControl : public SfxToolBoxControl class SVX_DLLPUBLIC SvxColorExtToolBoxControl : public SfxToolBoxControl
{ {
using SfxToolBoxControl::StateChanged; using SfxToolBoxControl::StateChanged;
using SfxToolBoxControl::Select;
::svx::ToolboxButtonColorUpdater* pBtnUpdater; ::svx::ToolboxButtonColorUpdater* pBtnUpdater;
Color mLastColor; Color mLastColor;
@@ -281,7 +280,7 @@ public:
const SfxPoolItem* pState ) SAL_OVERRIDE; const SfxPoolItem* pState ) SAL_OVERRIDE;
virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE;
virtual void Select( bool bMod1 = false ) SAL_OVERRIDE; virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
}; };

3
include/svx/tbxctl.hxx
View File

@@ -36,7 +36,6 @@ private:
void toggleToolbox(); void toggleToolbox();
protected: protected:
using SfxToolBoxControl::Select;
public: public:
SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
@@ -44,7 +43,7 @@ public:
SFX_DECL_TOOLBOX_CONTROL(); SFX_DECL_TOOLBOX_CONTROL();
virtual void Select( bool bMod1 = false ) SAL_OVERRIDE; virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE; const SfxPoolItem* pState ) SAL_OVERRIDE;
virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;

3
include/svx/tbxcustomshapes.hxx
View File

@@ -31,8 +31,7 @@
class SVX_DLLPUBLIC SvxTbxCtlCustomShapes : public SfxToolBoxControl class SVX_DLLPUBLIC SvxTbxCtlCustomShapes : public SfxToolBoxControl
{ {
public: public:
using SfxToolBoxControl::Select; virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
virtual void Select( bool bMod1 = false ) SAL_OVERRIDE;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE; const SfxPoolItem* pState ) SAL_OVERRIDE;
virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;

15
sfx2/source/toolbox/tbxitem.cxx
View File

@@ -188,7 +188,6 @@ struct SfxToolBoxControl_Impl
{ {
ToolBox* pBox; ToolBox* pBox;
bool bShowString; bool bShowString;
sal_uInt16 nSelectModifier;
SfxTbxCtrlFactory* pFact; SfxTbxCtrlFactory* pFact;
sal_uInt16 nTbxId; sal_uInt16 nTbxId;
sal_uInt16 nSlotId; sal_uInt16 nSlotId;
@@ -231,7 +230,6 @@ SfxToolBoxControl::SfxToolBoxControl(
pImpl->pBox = &rBox; pImpl->pBox = &rBox;
pImpl->bShowString = bShowStringItems; pImpl->bShowString = bShowStringItems;
pImpl->nSelectModifier = 0;
pImpl->pFact = 0; pImpl->pFact = 0;
pImpl->nTbxId = nID; pImpl->nTbxId = nID;
pImpl->nSlotId = nSlotID; pImpl->nSlotId = nSlotID;
@@ -627,6 +625,7 @@ void SAL_CALL SfxToolBoxControl::execute( sal_Int16 KeyModifier ) throw (::com::
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
Select( (sal_uInt16)KeyModifier ); Select( (sal_uInt16)KeyModifier );
} }
void SAL_CALL SfxToolBoxControl::click() throw (::com::sun::star::uno::RuntimeException, std::exception) void SAL_CALL SfxToolBoxControl::click() throw (::com::sun::star::uno::RuntimeException, std::exception)
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
@@ -969,17 +968,9 @@ void SfxToolBoxControl::StateChanged
void SfxToolBoxControl::Select( sal_uInt16 nModifier ) void SfxToolBoxControl::Select( sal_uInt16 nSelectModifier )
{ {
pImpl->nSelectModifier = nModifier; svt::ToolboxController::execute( nSelectModifier );
Select( (nModifier & KEY_MOD1) != 0 );
}
void SfxToolBoxControl::Select( bool /*bMod1*/ )
{
svt::ToolboxController::execute( pImpl->nSelectModifier );
} }

2
svx/source/customshapes/tbxcustomshapes.cxx
View File

@@ -128,7 +128,7 @@ SfxPopupWindow* SvxTbxCtlCustomShapes::CreatePopupWindow()
void SvxTbxCtlCustomShapes::Select( bool /*bMod1*/ ) void SvxTbxCtlCustomShapes::Select(sal_uInt16 /*nSelectModifier*/)
{ {
if ( !m_aCommand.isEmpty() ) if ( !m_aCommand.isEmpty() )
{ {

2
svx/source/form/tbxform.cxx
View File

@@ -221,7 +221,7 @@ SfxPopupWindow* SvxFmTbxCtlConfig::CreatePopupWindow()
} }
void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ ) void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nSelectModifier*/ )
{ {
// Click auf den Button SID_FM_CONFIG in der ObjectBar // Click auf den Button SID_FM_CONFIG in der ObjectBar

3
svx/source/inc/tbxform.hxx
View File

@@ -64,7 +64,6 @@ private:
sal_uInt16 nLastSlot; sal_uInt16 nLastSlot;
protected: protected:
using SfxToolBoxControl::Select;
public: public:
SFX_DECL_TOOLBOX_CONTROL(); SFX_DECL_TOOLBOX_CONTROL();
@@ -72,7 +71,7 @@ public:
SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
virtual ~SvxFmTbxCtlConfig() {} virtual ~SvxFmTbxCtlConfig() {}
virtual void Select( sal_uInt16 nModifier ) SAL_OVERRIDE; virtual void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE; const SfxPoolItem* pState ) SAL_OVERRIDE;
virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;

2
svx/source/tbxctrls/fontworkgallery.cxx
View File

@@ -293,7 +293,7 @@ SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow()
void FontWorkShapeTypeControl::Select( sal_Bool ) void FontWorkShapeTypeControl::Select(sal_uInt16 /*nSelectModifier*/)
{ {
} }

2
svx/source/tbxctrls/formatpaintbrushctrl.cxx
View File

@@ -93,7 +93,7 @@ IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl)
} }
void FormatPaintBrushToolBoxControl::Select( sal_Bool ) void FormatPaintBrushToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/)
{ {
} }

2
svx/source/tbxctrls/tbcontrl.cxx
View File

@@ -2585,7 +2585,7 @@ void SvxColorExtToolBoxControl::StateChanged(
void SvxColorExtToolBoxControl::Select( bool ) void SvxColorExtToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/)
{ {
OUString aCommand; OUString aCommand;
OUString aParamName; OUString aParamName;

2
svx/source/tbxctrls/tbxdrctl.cxx
View File

@@ -101,7 +101,7 @@ void SvxTbxCtlDraw::toggleToolbox()
void SvxTbxCtlDraw::Select( bool ) void SvxTbxCtlDraw::Select(sal_uInt16 /*nSelectModifier*/)
{ {
toggleToolbox(); toggleToolbox();
} }