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 /sfx2/source/toolbox | |
| 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 'sfx2/source/toolbox')
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 15 |
1 files changed, 3 insertions, 12 deletions
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 ); } |