summaryrefslogtreecommitdiff
path: root/svx/util
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2017-09-17 23:35:55 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2017-09-24 15:37:28 +0300
commite867b197540cfc8b75bb1108c8bcd7a0ff65d347 (patch)
tree8dbcdc2d2db4b9f3fb0e302b5d8031386a75c346 /svx/util
parent8bd418a6b8253a9d725981743a0375e2c8bb911e (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 'svx/util')
-rw-r--r--svx/util/svxcore.component4
1 files changed, 4 insertions, 0 deletions
diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component
index 490e39c9e56b..aa1cac6fcae4 100644
--- a/svx/util/svxcore.component
+++ b/svx/util/svxcore.component
@@ -44,6 +44,10 @@
constructor="com_sun_star_comp_svx_FrameToolBoxControl_get_implementation">
<service name="com.sun.star.frame.ToolbarController"/>
</implementation>
+ <implementation name="com.sun.star.comp.svx.ColorToolBoxControl"
+ constructor="com_sun_star_comp_svx_ColorToolBoxControl_get_implementation">
+ <service name="com.sun.star.frame.ToolbarController"/>
+ </implementation>
<implementation name="com.sun.star.comp.svx.CurrencyToolBoxControl"
constructor="com_sun_star_comp_svx_CurrencyToolBoxControl_get_implementation">
<service name="com.sun.star.frame.ToolbarController"/>