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

7 files changed, 7 insertions, 8 deletions

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();
 }