diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-09-17 23:35:55 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-09-24 15:37:28 +0300 |
| commit | e867b197540cfc8b75bb1108c8bcd7a0ff65d347 (patch) | |
| tree | 8dbcdc2d2db4b9f3fb0e302b5d8031386a75c346 /include/svtools | |
| parent | 8bd418a6b8253a9d725981743a0375e2c8bb911e (diff) | |
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
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/toolbarmenu.hxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 5f990ef0dcad..88174253548a 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -50,6 +50,9 @@ public: ToolbarPopup(const css::uno::Reference<css::frame::XFrame>& rFrame, vcl::Window* pParentWindow, WinBits nBits ); + ToolbarPopup(const css::uno::Reference<css::frame::XFrame>& rFrame, + vcl::Window* pParentWindow, + const OString& rID, const OUString& rUIXMLDescription ); virtual ~ToolbarPopup() override; virtual void dispose() override; @@ -64,6 +67,8 @@ protected: virtual void statusChanged(const css::frame::FeatureStateEvent& Event ); private: + void init(); + css::uno::Reference< css::frame::XFrame > mxFrame; rtl::Reference< svt::FrameStatusListener > mxStatusListener; }; |