diff options
author | Justin Luth <justin_luth@sil.org> | 2018-09-20 17:16:14 +0300 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-10-11 09:23:23 +0200 |
commit | 59ed21b1720db5fd0326e1b723483b288725e662 (patch) | |
tree | c7fd92c1dd7a7a1f96c34c6069447f764156c843 /sw/uiconfig/sweb | |
parent | e4c7f31cf90850a986a6603b62192976567871b9 (diff) |
tdf#64242 sw add minimize table col/row UI
A followup commit will modify the optimize functions,
which currently function as a minimize, so lets make
sure that the ability to minimize is still available.
Minimize column width: Adjusts the width of the
selected columns to fit the selected content.
The table can shrink if necessary, but will not grow.
(This is how Optimize column width worked in LO <= 6.1.)
Minimize row height: Adjusts the height of the
selected rows to fit the content, causing the table to shrink.
(This is how Optimize row height worked in LO <= 6.1.)
Change-Id: I2c0b8c7b7a05c31328f2feef464ef0e131318ff8
Reviewed-on: https://gerrit.libreoffice.org/60902
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/uiconfig/sweb')
-rw-r--r-- | sw/uiconfig/sweb/menubar/menubar.xml | 2 | ||||
-rw-r--r-- | sw/uiconfig/sweb/popupmenu/table.xml | 10 | ||||
-rw-r--r-- | sw/uiconfig/sweb/toolbar/optimizetablebar.xml | 8 |
3 files changed, 13 insertions, 7 deletions
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index 0eb7501234d8..621628271160 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -485,10 +485,12 @@ <menu:menu menu:id=".uno:TableAutoFitMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:SetRowHeight"/> + <menu:menuitem menu:id=".uno:SetMinimalRowHeight"/> <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/> <menu:menuitem menu:id=".uno:DistributeRows"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:SetColumnWidth"/> + <menu:menuitem menu:id=".uno:SetMinimalColumnWidth"/> <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/> <menu:menuitem menu:id=".uno:DistributeColumns"/> </menu:menupopup> diff --git a/sw/uiconfig/sweb/popupmenu/table.xml b/sw/uiconfig/sweb/popupmenu/table.xml index 627b4aa562b4..60e3bb047c41 100644 --- a/sw/uiconfig/sweb/popupmenu/table.xml +++ b/sw/uiconfig/sweb/popupmenu/table.xml @@ -45,13 +45,15 @@ <menu:menuitem menu:id=".uno:MergeCells"/> <menu:menu menu:id=".uno:TableAutoFitMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:SetColumnWidth"/> - <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/> - <menu:menuitem menu:id=".uno:DistributeColumns"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:SetRowHeight"/> + <menu:menuitem menu:id=".uno:SetMinimalRowHeight"/> <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/> <menu:menuitem menu:id=".uno:DistributeRows"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:SetColumnWidth"/> + <menu:menuitem menu:id=".uno:SetMinimalColumnWidth"/> + <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/> + <menu:menuitem menu:id=".uno:DistributeColumns"/> </menu:menupopup> </menu:menu> <menu:menuitem menu:id=".uno:TableNumberFormatDialog"/> diff --git a/sw/uiconfig/sweb/toolbar/optimizetablebar.xml b/sw/uiconfig/sweb/toolbar/optimizetablebar.xml index 21c5e2757bbe..e1bab26b2bae 100644 --- a/sw/uiconfig/sweb/toolbar/optimizetablebar.xml +++ b/sw/uiconfig/sweb/toolbar/optimizetablebar.xml @@ -18,8 +18,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <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:toolbaritem xlink:href=".uno:SetMinimalRowHeight"/> + <toolbar:toolbaritem xlink:href=".uno:SetMinimalColumnWidth"/> <toolbar:toolbaritem xlink:href=".uno:SetOptimalRowHeight"/> <toolbar:toolbaritem xlink:href=".uno:SetOptimalColumnWidth"/> -</toolbar:toolbar>
\ No newline at end of file + <toolbar:toolbaritem xlink:href=".uno:DistributeRows"/> + <toolbar:toolbaritem xlink:href=".uno:DistributeColumns"/> +</toolbar:toolbar> |