source/text/shared/01/05100100.xhp | 2 +-
source/text/swriter/01/05100000.xhp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b7bdb8a47c81ed94509777b12d2706a36ad18add
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Mon Dec 6 10:16:32 2021 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Mon Dec 6 14:19:46 2021 +0100
Fix a "D'oh you found a bug"...
Change-Id: I7261546457c0d128bef55cb8be7737cb6b70d22a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/126417
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/shared/01/05100100.xhp
b/source/text/shared/01/05100100.xhp
index 3c4ffb457..5598fc26e 100644
--- a/source/text/shared/01/05100100.xhp
+++ b/source/text/shared/01/05100100.xhp
@@ -35,6 +35,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:MergeCells" id="bm_id1766491"
localize="false"/>
<h1 id="hd_id451632377983974"><variable id="mergecells"><link
href="text/shared/01/05100100.xhp" name="Merging Cells without centering">Merge
Cells</link></variable></h1>
<paragraph role="paragraph" id="par_id3147406" xml-lang="en-US"><variable
id="verbindentext"><ahelp hid=".">Combines the contents of the selected cells
into a single cell, retaining the formatting of the first cell in the
selection.</ahelp></variable><comment>moved from swriter/01/05100100.xhp, see
i86644</comment></paragraph>
+</section>
<embed href="text/scalc/01/05060000.xhp#mergecells_warning"/>
<switch select="appl">
<case select="CALC">
@@ -60,7 +61,6 @@
</section>
</default>
</switch>
-</section>
<section id="relatedtopics">
<switch select="appl">
<case select="CALC">
diff --git a/source/text/swriter/01/05100000.xhp
b/source/text/swriter/01/05100000.xhp
index 20687959a..ad626e02f 100644
--- a/source/text/swriter/01/05100000.xhp
+++ b/source/text/swriter/01/05100000.xhp
@@ -18,7 +18,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textswriter0105100000xml" indexer="include" status="PUBLISH">
@@ -37,7 +37,7 @@
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#zelle"/>
</section>
-<embed href="text/shared/01/05100100.xhp#merge"/>
+<embed href="text/shared/01/05100100.xhp#merge_cells"/>
<embed href="text/shared/01/05100500.xhp#top"/>
<embed href="text/shared/01/05100600.xhp#center_vertical"/>
<embed href="text/shared/01/05100700.xhp#bottom"/>
