diff options
| author | Ross Johnson <ross.johnson@homemail.com.au> | 2021-09-26 01:42:20 +0200 |
|---|---|---|
| committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2021-09-27 07:01:52 +0200 |
| commit | 2c5a094e8a0e78b3b2be9b7894d888c43d22619c (patch) | |
| tree | 987ce96ab8d579d06790c03de7b8c2a17eab9f45 /sc | |
| parent | a0cc67350a56a77a457a1236f414a579c148194a (diff) | |
Revert "tdf#33749 - rationalise several confusing cell merge controls"
This reverts commit 8010a0a32c232f06534fdd56c2227c9c00798cfd.
Reason for revert: The change introduced a regression.
Change-Id: I59446c62e8798cf7a6a11d916da0c1f393c87dea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122450
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/uiconfig/scalc/menubar/menubar.xml | 8 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/popupmenu/cell.xml | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 112d941bec6c..eeb746de8432 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -397,7 +397,13 @@ <menu:menuitem menu:id=".uno:ShowColumn"/> </menu:menupopup> </menu:menu> - <menu:menuitem menu:id=".uno:ToggleMergeCells"/> + <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: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 081ee6709d57..fd086d0af975 100644 --- a/sc/uiconfig/scalc/popupmenu/cell.xml +++ b/sc/uiconfig/scalc/popupmenu/cell.xml @@ -32,7 +32,8 @@ <menu:menuitem menu:id=".uno:InsertCell"/> <menu:menuitem menu:id=".uno:DeleteCell"/> <menu:menuitem menu:id=".uno:Delete"/> - <menu:menuitem menu:id=".uno:ToggleMergeCells"/> + <menu:menuitem menu:id=".uno:MergeCells"/> + <menu:menuitem menu:id=".uno:SplitCell"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:FormatPaintbrush"/> <menu:menuitem menu:id=".uno:ResetAttributes"/> |