diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-02 15:18:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-03 09:17:54 +0200 |
| commit | c3a89936abc7967ebe8916ca83cb38f6837f9aa1 (patch) | |
| tree | 0bb170680c281a5eca4a805f7f9eba9108f9962f /include/sfx2 | |
| parent | 508cbb96a17bb085d162e0d605010af3123abe62 (diff) | |
sfx2/tbxctrl.hxx: sal_Bool->bool
and clean up the mess around the two different Select methods
which just led to confusion in the overriding classes.
Change-Id: Iea0ea85752180d0dc50d2b4ddb3d861e8447fb0a
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/tbxctrl.hxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 906d2271bf6e..8dfe773b0b0e 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -195,8 +195,7 @@ protected: // old SfxToolBoxControl methods virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Select( bool bMod1 = false ); - virtual void Select( sal_uInt16 nModifier ); + virtual void Select( sal_uInt16 nSelectModifier ); virtual void DoubleClick(); virtual void Click(); @@ -311,8 +310,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox ); virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; - using SfxToolBoxControl::Select; - virtual void Select( bool bMod1 = false ) SAL_OVERRIDE; + virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE; }; @@ -341,8 +339,7 @@ protected: class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl { protected: - using SfxToolBoxControl::Select; - virtual void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE; + virtual void Select(sal_uInt16 nSelectModifier ) SAL_OVERRIDE; public: SFX_DECL_TOOLBOX_CONTROL(); @@ -365,8 +362,7 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl protected: virtual void Click() SAL_OVERRIDE; - using SfxToolBoxControl::Select; - virtual void Select( bool ) SAL_OVERRIDE; + virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; DECL_LINK( Activate, Menu * ); public: |