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 /officecfg | |
| 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 'officecfg')
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 84 |
1 files changed, 75 insertions, 9 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 64fbbf30f4fc..103d14d1f672 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -1221,37 +1221,103 @@ <value>com.sun.star.comp.svx.CurrencyToolBoxControl</value> </prop> </node> - <node oor:name="c4" oor:op="replace" install:module="reportbuilder"> + <node oor:name="FontColorToolBox" oor:op="replace"> <prop oor:name="Command"> <value>.uno:FontColor</value> </prop> <prop oor:name="Module"> - <value>com.sun.star.report.ReportDefinition</value> + <value/> </prop> <prop oor:name="Controller"> - <value>com.sun.star.report.ReportToolboxController</value> + <value>com.sun.star.comp.svx.ColorToolBoxControl</value> </prop> </node> - <node oor:name="c5" oor:op="replace" install:module="reportbuilder"> + <node oor:name="BackgroundColorToolBox" oor:op="replace"> <prop oor:name="Command"> <value>.uno:BackgroundColor</value> </prop> <prop oor:name="Module"> - <value>com.sun.star.report.ReportDefinition</value> + <value/> </prop> <prop oor:name="Controller"> - <value>com.sun.star.report.ReportToolboxController</value> + <value>com.sun.star.comp.svx.ColorToolBoxControl</value> </prop> </node> - <node oor:name="c6" oor:op="replace" install:module="reportbuilder"> + <node oor:name="ColorToolBox" oor:op="replace"> <prop oor:name="Command"> <value>.uno:Color</value> </prop> <prop oor:name="Module"> - <value>com.sun.star.report.ReportDefinition</value> + <value/> + </prop> + <prop oor:name="Controller"> + <value>com.sun.star.comp.svx.ColorToolBoxControl</value> + </prop> + </node> + <node oor:name="BackColorToolBox" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:BackColor</value> + </prop> + <prop oor:name="Module"> + <value/> + </prop> + <prop oor:name="Controller"> + <value>com.sun.star.comp.svx.ColorToolBoxControl</value> + </prop> + </node> + <node oor:name="CharBackColorToolBox" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:CharBackColor</value> + </prop> + <prop oor:name="Module"> + <value/> + </prop> + <prop oor:name="Controller"> + <value>com.sun.star.comp.svx.ColorToolBoxControl</value> + </prop> + </node> + <node oor:name="Extrusion3DColorToolBox" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:Extrusion3DColor</value> + </prop> + <prop oor:name="Module"> + <value/> + </prop> + <prop oor:name="Controller"> + <value>com.sun.star.comp.svx.ColorToolBoxControl</value> + </prop> + </node> + <node oor:name="XLineColorToolBox" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:XLineColor</value> + </prop> + <prop oor:name="Module"> + <value/> + </prop> + <prop oor:name="Controller"> + <value>com.sun.star.comp.svx.ColorToolBoxControl</value> + </prop> + </node> + <node oor:name="FillColorToolBox" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:FillColor</value> + </prop> + <prop oor:name="Module"> + <value/> + </prop> + <prop oor:name="Controller"> + <value>com.sun.star.comp.svx.ColorToolBoxControl</value> + </prop> + </node> + <node oor:name="FrameLineColorToolBox" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:FrameLineColor</value> + </prop> + <prop oor:name="Module"> + <value/> </prop> <prop oor:name="Controller"> - <value>com.sun.star.report.ReportToolboxController</value> + <value>com.sun.star.comp.svx.ColorToolBoxControl</value> </prop> </node> <node oor:name="FontNameToolBox" oor:op="replace"> |