[Libreoffice-commits] help.git: source/text

[Gabor Kelemen]

 source/text/scalc/01/05060000.xhp |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 70fcc28a6443d2d52834ac1b82fb9ab24e4e6bb5
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date:   Fri Feb 16 00:44:57 2018 +0100

    Add missing ahelps to Merge Cells page and remove one unnecessary
    
    Change-Id: I01625dcff477ab58a0a259363e70fe11fdf9774b
    Reviewed-on: https://gerrit.libreoffice.org/50323
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
    Tested-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/source/text/scalc/01/05060000.xhp b/source/text/scalc/01/05060000.xhp
index a3dc7f611..c81cc6489 100644
--- a/source/text/scalc/01/05060000.xhp
+++ b/source/text/scalc/01/05060000.xhp
@@ -42,16 +42,19 @@
 <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>
 <paragraph role="note" id="par_id3149665" xml-lang="en-US">If the cells to be merged have any contents, a security dialog is shown.</paragraph>
-<paragraph role="paragraph" id="par_id1001240" xml-lang="en-US"><ahelp hid="modules/scalc/ui/mergecellsdialog/MergeCellsDialog">Three options are available:</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id1001240" xml-lang="en-US">Three options are available:</paragraph>
 <list type="unordered">
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/move-cells-radio" id="bm_id274567" localize="false"/>
   <listitem>
-    <paragraph id="par_id3155879" role="listitem" xml-lang="en-US"><emph>Move the contents of the hidden cells into the first cell</emph>: the actual contents of the hidden cells are concatenated to the first cell, and hidden cells are emptied; the results of formulas referring to the hidden cells or the first cell will be updated.</paragraph>
+    <paragraph id="par_id3155879" role="listitem" xml-lang="en-US"><emph>Move the contents of the hidden cells into the first cell</emph>: <ahelp hid=".">The actual contents of the hidden cells are concatenated to the first cell, and hidden cells are emptied; the results of formulas referring to the hidden cells or the first cell will be updated.</ahelp></paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3155878" role="listitem" xml-lang="en-US"><emph>Keep the contents of the hidden cells</emph>: the contents of the hidden cells are kept; the results of formulas referring to the hidden cells will not change.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/keep-content-radio" id="bm_id274567" localize="false"/>
+    <paragraph id="par_id3155878" role="listitem" xml-lang="en-US"><emph>Keep the contents of the hidden cells</emph>: <ahelp hid=".">The contents of the hidden cells are kept; the results of formulas referring to the hidden cells will not change.</ahelp></paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3155877" role="listitem" xml-lang="en-US"><emph>Empty the contents of the hidden cells</emph>: the contents of the hidden cells are removed; the results of formulas referring to the hidden cells will be updated.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/empty-cells-radio" id="bm_id274567" localize="false"/>
+    <paragraph id="par_id3155877" role="listitem" xml-lang="en-US"><emph>Empty the contents of the hidden cells</emph>: <ahelp hid=".">The contents of the hidden cells are removed; the results of formulas referring to the hidden cells will be updated.</ahelp></paragraph>
   </listitem>
 </list>
 <paragraph role="warning" id="par_id3153718" xml-lang="en-US">Merging cells can lead to calculation errors in formulas in the table.</paragraph>