From 41fe604a2e48c8c921a29bf4240abf8929582e2e Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 19 Feb 2021 20:54:17 +0000
Subject: merge together interimdockparent usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

and their uses of VclBuilder can be contained to vcl

Change-Id: I0cbbd3175e4ec857187b7f1716232a3514fe9605
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111251
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 include/svtools/toolbarmenu.hxx |  3 +--
 include/vcl/dockwin.hxx         | 11 +++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index a9b0a9f5415c..e68043b34ed5 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -82,10 +82,9 @@ public:
     void unsetPopover();
 };
 
-class SVT_DLLPUBLIC InterimToolbarPopup final : public DockingWindow
+class SVT_DLLPUBLIC InterimToolbarPopup final : public InterimDockingWindow
 {
 private:
-    VclPtr<vcl::Window> m_xBox;
     css::uno::Reference<css::frame::XFrame> m_xFrame;
     std::unique_ptr<weld::Builder> m_xBuilder;
     std::unique_ptr<weld::Container> m_xContainer;
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index b52091f0c642..390c96267f0b 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -378,6 +378,17 @@ inline void DockingWindow::SetIdleDebugName( const char *pDebugName )
     maLayoutIdle.SetDebugName( pDebugName );
 }
 
+class VCL_DLLPUBLIC InterimDockingWindow : public DockingWindow
+{
+protected:
+    VclPtr<vcl::Window> m_xBox;
+public:
+    InterimDockingWindow(vcl::Window* pParent,
+        const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>(),
+        bool bTearable = false);
+    virtual ~InterimDockingWindow() override;
+    virtual void dispose() override;
+};
 
 #endif // INCLUDED_VCL_DOCKWIN_HXX
 
-- 
cgit