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

Tue Mar 25 09:19:06 PDT 2014

helpers/help_hid.lst                   |    7 -------
 source/text/swriter/01/mailmerge07.xhp |   13 +++++++------
 2 files changed, 7 insertions(+), 13 deletions(-)

New commits:
commit 2b799e21a07d93f7b997bb1f3fa85e8cffb19356
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Tue Mar 25 16:11:34 2014 +0000

    update help ids for mail merge wizard page .ui conversion
    
    Change-Id: Icb1525679914ef214ed5eccf451accc6e2885e76

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 6542891..ed967fb 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2305,7 +2305,6 @@ HID_MM_HEADER_8,55043,
 HID_MM_HEADER_9,55044,
 HID_MM_MAILBODY,54982,
 HID_MM_MAILSTATUS_TLB,54988,
-HID_MM_MERGEPAGE,54960,
 HID_MM_NEXT_PAGE,55016,
 HID_MM_OUTPUTPAGE,54961,
 HID_MM_PREV_PAGE,55017,
@@ -6332,9 +6331,6 @@ sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_SW,1446609940,
 sw_CheckBox_DLG_MAILMERGE_CB_SINGLE_JOBS,1446609938,
 sw_CheckBox_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE,1446609961,
 sw_CheckBox_DLG_MM_MAILBODY_CB_GREETINGLINE,1435403279,
-sw_CheckBox_DLG_MM_MERGE_PAGE_CB_BACKWARDS,898286601,
-sw_CheckBox_DLG_MM_MERGE_PAGE_CB_MATCHCASE,898286602,
-sw_CheckBox_DLG_MM_MERGE_PAGE_CB_WHOLEWORDS,898286600,
 sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186,
 sw_CheckBox_TP_FORMAT_TABLE_CB_REL_WIDTH,878216196,
 sw_CheckBox_TP_LAB_LAB_BOX_ADDR,909689858,
@@ -6366,7 +6362,6 @@ sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698,
 sw_Edit_DLG_MAILMERGE_ED_ATTACH,1446610977,
 sw_Edit_DLG_MAILMERGE_ED_PATH,1446610969,
 sw_Edit_DLG_MAILMERGE_ED_SUBJECT,1446610960,
-sw_Edit_DLG_MM_MERGE_PAGE_ED_FIND,898287622,
 sw_Edit_DLG_MM_OUTPUT_PAGE_ED_ATTACHMENT,898304052,
 sw_Edit_DLG_MM_OUTPUT_PAGE_ED_SUBJECT,898304035,
 sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319,
@@ -6466,8 +6461,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_MERGE_PAGE_PB_EDIT,898290179,
-sw_PushButton_DLG_MM_MERGE_PAGE_PB_FIND,898290183,
 sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_COPYTO,898306593,
 sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_PRINTERSETTINGS,898306583,
 sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_PRINTNOW,898306586,
diff --git a/source/text/swriter/01/mailmerge07.xhp b/source/text/swriter/01/mailmerge07.xhp
index 3294ac4..55d594f 100644
--- a/source/text/swriter/01/mailmerge07.xhp
+++ b/source/text/swriter/01/mailmerge07.xhp
@@ -32,26 +32,27 @@
 </meta>
 <body>
 <section id="personalize">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmergepage/MMMergePage" id="bm_id664083" localize="false"/>
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge07.xhp">Mail Merge Wizard - Personalize Document</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Edit documents for each recipient.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">The Mail Merge Wizard creates a single merged document with page breaks between each recipient. When you reach this page of the wizard, the names and the addresses of the recipients are contained in the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_MERGE_PAGE:PB_EDIT" id="bm_id664082" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmergepage/edit" id="bm_id664082" localize="false"/>
 <paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Edit individual document</paragraph>
 <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Minimizes the wizard so that you can edit the mail merge document for a single recipient.</ahelp> After you made your changes, click the <emph>Return to Mail Merge Wizard</emph> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_MERGE_PAGE:ED_FIND" id="bm_id2794885" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmergepage/entry" id="bm_id2794885" localize="false"/>
 <paragraph role="heading" id="par_idN105FA" xml-lang="en-US" level="2" l10n="NEW">Search for</paragraph>
 <paragraph role="paragraph" id="par_idN105FE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the text that you want to search for in the merged document, for example, the name of a recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_MERGE_PAGE:PB_FIND" id="bm_id2486342" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmergepage/find" id="bm_id2486342" localize="false"/>
 <paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Find</paragraph>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to start the search.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_MERGE_PAGE:CB_WHOLEWORDS" id="bm_id823999" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmergepage/wholewords" id="bm_id823999" localize="false"/>
 <paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="3" l10n="NEW">Whole words only</paragraph>
 <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Searches for whole words only and not parts of larger words.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_MERGE_PAGE:CB_BACKWARDS" id="bm_id6592913" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmergepage/backwards" id="bm_id6592913" localize="false"/>
 <paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="3" l10n="NEW">Backwards</paragraph>
 <paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Searches from the current cursor position to the top of the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_MERGE_PAGE:CB_MATCHCASE" id="bm_id4656208" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmergepage/matchcase" id="bm_id4656208" localize="false"/>
 <paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="3" l10n="NEW">Match case</paragraph>
 <paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Distinguishes between uppercase and lowercase characters in the search.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10580" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge08.xhp" name="Mail Merge Wizard - Save print send">Mail Merge Wizard - Save, print or send</link></paragraph>
