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

14 files changed, 19 insertions, 40 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:
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index a635aed3e6ce..fba83a09f8e2 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -50,14 +50,12 @@ namespace svx
 
 class SVX_DLLPUBLIC FontWorkShapeTypeControl : public SfxToolBoxControl
 {
-    using SfxToolBoxControl::Select;
-
 public:
     SFX_DECL_TOOLBOX_CONTROL();
     FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     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 SfxPopupWindow*     CreatePopupWindow() SAL_OVERRIDE;
 };
diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx
index 5e7bc7c16669..d5d47c0ba6ab 100644
--- a/include/svx/formatpaintbrushctrl.hxx
+++ b/include/svx/formatpaintbrushctrl.hxx
@@ -37,8 +37,6 @@ namespace svx
 
 class SVX_DLLPUBLIC FormatPaintBrushToolBoxControl : public SfxToolBoxControl
 {
-    using SfxToolBoxControl::Select;
-
 public:
     SFX_DECL_TOOLBOX_CONTROL();
     FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
@@ -46,7 +44,7 @@ public:
 
     virtual void    DoubleClick() 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,
                                               const SfxPoolItem* pState ) SAL_OVERRIDE;
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 8254825a5ca5..94868eaae8a3 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -266,7 +266,6 @@ public:
 class SVX_DLLPUBLIC SvxColorExtToolBoxControl : public SfxToolBoxControl
 {
     using SfxToolBoxControl::StateChanged;
-    using SfxToolBoxControl::Select;
 
     ::svx::ToolboxButtonColorUpdater*   pBtnUpdater;
     Color                               mLastColor;
@@ -281,7 +280,7 @@ public:
                                               const SfxPoolItem* pState ) SAL_OVERRIDE;
     virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual SfxPopupWindow*     CreatePopupWindow() SAL_OVERRIDE;
-    virtual void                Select( bool bMod1 = false ) SAL_OVERRIDE;
+    virtual void                Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
 };
 
 
diff --git a/include/svx/tbxctl.hxx b/include/svx/tbxctl.hxx
index 2be7c75b8023..d15a53e59c73 100644
--- a/include/svx/tbxctl.hxx
+++ b/include/svx/tbxctl.hxx
@@ -36,7 +36,6 @@ private:
     void                toggleToolbox();
 
 protected:
-    using SfxToolBoxControl::Select;
 
 public:
     SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
@@ -44,7 +43,7 @@ public:
 
     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,
                                               const SfxPoolItem* pState ) SAL_OVERRIDE;
     virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
diff --git a/include/svx/tbxcustomshapes.hxx b/include/svx/tbxcustomshapes.hxx
index 5aee5c45b48f..0948f1623199 100644
--- a/include/svx/tbxcustomshapes.hxx
+++ b/include/svx/tbxcustomshapes.hxx
@@ -31,8 +31,7 @@
 class SVX_DLLPUBLIC SvxTbxCtlCustomShapes : public SfxToolBoxControl
 {
 public:
-    using SfxToolBoxControl::Select;
-    virtual void                Select( bool bMod1 = false ) SAL_OVERRIDE;
+    virtual void                Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
     virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState ) SAL_OVERRIDE;
     virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 866a3bc601d0..957a3351d180 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -188,7 +188,6 @@ struct SfxToolBoxControl_Impl
 {
     ToolBox*                pBox;
     bool                    bShowString;
-    sal_uInt16              nSelectModifier;
     SfxTbxCtrlFactory*      pFact;
     sal_uInt16              nTbxId;
     sal_uInt16              nSlotId;
@@ -231,7 +230,6 @@ SfxToolBoxControl::SfxToolBoxControl(
 
     pImpl->pBox = &rBox;
     pImpl->bShowString = bShowStringItems;
-    pImpl->nSelectModifier = 0;
     pImpl->pFact = 0;
     pImpl->nTbxId = nID;
     pImpl->nSlotId = nSlotID;
@@ -627,6 +625,7 @@ void SAL_CALL SfxToolBoxControl::execute( sal_Int16 KeyModifier ) throw (::com::
     SolarMutexGuard aGuard;
     Select( (sal_uInt16)KeyModifier );
 }
+
 void SAL_CALL SfxToolBoxControl::click() throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
@@ -969,17 +968,9 @@ void SfxToolBoxControl::StateChanged
 
 
 
-void SfxToolBoxControl::Select( sal_uInt16 nModifier )
-{
-    pImpl->nSelectModifier = nModifier;
-    Select( (nModifier & KEY_MOD1) != 0 );
-}
-
-
-
-void SfxToolBoxControl::Select( bool /*bMod1*/ )
+void SfxToolBoxControl::Select( sal_uInt16 nSelectModifier )
 {
-    svt::ToolboxController::execute( pImpl->nSelectModifier );
+    svt::ToolboxController::execute( nSelectModifier );
 }
 
 
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index be13fd29f1c5..16d5afa90c48 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -128,7 +128,7 @@ SfxPopupWindow* SvxTbxCtlCustomShapes::CreatePopupWindow()
 
 
 
-void SvxTbxCtlCustomShapes::Select( bool /*bMod1*/ )
+void SvxTbxCtlCustomShapes::Select(sal_uInt16 /*nSelectModifier*/)
 {
      if ( !m_aCommand.isEmpty() )
     {
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 9573de5bcb4a..ff2ab013c41c 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -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
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index dad095000501..60e622dd7647 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -64,7 +64,6 @@ private:
     sal_uInt16 nLastSlot;
 
 protected:
-    using SfxToolBoxControl::Select;
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
@@ -72,7 +71,7 @@ public:
     SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     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,
                                               const SfxPoolItem* pState ) SAL_OVERRIDE;
     virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index a64036d464c9..601c1183baa4 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -293,7 +293,7 @@ SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow()
 
 
 
-void FontWorkShapeTypeControl::Select( sal_Bool )
+void FontWorkShapeTypeControl::Select(sal_uInt16 /*nSelectModifier*/)
 {
 
 }
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index caaf1b071c43..0f0b04ef6dfa 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -93,7 +93,7 @@ IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl)
 }
 
 
-void FormatPaintBrushToolBoxControl::Select( sal_Bool )
+void FormatPaintBrushToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/)
 {
 }
 
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index db3299921725..557177168a77 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2585,7 +2585,7 @@ void SvxColorExtToolBoxControl::StateChanged(
 
 
 
-void SvxColorExtToolBoxControl::Select( bool )
+void SvxColorExtToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/)
 {
     OUString aCommand;
     OUString aParamName;
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 84ed8839529d..30bd2b39fc9f 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -101,7 +101,7 @@ void SvxTbxCtlDraw::toggleToolbox()
 
 
 
-void SvxTbxCtlDraw::Select( bool )
+void SvxTbxCtlDraw::Select(sal_uInt16 /*nSelectModifier*/)
 {
     toggleToolbox();
 }