[Libreoffice-commits] core.git: include/svtools svtools/source

[Caolán McNamara (via logerrit)]

 include/svtools/popupwindowcontroller.hxx    |    4 ++--
 svtools/source/uno/popupwindowcontroller.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 723a4d450cf67ba9aa48170cbf98000659146d18
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jan 26 09:55:12 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jan 26 12:07:38 2022 +0100

    weldPopupWindow is always implemented by now
    
    Change-Id: Ia1f2c6cb66175cd1dc0f5f42fb88f7a901d40cb8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128975
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/include/svtools/popupwindowcontroller.hxx 
b/include/svtools/popupwindowcontroller.hxx
index 4d77d084f442..4f1b84f67d69 100644
--- a/include/svtools/popupwindowcontroller.hxx
+++ b/include/svtools/popupwindowcontroller.hxx
@@ -60,8 +60,8 @@ public:
 
     void EndPopupMode();
 
-    virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent) = 0;
-    virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow();
+    virtual VclPtr<vcl::Window> createVclPopupWindow(vcl::Window* pParent);
+    virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() = 0;
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override = 0;
diff --git a/svtools/source/uno/popupwindowcontroller.cxx 
b/svtools/source/uno/popupwindowcontroller.cxx
index 8d3efd838bd1..83419b4d92b9 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -202,7 +202,7 @@ void SAL_CALL PopupWindowController::statusChanged( const 
frame::FeatureStateEve
     }
 }
 
-std::unique_ptr<WeldToolbarPopup> PopupWindowController::weldPopupWindow()
+VclPtr<vcl::Window> PopupWindowController::createVclPopupWindow(vcl::Window* 
/*pParent*/)
 {
     return nullptr;
 }