diff options
| author | Ross Johnson <ross.johnson@homemail.com.au> | 2021-09-18 19:13:08 +1000 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2021-09-20 16:31:33 +0200 |
| commit | 8010a0a32c232f06534fdd56c2227c9c00798cfd (patch) | |
| tree | 65ef4d2cde2db740975f16e85d5655ffdb33879f | |
| parent | f0dfc5a38816bd01389f5ac8fd46d43a201f18a6 (diff) | |
tdf#33749 - rationalise several confusing cell merge controls
1) Replace the entire "Format > Merge Cells" submenu with the
single "Format > Merge and Center Cells" button with all the
same behaviour it has on the Formatting Bar.
2) Replace the "Split Cells" button from the context menu of
a selected merged cell with the "Merge and Center Cells" button
showing the current merge status, as it does elsewhere.
3) The "Merge Cells" checkbox in the Properties sidebar
Alignment section is unchanged.
Rationale:
The current behaviour of the "Merge and Center Cells" button on
the Formatting Bar is consistent with all other formatting buttons,
eg, "Align Left" is still "Align Left" (but shown activated) when
the text is currently already left aligned, and toggling it off
reverts the alignment to a default alignment. It behaves correctly
and intuitively IMO.
The "Merge Cells" button in the "Format > Merge Cells" submenu
should be removed as it appears to do the same as
"Merge and Center Cells", that is, when it works correctly. It
isn't helpful though as it has at least two problems: 1) it is
greyed out if a merged cell is selected, unlike
"Merge and Centre Cells"; 2) it becomes selectable when a range
of cells is selected that includes a merged cell, but won't
perform the merge.
Removing both "Merge Cells" and "Split Cells" buttons from the
Format > Merge Cells submenu leaves one entry, the
"Merge and Center Cells" button, which should then be promoted
to the top level menu.
Change-Id: I2f592211f888427d5bba384c28c8c3c7d92d8de6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122293
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | sc/uiconfig/scalc/menubar/menubar.xml | 8 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/popupmenu/cell.xml | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index eeb746de8432..112d941bec6c 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -397,13 +397,7 @@ <menu:menuitem menu:id=".uno:ShowColumn"/> </menu:menupopup> </menu:menu> - <menu:menu menu:id=".uno:MergeCellsMenu"> - <menu:menupopup> - <menu:menuitem menu:id=".uno:ToggleMergeCells"/> - <menu:menuitem menu:id=".uno:MergeCells"/> - <menu:menuitem menu:id=".uno:SplitCell"/> - </menu:menupopup> - </menu:menu> + <menu:menuitem menu:id=".uno:ToggleMergeCells"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:FontDialog"/> <menu:menuitem menu:id=".uno:ParagraphDialog"/> diff --git a/sc/uiconfig/scalc/popupmenu/cell.xml b/sc/uiconfig/scalc/popupmenu/cell.xml index fd086d0af975..081ee6709d57 100644 --- a/sc/uiconfig/scalc/popupmenu/cell.xml +++ b/sc/uiconfig/scalc/popupmenu/cell.xml @@ -32,8 +32,7 @@ <menu:menuitem menu:id=".uno:InsertCell"/> <menu:menuitem menu:id=".uno:DeleteCell"/> <menu:menuitem menu:id=".uno:Delete"/> - <menu:menuitem menu:id=".uno:MergeCells"/> - <menu:menuitem menu:id=".uno:SplitCell"/> + <menu:menuitem menu:id=".uno:ToggleMergeCells"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:FormatPaintbrush"/> <menu:menuitem menu:id=".uno:ResetAttributes"/> |