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

Fri Sep 27 02:15:48 PDT 2013

helpers/help_hid.lst                   |    9 ---------
 source/text/swriter/01/mailmerge01.xhp |   17 +++++++++--------
 2 files changed, 9 insertions(+), 17 deletions(-)

New commits:
commit 1d8e9be32370edf1d58c176c059e5cbe7d799958
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Thu Sep 26 21:44:54 2013 +0200

    update mail merge select wizard page help ids after .ui conversion
    
    Change-Id: Ic10e2c3a355ee48e9bee6c0648e581d50cecb657

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 6a4c54f..cf60941 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2387,7 +2387,6 @@ HID_MM_BODY_PB_MALE,55030,
 HID_MM_CREATEADDRESSLIST,54966,
 HID_MM_CUSTOMFIELDS,54986,
 HID_MM_DBTABLEPREVIEWDIALOG,54965,
-HID_MM_DOCSELECTPAGE,54955,
 HID_MM_GREETINGSPAGE,54958,
 HID_MM_GREETINGS_CB_FEMALEFIELD,55024,
 HID_MM_GREETINGS_CB_NEUTRAL,55025,
@@ -7286,7 +7285,6 @@ sw_ListBox_DLG_MAILMERGE_LB_ADDRESSFLD,1446612494,
 sw_ListBox_DLG_MAILMERGE_LB_COLUMN,1446612510,
 sw_ListBox_DLG_MAILMERGE_LB_FILTER,1446612524,
 sw_ListBox_DLG_MM_ASSIGNFIELDS_CT_FIELDS_LB_FIELDS,1074908678,
-sw_ListBox_DLG_MM_DOCSELECT_PAGE_LB_RECENTDOC,898207241,
 sw_ListBox_DLG_MM_LAYOUT_PAGE_LB_ZOOM,898502159,
 sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_MAILTO,898305568,
 sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_PRINT,898305558,
@@ -7384,8 +7382,6 @@ sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEW,1435243011,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEXT,1435243019,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_PREV,1435243017,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_START,1435243016,
-sw_PushButton_DLG_MM_DOCSELECT_PAGE_PB_BROWSETEMPLATE,898208263,
-sw_PushButton_DLG_MM_DOCSELECT_PAGE_PB_LOADDOC,898208261,
 sw_PushButton_DLG_MM_GREETINGS_PAGE_PB_ASSIGN,898257426,
 sw_PushButton_DLG_MM_LAYOUT_PAGE_MF_UP,898503177,
 sw_PushButton_DLG_MM_LAYOUT_PAGE_PB_DOWN,898503179,
@@ -7416,11 +7412,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_DOCSELECT_PAGE_RB_CURRENTDOC,898204162,
-sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_LOADDOC,898204164,
-sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_LOADTEMPLATE,898204166,
-sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_NEWDOC,898204163,
-sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_RECENTDOC,898204168,
 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,
diff --git a/source/text/swriter/01/mailmerge01.xhp b/source/text/swriter/01/mailmerge01.xhp
index ed0c81c..1ecdff4 100644
--- a/source/text/swriter/01/mailmerge01.xhp
+++ b/source/text/swriter/01/mailmerge01.xhp
@@ -32,31 +32,32 @@
 </meta>
 <body>
 <section id="startingdocument">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/MMSelectPage" id="bm_id9740592.00000000" localize="false"/>
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge01.xhp">Mail Merge Wizard - Starting Document</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the document that you want to use as a base for the mail merge document.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_CURRENTDOC" id="bm_id9740592.00000001" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/currentdoc" id="bm_id9740592.00000001" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Use the current document</paragraph>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Uses the current Writer document as the base for the mail merge document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_NEWDOC" id="bm_id501724" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/newdoc" id="bm_id501724" localize="false"/>
 <paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">Create a new document</paragraph>
 <paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates a new Writer document to use for the mail merge.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_LOADDOC" id="bm_id216986" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/loaddoc" id="bm_id216986" localize="false"/>
 <paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Start from existing document</paragraph>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select an existing Writer document to use as the base for the mail merge document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_DOCSELECT_PAGE:PB_LOADDOC" id="bm_id7658314" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/browsedoc" id="bm_id7658314" localize="false"/>
 <paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Locate the Writer document that you want to use, and then click <emph>Open</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_LOADTEMPLATE" id="bm_id1717886" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/template" id="bm_id1717886" localize="false"/>
 <paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Start from a template</paragraph>
 <paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the template that you want to create your mail merge document with.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_DOCSELECT_PAGE:PB_BROWSETEMPLATE" id="bm_id3173619" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/browsetemplate" id="bm_id3173619" localize="false"/>
 <paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
 <paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <emph>Templates and Documents</emph> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_RECENTDOC" id="bm_id6065248" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/recentdoc" id="bm_id6065248" localize="false"/>
 <paragraph role="heading" id="par_idN10584" xml-lang="en-US" level="2" l10n="NEW">Start from a recently saved starting document</paragraph>
 <paragraph role="paragraph" id="par_idN10588" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use an existing mail merge document as the base for a new mail merge document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MM_DOCSELECT_PAGE:LB_RECENTDOC" id="bm_id920133" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/recentdoclb" id="bm_id920133" localize="false"/>
 <paragraph role="paragraph" id="par_idN106F6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the document.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge02.xhp" name="Mail Merge Wizard - Document type">Mail Merge Wizard - Document type</link></paragraph>
 </body>
