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

Wed Mar 8 16:56:44 UTC 2017

source/text/swriter/01/mailmerge04.xhp |    3 ++-
 source/text/swriter/01/mailmerge05.xhp |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit caa80eb9b85837042dde3493c381eeae0fc37e9d
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date:   Tue Mar 7 00:23:32 2017 +0100

    tdf#52986 Fix help IDs of Mail Merge Wizard pages
    
    There was no page level bookmark for 04 and 05.
    Add some IDs that can be referenced from the code.
    
    Change-Id: Ifbbd6b4796daf90f27e632d86cd85e6301b3de97
    Reviewed-on: https://gerrit.libreoffice.org/34936
    Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
    Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>

diff --git a/source/text/swriter/01/mailmerge04.xhp b/source/text/swriter/01/mailmerge04.xhp
index c574ed7..7f7e14c 100644
--- a/source/text/swriter/01/mailmerge04.xhp
+++ b/source/text/swriter/01/mailmerge04.xhp
@@ -31,8 +31,9 @@
 </meta>
 <body>
 <section id="greetingline">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmsalutationpage/MMSalutationPage" id="bm_id8489029" localize="false"/>
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge04.xhp">Mail Merge Wizard - Create a Salutation</link></paragraph>
-<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the properties for the salutation. If the mail merge database contains gender information, you can specify different salutations based on the gender of the recipient.</paragraph>
+<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specify the properties for the salutation. If the mail merge database contains gender information, you can specify different salutations based on the gender of the recipient.</ahelp></paragraph>
 </section>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmsalutationpage/greeting" id="bm_id274666" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">This document should contain a salutation</paragraph>
diff --git a/source/text/swriter/01/mailmerge05.xhp b/source/text/swriter/01/mailmerge05.xhp
index 8b07c94..441b7a4 100644
--- a/source/text/swriter/01/mailmerge05.xhp
+++ b/source/text/swriter/01/mailmerge05.xhp
@@ -31,8 +31,9 @@
 </meta>
 <body>
 <section id="layout">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/MMLayoutPage" id="bm_id8489030" localize="false"/>
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge05.xhp">Mail Merge Wizard - Adjust Layout</link></paragraph>
-<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the position of the address blocks and salutations on the documents.</paragraph>
+<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specify the position of the address blocks and salutations on the documents.</ahelp></paragraph>
 </section>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/align" id="bm_id7631458" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Align to text body</paragraph>
