Revert "tdf#33749 - HTML Help pages - reflect changes to cell merge in Calc"

This reverts commit 7a45cfda035abefcda03767a4c81f93c69d593b1.

Reason for revert: Change to core have been reverted due to their regressive nature as reported. This revert is for sync. There is a new patchset coming to resolve the issue.

Change-Id: I30e224b7fc79a9620058e26ee5055f9ff5ce8819
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122647
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

6 files changed, 11 insertions, 32 deletions

diff --git a/source/text/scalc/01/05060000.xhp b/source/text/scalc/01/05060000.xhp
index e9180f2e81..01ca02e4f7 100644
--- a/source/text/scalc/01/05060000.xhp
+++ b/source/text/scalc/01/05060000.xhp
@@ -35,13 +35,10 @@
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/MergeCellsDialog" id="bm_id2745673" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/@@nowidget@@" id="bm_id2745673" localize="false"/>
 <paragraph role="heading" id="hd_id3149785" xml-lang="en-US" level="1"><link href="text/scalc/01/05060000.xhp" name="Merge and Center Cells">Merge and Center Cells</link></paragraph>
-<paragraph role="paragraph" id="par_id3151246" xml-lang="en-US"><variable id="merge_and_center_cells"><ahelp hid=".">Combines the selected cells into a single cell with content centered, or splits merged cells.</ahelp></variable></paragraph>
-<paragraph role="paragraph" id="par_id671631973186162" xml-lang="en-US"><ahelp hid=".">This is a toggle control. If the control appears activated, the selected cells are currently merged and will be split when the state of the control is toggled, and vice versa.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151246" xml-lang="en-US"><ahelp hid=".">Combines the selected cells into a single cell or splits merged cells. Aligns cell content centered.</ahelp></paragraph>
 </section>
 <section id="howtoget">
-<paragraph role="paragraph" id="par_id461631976354876" xml-lang="en-US">From the <emph>Formatting Bar</emph> - choose <emph>Merge and Center Cells</emph>; or</paragraph>
-<paragraph role="paragraph" id="par_id3154020" xml-lang="en-US">Choose <emph>Format - Merge and Center Cells</emph>; or</paragraph>
-<paragraph role="paragraph" id="par_id461631974954834" xml-lang="en-US">Open the context menu of the selected cells - choose <emph>Merge and Center Cells</emph></paragraph>
+<paragraph role="paragraph" id="par_id3154020" xml-lang="en-US">Choose <emph>Format - Merge Cells - Merge and Center Cells</emph></paragraph>
 </section>
 <section id="mergenotes">
 <paragraph role="paragraph" id="par_id3148552" xml-lang="en-US">The merged cell receives the name of the first cell of the original cell range. Merged cells cannot be merged a second time with other cells. The range must form a rectangle, multiple selection is not supported.</paragraph>
diff --git a/source/text/scalc/01/05100100.xhp b/source/text/scalc/01/05100100.xhp
index 72757dd586..d0ae8a3114 100644
--- a/source/text/scalc/01/05100100.xhp
+++ b/source/text/scalc/01/05100100.xhp
@@ -21,8 +21,7 @@
 <paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="1">Merge Cells</paragraph>
 <paragraph role="paragraph" id="par_id3147406" xml-lang="en-US"><ahelp hid=".">Combines the contents of the selected cells into a single cell.</ahelp></paragraph>
 <section id="howtoget">
-<comment>Changed by tdf#33749</comment>
-<paragraph role="paragraph" id="par_id3154351" xml-lang="en-US">Choose <emph>Format - Merge and Center Cells</emph></paragraph>
+<paragraph role="paragraph" id="par_id3154351" xml-lang="en-US">Choose <emph>Format - Merge Cells - Merge Cells</emph></paragraph>
 </section>
 <embed href="text/scalc/01/05060000.xhp#mergenotes"/>
 </body>
diff --git a/source/text/scalc/01/05100200.xhp b/source/text/scalc/01/05100200.xhp
index 0d253f391b..0987e1e26f 100644
--- a/source/text/scalc/01/05100200.xhp
+++ b/source/text/scalc/01/05100200.xhp
@@ -21,8 +21,7 @@
 <paragraph role="heading" id="hd_id3154654" xml-lang="en-US" level="1">Split Cells</paragraph>
 <paragraph role="paragraph" id="par_id3083451" xml-lang="en-US"><ahelp hid=".">Splits previously merged cells.</ahelp></paragraph>
 <section id="howtoget">
-<comment>Changed by tdf#33749</comment>
-<paragraph role="paragraph" id="par_id3154023" xml-lang="en-US">Choose <emph>Format - Merge and Center Cells</emph></paragraph>
+<paragraph role="paragraph" id="par_id3154023" xml-lang="en-US">Choose <emph>Format - Merge Cells - Split Cells</emph></paragraph>
 </section>
 </body>
 </helpdocument>
diff --git a/source/text/scalc/guide/table_cellmerge.xhp b/source/text/scalc/guide/table_cellmerge.xhp
index 881dd8b3d6..3abdea93a3 100644
--- a/source/text/scalc/guide/table_cellmerge.xhp
+++ b/source/text/scalc/guide/table_cellmerge.xhp
@@ -22,12 +22,12 @@
 	
 <meta>
       <topic id="textscalcguidetable_cellmergexml" indexer="include" status="PUBLISH">
