[Libreoffice-commits] core.git: sw/source

[Maxim Monastirsky]

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

New commits:
commit 3e18cf51c10dc82b81b95381d3beb4796578a2f1
Author: Maxim Monastirsky <momonas...@gmail.com>
Date:   Wed Jul 23 13:54:42 2014 +0300

    fdo#81651 Wrong argument type in overriding class
    
    See commits:
    16752a8a773cf8096e28628237238a562016c4e5
    c3a89936abc7967ebe8916ca83cb38f6837f9aa1
    
    Change-Id: Ib58888f1027b26fab08519e8c6bede7dbeeb14b5

diff --git a/sw/source/uibase/inc/workctrl.hxx 
b/sw/source/uibase/inc/workctrl.hxx
index 38e6a76..edcc673 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/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/uibase/ribbar/workctrl.cxx 
b/sw/source/uibase/ribbar/workctrl.cxx
index 31a8978..48a4e66 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/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 )
     {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits