summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2018-09-06 12:17:47 +0300
committerJustin Luth <justin_luth@sil.org>2018-09-21 16:48:13 +0200
commit73859a1c00d443714a1e5f2a1a8d16fe46877944 (patch)
tree20ec8312fef2cd36910989883cee6fd0e3b068da /sd
parentf74b888244fcefa7c03fa25db4d42c839ebbf642 (diff)
tdf#117721 draw ui: add .uno::SetOptimalColumnWidth
Optimize column width: Adjusts the width of the selected columns to fit the content, without changing the width of the table. Any leftover space is distributed proportionately, with thin columns growing slightly, and wide columns growing much wider. The implementation and results are different from how Writer does it, but tables themselves are also very different in Draw. So I don't think it needs to be handled identically. Writer's implementation is really "minimalColumnWidth" anyway. Change-Id: Ia10cfa9822d7eef3c4909a82c21535aa6668b143 Reviewed-on: https://gerrit.libreoffice.org/60078 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sd')
-rw-r--r--sd/sdi/sdraw.sdi17
-rw-r--r--sd/sdi/tables.sdi6
-rw-r--r--sd/uiconfig/sdraw/popupmenu/table.xml1
-rw-r--r--sd/uiconfig/sdraw/popupmenu/tabletext.xml1
-rw-r--r--sd/uiconfig/sdraw/toolbar/optimizetablebar.xml3
-rw-r--r--sd/uiconfig/simpress/popupmenu/table.xml1
-rw-r--r--sd/uiconfig/simpress/popupmenu/tabletext.xml1
-rw-r--r--sd/uiconfig/simpress/toolbar/optimizetablebar.xml3
8 files changed, 31 insertions, 2 deletions
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 98d36b3985e2..234410d48937 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -4073,6 +4073,23 @@ SfxBoolItem DisplayMasterObjects SID_DISPLAY_MASTER_OBJECTS
GroupId = SfxGroupId::View;
]
+SfxVoidItem SetOptimalColumnWidth SID_TABLE_OPTIMAL_COLUMN_WIDTH
+()
+[
+ AutoUpdate = FALSE,
+ FastCall = TRUE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ ToolBoxConfig = TRUE,
+ GroupId = SfxGroupId::Table;
+]
+
SfxVoidItem DistributeColumns SID_TABLE_DISTRIBUTE_COLUMNS
()
[
diff --git a/sd/sdi/tables.sdi b/sd/sdi/tables.sdi
index ba9488841933..2df3198ba75d 100644
--- a/sd/sdi/tables.sdi
+++ b/sd/sdi/tables.sdi
@@ -144,6 +144,12 @@ shell TableObjectBar
StateMethod = GetState;
]
+ SID_TABLE_OPTIMAL_COLUMN_WIDTH
+ [
+ ExecMethod = Execute;
+ StateMethod = GetState;
+ ]
+
SID_TABLE_DISTRIBUTE_COLUMNS
[
ExecMethod = Execute;
diff --git a/sd/uiconfig/sdraw/popupmenu/table.xml b/sd/uiconfig/sdraw/popupmenu/table.xml
index 18e526b029d4..aef1806c3be4 100644
--- a/sd/uiconfig/sdraw/popupmenu/table.xml
+++ b/sd/uiconfig/sdraw/popupmenu/table.xml
@@ -42,6 +42,7 @@
</menu:menu>
<menu:menu menu:id=".uno:ColumnMenu">
<menu:menupopup>
+ <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
<menu:menuitem menu:id=".uno:DistributeColumns"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:EntireColumn"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/tabletext.xml b/sd/uiconfig/sdraw/popupmenu/tabletext.xml
index 243e31955eb2..8533bc957a9a 100644
--- a/sd/uiconfig/sdraw/popupmenu/tabletext.xml
+++ b/sd/uiconfig/sdraw/popupmenu/tabletext.xml
@@ -41,6 +41,7 @@
</menu:menu>
<menu:menu menu:id=".uno:ColumnMenu">
<menu:menupopup>
+ <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
<menu:menuitem menu:id=".uno:DistributeColumns"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:EntireColumn"/>
diff --git a/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml b/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml
index b80ee906049a..69aac8bdd769 100644
--- a/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml
+++ b/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml
@@ -20,4 +20,5 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DistributeColumns"/>
<toolbar:toolbaritem xlink:href=".uno:DistributeRows"/>
-</toolbar:toolbar> \ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:SetOptimalColumnWidth"/>
+</toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/popupmenu/table.xml b/sd/uiconfig/simpress/popupmenu/table.xml
index 6ade53449e3a..e22f2150c48e 100644
--- a/sd/uiconfig/simpress/popupmenu/table.xml
+++ b/sd/uiconfig/simpress/popupmenu/table.xml
@@ -42,6 +42,7 @@
</menu:menu>
<menu:menu menu:id=".uno:ColumnMenu">
<menu:menupopup>
+ <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
<menu:menuitem menu:id=".uno:DistributeColumns"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:EntireColumn"/>
diff --git a/sd/uiconfig/simpress/popupmenu/tabletext.xml b/sd/uiconfig/simpress/popupmenu/tabletext.xml
index 243e31955eb2..8533bc957a9a 100644
--- a/sd/uiconfig/simpress/popupmenu/tabletext.xml
+++ b/sd/uiconfig/simpress/popupmenu/tabletext.xml
@@ -41,6 +41,7 @@
</menu:menu>
<menu:menu menu:id=".uno:ColumnMenu">
<menu:menupopup>
+ <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
<menu:menuitem menu:id=".uno:DistributeColumns"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:EntireColumn"/>
diff --git a/sd/uiconfig/simpress/toolbar/optimizetablebar.xml b/sd/uiconfig/simpress/toolbar/optimizetablebar.xml
index b80ee906049a..69aac8bdd769 100644
--- a/sd/uiconfig/simpress/toolbar/optimizetablebar.xml
+++ b/sd/uiconfig/simpress/toolbar/optimizetablebar.xml
@@ -20,4 +20,5 @@
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
<toolbar:toolbaritem xlink:href=".uno:DistributeColumns"/>
<toolbar:toolbaritem xlink:href=".uno:DistributeRows"/>
-</toolbar:toolbar> \ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:SetOptimalColumnWidth"/>
+</toolbar:toolbar>