diff options
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, |