-         <title xml-lang="en-US" id="tit">Merging and Unmerging Cells</title>
+         <title xml-lang="en-US" id="tit">Merging and Splitting Cells</title>
          <filename>/text/scalc/guide/table_cellmerge.xhp</filename>
       </topic>
    </meta>
    <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id501632012952361"><bookmark_value>cells; merging/unmerging</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3147240"><bookmark_value>cells; merging/unmerging</bookmark_value>
       <bookmark_value>tables; merging cells</bookmark_value>
       <bookmark_value>cell merges</bookmark_value>
       <bookmark_value>unmerging cells</bookmark_value>
@@ -44,19 +44,16 @@
             <paragraph xml-lang="en-US" id="par_id1272927" role="listitem">Select the adjacent cells.</paragraph>
          </listitem>
          <listitem>
-            <comment>Changed by tdf#33749</comment>
-            <paragraph xml-lang="en-US" id="par_id6424146" role="listitem">Choose <emph>Format - Merge and Center Cells</emph>.</paragraph>
-            <paragraph xml-lang="en-US" id="par_id961632012538771" role="listitem">The cells will be merged and the content will be centered in the merged cell.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id6424146" role="listitem">Choose <emph>Format - Merge Cells - Merge Cells</emph>. If you choose <emph>Format - Merge Cells - Merge and Center Cells</emph>, the cell content will be centered in the merged cell.</paragraph>
          </listitem>
       </list>
-      <paragraph xml-lang="en-US" id="hd_id451368" role="heading" level="2">Unmerging Cells</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id451368" role="heading" level="2">Splitting Cells</paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id7116611" role="listitem">Select the individual cell to be unmerged, or a range of cells that include merged cells.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id7116611" role="listitem">Place the cursor in the cell to be split.</paragraph>
          </listitem>
          <listitem>
-            <comment>Changed by tdf#33749</comment>
-            <paragraph xml-lang="en-US" id="par_id9493087" role="listitem">Choose (toggle) <emph>Format - Merge and Center Cells</emph> to unmerge the cells.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id9493087" role="listitem">Choose <emph>Format - Merge Cells - Split Cells</emph>.</paragraph>
          </listitem>
       </list>
       <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/source/text/scalc/main0202.xhp b/source/text/scalc/main0202.xhp
index cdf3f5bf83..735f3a91f7 100644
--- a/source/text/scalc/main0202.xhp
+++ b/source/text/scalc/main0202.xhp
@@ -86,19 +86,6 @@
 <h2 id="hd_id3151240"><link href="text/shared/01/05340300.xhp" name="Align Bottom">Align Bottom</link></h2>
 <embed href="text/shared/01/05340300.xhp#untentext"/>
 <embed href="text/shared/00/00000004.xhp#syalign_bottom"/>
-<h2 id="hd_id761631962420080"><link href="text/scalc/01/05060000.xhp" name="Merge and Center Cells">Merge and Center Cells</link></h2>
-<embed href="text/scalc/01/05060000.xhp#merge_and_center_cells"/>
-<table id="tab_id351631967645011">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id101631967645011">
-<image src="cmd/sc_togglemergecells.svg" id="img_id521631967645011" width="1cm" height="1cm"><alt id="alt_id341631967645011" xml-lang="en-US">merge and center cells icon</alt></image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id281632091318639">Merge and Center Cells</paragraph>
-</tablecell>
-</tablerow>
-</table>
 <bookmark xml-lang="en-US" branch="hid/.uno:NumberFormatDate" id="bm_id8329721" localize="false"/>
 <h2 id="par_idN10843">Number Format : Date</h2>
 <paragraph role="paragraph" id="par_idN10847" xml-lang="en-US"><ahelp hid=".">Applies the date format to the selected cells.</ahelp></paragraph>
diff --git a/source/text/swriter/guide/table_cellmerge.xhp b/source/text/swriter/guide/table_cellmerge.xhp
index a70928fb81..5afd032cd1 100644
--- a/source/text/swriter/guide/table_cellmerge.xhp
+++ b/source/text/swriter/guide/table_cellmerge.xhp
@@ -35,7 +35,7 @@
 </bookmark><comment>mw made "cell merges;" a one level entry</comment>
 <paragraph xml-lang="en-US" id="hd_id6618243" role="heading" level="1"><variable id="table_cellmerge"><link href="text/swriter/guide/table_cellmerge.xhp" name="Merging and Splitting Cells">Merging and Splitting Cells</link>
 </variable><comment>mw created this file out of the shared guide "table_cellmerge.xhp", see also bug #63021</comment></paragraph>
-      <paragraph xml-lang="en-US" id="par_id1211890" role="paragraph">You can select adjacent cells, then merge them into a single larger cell. Conversely, you can take a large cell and divide it into smaller cells.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1211890" role="paragraph">You can select adjacent cells, then merge them into a single cell. Conversely, you can take a large cell and divide it into individual cells.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id3463850" role="heading" level="2">To Merge Cells</paragraph>
       <list type="ordered">
          <listitem>