diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2021-12-06 10:16:32 -0300 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2021-12-07 17:22:30 +0100 |
| commit | 71216768639b863e8e26598e76f12f630cb9232d (patch) | |
| tree | ef127d72ca827a6b1a4abac6d7a96dc420bae297 | |
| parent | 5268bd87fb34a652005f2e7844c3ad4997cb4ca7 (diff) | |
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.hallot@libreoffice.org>
(cherry picked from commit b7bdb8a47c81ed94509777b12d2706a36ad18add)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/126427
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | source/text/shared/01/05100100.xhp | 2 | ||||
| -rw-r--r-- | source/text/swriter/01/05100000.xhp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/text/shared/01/05100100.xhp b/source/text/shared/01/05100100.xhp index 3c4ffb4576..5598fc26ec 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 20687959a3..ad626e02fd 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"/> |