sc/source/ui/cctrl/tbinsert.cxx | 2 +- sc/source/ui/inc/tbinsert.hxx | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-)
New commits: commit 0e78a51b0e7b023bcdc51fdbff7816ed4ba5d0f8 Author: Maxim Monastirsky <momonas...@gmail.com> Date: Sun Jul 5 10:25:14 2015 +0300 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 <er...@redhat.com> Tested-by: Eike Rathke <er...@redhat.com> diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index 4030b74..e5f77d8 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 01b1d46..4238305 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(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits