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

[Caolán McNamara (via logerrit)]

 include/sfx2/tbxctrl.hxx             |    2 +-
 include/svx/clipboardctl.hxx         |    2 +-
 sfx2/source/toolbox/tbxitem.cxx      |   11 +++--------
 svx/source/mnuctrls/clipboardctl.cxx |    5 +----
 sw/source/uibase/inc/workctrl.hxx    |    2 +-
 sw/source/uibase/ribbar/workctrl.cxx |    3 +--
 6 files changed, 8 insertions(+), 17 deletions(-)

New commits:
commit 160cde8ec0473b4a0c8e15ee13520d83171aea8d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 15 13:24:50 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jan 15 20:29:35 2020 +0100

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index cb94907ffae9..5503aaae997d 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -132,7 +132,7 @@ protected:
 
     virtual void               DoubleClick();
     virtual void               Click();
-    virtual VclPtr<SfxPopupWindow> CreatePopupWindow();
+    virtual void               CreatePopupWindow();
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent );
 
     // Must be called by subclass to set a new popup window instance
diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx
index 76182554f19a..ec805c95896f 100644
--- a/include/svx/clipboardctl.hxx
+++ b/include/svx/clipboardctl.hxx
@@ -46,7 +46,7 @@ public:
     SvxClipBoardControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     virtual ~SvxClipBoardControl() override;
 
-    virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override;
+    void CreatePopupWindow() override;
     virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState ) override;
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 0e9aba25830f..04cc9dee983c 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -547,11 +547,8 @@ void SAL_CALL SfxToolBoxControl::doubleClick()
 Reference< css::awt::XWindow > SAL_CALL SfxToolBoxControl::createPopupWindow()
 {
     SolarMutexGuard aGuard;
-    VclPtr<vcl::Window> pWindow = CreatePopupWindow();
-    if ( pWindow )
-        return VCLUnoHelper::GetInterface( pWindow );
-    else
-        return Reference< css::awt::XWindow >();
+    CreatePopupWindow();
+    return nullptr;
 }
 
 Reference< css::awt::XWindow > SAL_CALL SfxToolBoxControl::createItemWindow( const Reference< css::awt::XWindow >& rParent )
@@ -669,10 +666,8 @@ void SfxToolBoxControl::Click()
 {
 }
 
-
-VclPtr<SfxPopupWindow> SfxToolBoxControl::CreatePopupWindow()
+void SfxToolBoxControl::CreatePopupWindow()
 {
-    return nullptr;
 }
 
 VclPtr<vcl::Window> SfxToolBoxControl::CreateItemWindow( vcl::Window * )
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index f24401e134aa..693b465208e8 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -58,8 +58,7 @@ SvxClipBoardControl::~SvxClipBoardControl()
     DelPopup();
 }
 
-
-VclPtr<SfxPopupWindow> SvxClipBoardControl::CreatePopupWindow()
+void SvxClipBoardControl::CreatePopupWindow()
 {
     const SvxClipboardFormatItem* pFmtItem = dynamic_cast<SvxClipboardFormatItem*>( pClipboardFmtItem.get()  );
     if ( pFmtItem )
@@ -102,10 +101,8 @@ VclPtr<SfxPopupWindow> SvxClipBoardControl::CreatePopupWindow()
 
     GetToolBox().EndSelection();
     DelPopup();
-    return nullptr;
 }
 
-
 void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     if ( SID_CLIPBOARD_FORMAT_ITEMS == nSID )
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,