From 053223085d786b4d1e595a63e01c47e97728e720 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 14 Jan 2020 20:58:18 +0000
Subject: rework SvxColumnsToolBoxControl to be a PopupWindowController
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

and weld it, convert it and TableWindow to use two CustomWidgetController
for the content widgets. Change the ColumnsWindow from an auto-grow width
element to something with a fixed width and add a spinbutton to handle
the overflow cases that don't fit in the fixed width

Change-Id: I046a21dfd2a7c23828c4e2945b42c30db362b049
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86812
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 .../data/org/openoffice/Office/UI/Controller.xcu   | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'officecfg/registry/data/org')

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 07d0da5103fc..ec3474f0594c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -987,6 +987,39 @@
           <value>com.sun.star.comp.svx.TableToolBoxControl</value>
         </prop>
       </node>
+      <node oor:name="InteractiveFrameColumnsToolBoxControl" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:InsertFrameInteract</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.ColumnsToolBoxControl</value>
+        </prop>
+      </node>
+      <node oor:name="FrameColumnsToolBoxControl" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:InsertFrame</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.ColumnsToolBoxControl</value>
+        </prop>
+      </node>
+      <node oor:name="SectionColumnsToolBoxControl" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:InsertSection</value>
+        </prop>
+        <prop oor:name="Module">
+          <value/>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.svx.ColumnsToolBoxControl</value>
+        </prop>
+      </node>
       <node oor:name="ExtrusionDirectionFloater" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:ExtrusionDirectionFloater</value>
-- 
cgit v1.2.3