From 7f5379e040221435548d9be7c8c976378c04489a Mon Sep 17 00:00:00 2001 From: Ross Johnson Date: Wed, 22 Sep 2021 19:58:54 +1000 Subject: tdf#33749 - revised merge and unmerge cells UI controls Revert the two changes made under this issue tdf#33749: 1) Cell context menu back to 7.2 2) Format - Merge Cells menu back to 7.2 3) Help pages to reflect this Moving forward with the following changes: 1) Rename "Split Cells" to "Unmerge Cells" (Calc only) which more accurately describes it's function in Calc (and for consistency with alternative office software). 2) Add "Merge Cells" and "Unmerge Cells" to Formatting toolbar alongside "Merge and Center Cells", including other available user interface schemes where possible. 3) Change the Format - Merge Cells menu icon to the "Merge Cells" icon as less confusing than the current "Merge and Center Cells" icon. Re-label the Format - Merge Cells menu to Format - Merge and Unmerge Cells. 4) Add TooltipLabel to .uno:ToggleMergeCells to clarify dual action. 5) Add Split Cells to Table context menu in Impress (as it is in Writer). 6) Help pages to reflect changes. 7) Remove two duplicate entries in the sUnoCommands array in init.cxx (one was ".uno:MergeCells" related to this change). This is untested but relates to status updates sent to the headless LOK clients. I assume duplicate entries would generate duplicate updates, which may be harmless but is probably not desirable. Change-Id: I3063f871707a7286d95108d3a34a5287401baa6a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122811 Tested-by: Jenkins Reviewed-by: Eike Rathke --- sd/uiconfig/simpress/popupmenu/table.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'sd/uiconfig/simpress/popupmenu/table.xml') diff --git a/sd/uiconfig/simpress/popupmenu/table.xml b/sd/uiconfig/simpress/popupmenu/table.xml index 0f2381480e19..67d7950a0d92 100644 --- a/sd/uiconfig/simpress/popupmenu/table.xml +++ b/sd/uiconfig/simpress/popupmenu/table.xml @@ -13,6 +13,7 @@ + -- cgit