diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-07-05 10:25:14 +0300 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-07-06 10:38:36 +0000 |
| commit | 0e78a51b0e7b023bcdc51fdbff7816ed4ba5d0f8 (patch) | |
| tree | 1be5401271c7c76132d26597f39f90c03d1cfd00 /sc | |
| parent | 3d10947eb35a1bdd9475e1e02739075c4a4ab644 (diff) | |
This one should override SfxToolBoxControl::Select
We don't have there Select(bool) since
c3a89936abc7967ebe8916ca83cb38f6837f9aa1.
(cherry picked from commit 4604a6a7cd66907fc29e01aacf2146f17fa19d34)
(cherry picked from commit bc3c7f2557a1871fb1e41fc9cac4426a6b208901)
Conflicts:
sc/source/ui/cctrl/tbinsert.cxx
sc/source/ui/inc/tbinsert.hxx
Change-Id: Id496725d82289d1be004bdc36195877c12f336b0
Reviewed-on: https://gerrit.libreoffice.org/16773
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/cctrl/tbinsert.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/tbinsert.hxx | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index 4030b74d2e5f..e5f77d8a5e83 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -98,7 +98,7 @@ SfxPopupWindowType ScTbxInsertCtrl::GetPopupWindowType() const return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK; } -void ScTbxInsertCtrl::Select( bool /* bMod1 */ ) +void ScTbxInsertCtrl::Select( sal_uInt16 /*nSelectModifier*/ ) { SfxViewShell* pCurSh( SfxViewShell::Current() ); SfxDispatcher* pDispatch( 0 ); diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx index 01b1d4605d30..4238305faec2 100644 --- a/sc/source/ui/inc/tbinsert.hxx +++ b/sc/source/ui/inc/tbinsert.hxx @@ -25,9 +25,7 @@ class ScTbxInsertCtrl : public SfxToolBoxControl { sal_uInt16 nLastSlotId; - - using SfxToolBoxControl::Select; - virtual void Select( bool bMod1 = false ); + virtual void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE; public: SFX_DECL_TOOLBOX_CONTROL(); |