Kaydet (Commit) 979d93f5 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky Kaydeden (comit) Eike Rathke

This one should override SfxToolBoxControl::Select

We don't have there Select(bool) since
c3a89936.

(cherry picked from commit 4604a6a7)
(cherry picked from commit bc3c7f25)

Conflicts:
	sc/source/ui/cctrl/tbinsert.cxx

Change-Id: Id496725d82289d1be004bdc36195877c12f336b0
Reviewed-on: https://gerrit.libreoffice.org/16772Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
Tested-by: 's avatarEike Rathke <erack@redhat.com>
üst b7c35794
......@@ -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 );
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment