sc/source/ui/cctrl/tbinsert.cxx | 2 +-
sc/source/ui/inc/tbinsert.hxx | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 979d93f5f4d3a0a2961da7c0529d948cae5c4ae1
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
Change-Id: Id496725d82289d1be004bdc36195877c12f336b0
Reviewed-on: https://gerrit.libreoffice.org/16772
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 8b3469a..2df6456 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 dda7018..cfaf4ae 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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
