summaryrefslogtreecommitdiff
path: root/include/svx/tbxctl.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-02 15:18:03 +0200
committerNoel Grandin <noel@peralex.com>2014-04-03 09:17:54 +0200
commitc3a89936abc7967ebe8916ca83cb38f6837f9aa1 (patch)
tree0bb170680c281a5eca4a805f7f9eba9108f9962f /include/svx/tbxctl.hxx
parent508cbb96a17bb085d162e0d605010af3123abe62 (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/svx/tbxctl.hxx')
-rw-r--r--include/svx/tbxctl.hxx3
1 files changed, 1 insertions, 2 deletions
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;