diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-15 13:24:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-15 20:29:35 +0100 |
| commit | 160cde8ec0473b4a0c8e15ee13520d83171aea8d (patch) | |
| tree | 32674ff800bb19a4ae1492888e6573e8fd08f98c /sw | |
| parent | c34edadf5bd3d1d9f3c9c056af28b8964d8f1ca0 (diff) | |
no remaining CreatePopupWindow returns non-null
Change-Id: Ie342bd24222f622997d8dc2cda51ecb908fdb047
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86843
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/inc/workctrl.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/ribbar/workctrl.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index b276d9c1ac5c..6aa03352bd94 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -58,7 +58,7 @@ public: SwTbxAutoTextCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SwTbxAutoTextCtrl() override; - virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; + virtual void CreatePopupWindow() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index a7f76cf9aff0..077e987398fc 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -78,7 +78,7 @@ SwTbxAutoTextCtrl::~SwTbxAutoTextCtrl() { } -VclPtr<SfxPopupWindow> SwTbxAutoTextCtrl::CreatePopupWindow() +void SwTbxAutoTextCtrl::CreatePopupWindow() { SwView* pView = ::GetActiveView(); if(pView && !pView->GetDocShell()->IsReadOnly() && @@ -123,7 +123,6 @@ VclPtr<SfxPopupWindow> SwTbxAutoTextCtrl::CreatePopupWindow() pToolBox->SetItemDown( nId, false ); } GetToolBox().EndSelection(); - return nullptr; } void SwTbxAutoTextCtrl::StateChanged( sal_uInt16, |