From e867b197540cfc8b75bb1108c8bcd7a0ff65d347 Mon Sep 17 00:00:00 2001
From: Maxim Monastirsky <momonasmon@gmail.com>
Date: Sun, 17 Sep 2017 23:35:55 +0300
Subject: tdf#106762 Base SvxColorToolBoxControl on svt::PopupWindowController

This allows us to support tearoff without breaking gtk3/wayland.
SvxColorWindow no longer inherits from FloatingWindow, so several
call sites need also to be changed to use DockingManager.

Change-Id: I5d0bc611bbd2a8b9bfd4335212d0ae7e8fc10593
---
 svtools/source/control/toolbarmenu.cxx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'svtools/source/control')

diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 822a85892564..3a77a9f80225 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -1427,6 +1427,19 @@ void SAL_CALL ToolbarPopupStatusListener::statusChanged( const css::frame::Featu
 ToolbarPopup::ToolbarPopup( const css::uno::Reference<css::frame::XFrame>& rFrame, vcl::Window* pParentWindow, WinBits nBits )
     : DockingWindow(pParentWindow, nBits)
     , mxFrame( rFrame )
+{
+    init();
+}
+
+ToolbarPopup::ToolbarPopup( const css::uno::Reference<css::frame::XFrame>& rFrame, vcl::Window* pParentWindow,
+                            const OString& rID, const OUString& rUIXMLDescription )
+    : DockingWindow(pParentWindow, rID, rUIXMLDescription, rFrame)
+    , mxFrame( rFrame )
+{
+    init();
+}
+
+void ToolbarPopup::init()
 {
     vcl::Window* pWindow = GetTopMostParentSystemWindow( this );
     if ( pWindow )
-- 
cgit