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:01 +0000 |
| commit | 979d93f5f4d3a0a2961da7c0529d948cae5c4ae1 (patch) | |
| tree | d3fb39c3ab2cdc911326be44f9ddaff4f5104179 /sc/source/ui | |
| parent | b7c3579484c842c6de2aa46453926d2e30a1d120 (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
Change-Id: Id496725d82289d1be004bdc36195877c12f336b0
Reviewed-on: https://gerrit.libreoffice.org/16772
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/source/ui')
| -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 8b3469a6f89e..2df6456fef19 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 ? SfxPopupWindowType::ONTIMEOUT : SfxPopupWindowType::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 dda701868ab2..cfaf4aeef8e4 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; - void Select( bool bMod1 = false ); + virtual void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE; public: SFX_DECL_TOOLBOX_CONTROL(); |