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 <erack@redhat.com>

desktop/source/lib/init.cxx

@@ -2823,8 +2823,6 @@ static void doc_iniUnoCommands ()
         OUString(".uno:Copy"),
         OUString(".uno:Paste"),
         OUString(".uno:SelectAll"),
-        OUString(".uno:InsertAnnotation"),
-        OUString(".uno:DeleteAnnotation"),
         OUString(".uno:ReplyComment"),
         OUString(".uno:ResolveComment"),
         OUString(".uno:ResolveCommentThread"),
@@ -2832,7 +2830,6 @@ static void doc_iniUnoCommands ()
         OUString(".uno:InsertRowsAfter"),
         OUString(".uno:InsertColumnsBefore"),
         OUString(".uno:InsertColumnsAfter"),
-        OUString(".uno:MergeCells"),
         OUString(".uno:DeleteRows"),
         OUString(".uno:DeleteColumns"),
         OUString(".uno:DeleteTable"),
@@ -2885,6 +2882,7 @@ static void doc_iniUnoCommands ()
         OUString(".uno:InsertObjectChart"),
         OUString(".uno:InsertSection"),
         OUString(".uno:InsertAnnotation"),
+        OUString(".uno:DeleteAnnotation"),
         OUString(".uno:InsertPagebreak"),
         OUString(".uno:InsertColumnBreak"),
         OUString(".uno:HyperlinkDialog"),

icon-themes/colibre/links.txt

@@ -1719,17 +1719,17 @@ cmd/sc_arrangemenu.png cmd/sc_bringtofront.png
 
 # Calc
 cmd/32/insertcell.png cmd/32/insertcellsright.png
-cmd/32/mergecellsmenu.png cmd/32/togglemergecells.png
+cmd/32/mergecellsmenu.png cmd/32/mergecells.png
 cmd/32/numberformatmenu.png cmd/32/numberformatstandard.png
 cmd/32/printrangesmenu.png cmd/32/defineprintarea.png
 
 cmd/lc_insertcell.png cmd/lc_insertcellsright.png
-cmd/lc_mergecellsmenu.png cmd/lc_togglemergecells.png
+cmd/lc_mergecellsmenu.png cmd/lc_mergecells.png
 cmd/lc_numberformatmenu.png cmd/lc_numberformatstandard.png
 cmd/lc_printrangesmenu.png cmd/lc_defineprintarea.png
 
 cmd/sc_insertcell.png cmd/sc_insertcellsright.png
-cmd/sc_mergecellsmenu.png cmd/sc_togglemergecells.png
+cmd/sc_mergecellsmenu.png cmd/sc_mergecells.png
 cmd/sc_numberformatmenu.png cmd/sc_numberformatstandard.png
 cmd/sc_printrangesmenu.png cmd/sc_defineprintarea.png
 

officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu

@@ -1685,7 +1685,7 @@
       </node>
       <node oor:name=".uno:SplitCell" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Split Cells</value>
+          <value xml:lang="en-US">Unmerge Cells</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -1695,6 +1695,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">M~erge and Center Cells</value>
         </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Merge and center or unmerge cells depending on the current toggle state</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -2486,7 +2489,7 @@
       </node>
       <node oor:name=".uno:MergeCellsMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">M~erge Cells</value>
+          <value xml:lang="en-US">M~erge and Unmerge Cells</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>

sc/uiconfig/scalc/toolbar/formatobjectbar.xml

@@ -45,13 +45,16 @@
  <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignBlock" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapText"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleMergeCells"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignVCenter"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapText"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleMergeCells"/>
+ <toolbar:toolbaritem xlink:href=".uno:MergeCells"/>
+ <toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
+ <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:NumberFormatStandard" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:NumberFormatCurrency"/>
  <toolbar:toolbaritem xlink:href=".uno:NumberFormatPercent"/>

sc/uiconfig/scalc/toolbar/singlemode.xml

@@ -63,13 +63,16 @@
  <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignBlock" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:WrapText"/>
- <toolbar:toolbaritem xlink:href=".uno:ToggleMergeCells"/>
- <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignVCenter"/>
  <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:WrapText"/>
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ToggleMergeCells"/>
+ <toolbar:toolbaritem xlink:href=".uno:MergeCells"/>
+ <toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
+ <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:IncrementIndent" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:DecrementIndent" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>

sd/uiconfig/simpress/popupmenu/table.xml

@@ -13,6 +13,7 @@
   <menu:menuitem menu:id=".uno:Paste"/>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:MergeCells"/>
+  <menu:menuitem menu:id=".uno:SplitCell"/>
   <menu:menu menu:id=".uno:TableInsertMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:InsertRowsBefore"/>