[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

[Maxim Monastirsky]

 sw/source/core/uibase/inc/workctrl.hxx    |    2 +-
 sw/source/core/uibase/ribbar/workctrl.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5329610454d149af3e5afde0d50e5129980da879
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Wed Jul 23 14:53:06 2014 +0300

    fdo#81651 Wrong argument type in overriding class
    
    See commits:
    16752a8a773cf8096e28628237238a562016c4e5
    c3a89936abc7967ebe8916ca83cb38f6837f9aa1
    
    Change-Id: If6ff9b2bcaad00393a29d50fd806e23d74a84272
    Reviewed-on: https://gerrit.libreoffice.org/10490
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/source/core/uibase/inc/workctrl.hxx b/sw/source/core/uibase/inc/workctrl.hxx
index 513d0ef..0568c3b 100644
--- a/sw/source/core/uibase/inc/workctrl.hxx
+++ b/sw/source/core/uibase/inc/workctrl.hxx
@@ -57,7 +57,7 @@ class SwTbxInsertCtrl : public SfxToolBoxControl
     sal_uInt16                  nLastSlotId;
 
     using SfxToolBoxControl::Select;
-    virtual void            Select( sal_Bool bMod1 = sal_False );
+    virtual void            Select( sal_uInt16 nSelectModifier );
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/sw/source/core/uibase/ribbar/workctrl.cxx b/sw/source/core/uibase/ribbar/workctrl.cxx
index 31a8978..48a4e66 100644
--- a/sw/source/core/uibase/ribbar/workctrl.cxx
+++ b/sw/source/core/uibase/ribbar/workctrl.cxx
@@ -136,7 +136,7 @@ SfxPopupWindowType  SwTbxInsertCtrl::GetPopupWindowType() const
     return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK;
 }
 
-void SwTbxInsertCtrl::Select( sal_Bool /*bMod1*/ )
+void SwTbxInsertCtrl::Select( sal_uInt16 /*nSelectModifier*/ )
 {
     if( nLastSlotId )
     {