diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2014-07-23 14:53:06 +0300 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-07-23 15:33:28 +0000 |
| commit | 5329610454d149af3e5afde0d50e5129980da879 (patch) | |
| tree | 4eb7248f46ba52362cf39d148ec3153e42cff077 | |
| parent | e67d8d221326e1c753457d4283e2cff16b8b5f52 (diff) | |
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@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | sw/source/core/uibase/inc/workctrl.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/uibase/ribbar/workctrl.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/uibase/inc/workctrl.hxx b/sw/source/core/uibase/inc/workctrl.hxx index 513d0efa0daf..0568c3bc9d30 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 31a8978e746c..48a4e66efd29 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 ) { |