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

Sat Sep 28 12:58:01 PDT 2013

helpers/help_hid.lst                   |    3 ---
 source/text/swriter/01/mailmerge02.xhp |    5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 02ab8e6ce6b82909679baed396021a184c99b16e
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Fri Sep 27 15:19:07 2013 +0200

    update help ids for mail merge output type page
    
    Change-Id: I173787930215db1b9ced6b6ffcfcdc3977fc6eda

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index cd0af01..25835e7 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2416,7 +2416,6 @@ HID_MM_MAILSTATUS_TLB,54988,
 HID_MM_MERGEPAGE,54960,
 HID_MM_NEXT_PAGE,55016,
 HID_MM_OUTPUTPAGE,54961,
-HID_MM_OUTPUTTYPEPAGE,54956,
 HID_MM_PREPAREMERGEPAGE,54959,
 HID_MM_PREV_PAGE,55017,
 HID_MM_SELECTDBTABLEDDIALOG,54963,
@@ -7402,8 +7401,6 @@ sw_RadioButton_DLG_MAILMERGE_RB_MARKED,1446609411,
 sw_RadioButton_DLG_MAILMERGE_RB_PRINTER,1446609419,
 sw_RadioButton_DLG_MAILMERGE_RB_SAVE_INDIVIDUAL,1446609448,
 sw_RadioButton_DLG_MAILMERGE_RB_SAVE_SINGLE_DOC,1446609447,
-sw_RadioButton_DLG_MM_OUTPUTTYPE_PAGE_RB_LETTER,898220546,
-sw_RadioButton_DLG_MM_OUTPUTTYPE_PAGE_RB_MAIL,898220547,
 sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_FROM,898302479,
 sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_PRINT,898302469,
 sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_PRINTALL,898302488,
diff --git a/source/text/swriter/01/mailmerge02.xhp b/source/text/swriter/01/mailmerge02.xhp
index b53363c..4dfe070 100644
--- a/source/text/swriter/01/mailmerge02.xhp
+++ b/source/text/swriter/01/mailmerge02.xhp
@@ -30,13 +30,14 @@
 </meta>
 <body>
 <section id="documenttype">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmoutputtypepage/MMOutputTypePage" id="bm_id2589191" localize="false"/>
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge02.xhp">Mail Merge Wizard - Document Type</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="CHG">Specify the type of mail merge document to create. </paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_LETTER" id="bm_id2589190" localize="false"/><paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Letter</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmoutputtypepage/letter" id="bm_id2589190" localize="false"/><paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Letter</paragraph>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates a printable mail merge document.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id6954863" xml-lang="en-US" level="2" l10n="NEW">E-mail message</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_MAIL" id="bm_id3822443" localize="false"/><paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Creates mail merge documents that you can send as an e-mail message or an e-mail attachment.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmoutputtypepage/email" id="bm_id3822443" localize="false"/><paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Creates mail merge documents that you can send as an e-mail message or an e-mail attachment.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge03.xhp" name="Mail Merge Wizard - Addresses">Mail Merge Wizard - Addresses</link></paragraph>
 </body>
 </helpdocument>
