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

Tue Mar 18 07:09:32 PDT 2014

helpers/help_hid.lst                   |    8 --------
 source/text/swriter/01/mailmerge03.xhp |   15 ++++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)

New commits:
commit f1ae027567ebac03056d15dd5ffb3975165895bd
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Tue Mar 18 14:08:46 2014 +0000

    update help ids for addressblock wizard page .ui conversion
    
    Change-Id: I670c1aa5debf5810b47be9a767232828ffa85933

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 00dabe5..77206d6 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2278,7 +2278,6 @@ HID_MEMO_PAGE3,53291,
 HID_MEMO_PAGE4,53292,
 HID_MEMO_PAGE5,53293,
 HID_MERGE_PRINTMONITOR,52773,
-HID_MM_ADDRESSBLOCKPAGE,54957,
 HID_MM_ASSIGNFIELDS,54972,
 HID_MM_ASSIGN_FIELDS,55034,
 HID_MM_BODY_CB_FEMALEFIELD,55032,
@@ -6368,8 +6367,6 @@ sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_RTF,1446609942,
 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_ADDRESSBLOCK_PAGE_CB_ADDRESS,898237446,
-sw_CheckBox_DLG_MM_ADDRESSBLOCK_PAGE_CB_HIDE_EMPTY_PARA,898237515,
 sw_CheckBox_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE,898253839,
 sw_CheckBox_DLG_MM_LAYOUT_PAGE_CB_ALIGN,898499596,
 sw_CheckBox_DLG_MM_MAILBODY_CB_GREETINGLINE,1435403279,
@@ -6415,8 +6412,6 @@ sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319,
 sw_Edit_TP_LINENUMBERING_ED_DIVISOR,878888975,
 sw_FI_PREVIEW_DLG_MM_GREETINGS_PAGE,898252800,
 sw_FT_BODY_DLG_MM_MAILBODY,1435402240,
-sw_ImageButton_DLG_MM_ADDRESSBLOCK_PAGE_IB_NEXTSET,898248204,
-sw_ImageButton_DLG_MM_ADDRESSBLOCK_PAGE_IB_PREVSET,898248203,
 sw_ImageButton_DLG_MM_GREETINGS_PAGE_IB_NEXTSET,898264597,
 sw_ImageButton_DLG_MM_GREETINGS_PAGE_IB_PREVSET,898264596,
 sw_ImageButton_TP_LAB_LAB_BTN_INSERT,909700627,
@@ -6509,9 +6504,6 @@ sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_DETAILS,1972294210,
 sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_STOP,1972294213,
 sw_PushButton_DLG_MAILMERGE_PB_ATTACH,1446613538,
 sw_PushButton_DLG_MAILMERGE_PB_PATH,1446613530,
-sw_PushButton_DLG_MM_ADDRESSBLOCK_PAGE_PB_ADDRESSLIST,898241026,
-sw_PushButton_DLG_MM_ADDRESSBLOCK_PAGE_PB_ASSIGN,898241033,
-sw_PushButton_DLG_MM_ADDRESSBLOCK_PAGE_PB_SETTINGS,898241029,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_CUSTOMIZE,1435243014,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_DELETE,1435243012,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_END,1435243020,
diff --git a/source/text/swriter/01/mailmerge03.xhp b/source/text/swriter/01/mailmerge03.xhp
index efebfc1..0bb5ea2 100644
--- a/source/text/swriter/01/mailmerge03.xhp
+++ b/source/text/swriter/01/mailmerge03.xhp
@@ -32,30 +32,31 @@
 </meta>
 <body>
 <section id="addresses">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/MMAddressBlockPage" id="bm_id8489027" localize="false"/>
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge03.xhp">Mail Merge Wizard - Addresses</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the recipients for the mail merge document as well as the layout of the address block.</paragraph>
 </section>
 <paragraph role="note" id="par_idN10561" xml-lang="en-US" l10n="NEW">The Mail Merge wizard opens to this page if you start the wizard in a text document that already contains address database fields. If the wizard opens directly to this page, the <emph>Select address list</emph> button is called <emph>Select different address list</emph>.</paragraph>
 <paragraph role="note" id="par_idN10556" xml-lang="en-US" l10n="NEW">The title of this page is <emph>Address block</emph> for letters and <emph>Address list</emph> for e-mail messages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ADDRESSLIST" id="bm_id8489028" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/addresslist" id="bm_id8489028" localize="false"/>
 <paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2" l10n="NEW">Select address list</paragraph>
 <paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_seladdlis.xhp">Select Address List</link> dialog, where you can choose a data source for the addresses, add new addresses, or type in a new address list.</ahelp></paragraph>
 <paragraph role="warning" id="par_id7805413" xml-lang="en-US" l10n="NEW">When you edit some records in a Calc spreadsheet data source that is currently in use for a mail merge, those changes are not visible in the mail merge.<comment>ufi: see i9899</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_ADDRESSBLOCK_PAGE:CB_ADDRESS" id="bm_id934476" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/address" id="bm_id934476" localize="false"/>
 <paragraph role="heading" id="par_idN1057D" xml-lang="en-US" level="2" l10n="NEW">This document shall contain an address block</paragraph>
 <paragraph role="paragraph" id="par_idN10581" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds an address block to the mail merge document.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10584" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the address block layout that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_MM_ADDRESSBLOCK_PAGE_CB_HIDE_EMPTY_PARA" id="bm_id59205" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/hideempty" id="bm_id59205" localize="false"/>
 <paragraph role="heading" id="hd_id9355754" xml-lang="en-US" level="3" l10n="NEW">Suppress lines with just empty fields</paragraph>
 <paragraph role="paragraph" id="par_id3109225" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable to leave empty lines out of the address.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_SETTINGS" id="bm_id8949247" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/settings" id="bm_id8949247" localize="false"/>
 <paragraph role="heading" id="par_idN10587" xml-lang="en-US" level="3" l10n="NEW">More</paragraph>
 <paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_seladdblo.xhp">Select Address Block</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ASSIGN" id="bm_id8653523" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/assign" id="bm_id8653523" localize="false"/>
 <paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="3" l10n="NEW">Match fields</paragraph>
 <paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_matfie.xhp">Match Fields</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_ADDRESSBLOCK_PAGE:IB_PREVSET" id="bm_id2950224" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_ADDRESSBLOCK_PAGE:IB_NEXTSET" id="bm_id8050477" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/prev" id="bm_id2950224" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/next" id="bm_id8050477" localize="false"/>
 <paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="3" l10n="NEW">(Browse buttons)</paragraph>
 <paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Use the browse buttons to preview the information from the previous or next data record.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN105B8" xml-lang="en-US" l10n="CHG"><link href="text/swriter/01/mailmerge04.xhp" name="Mail Merge Wizard - Create a salutation">Mail Merge Wizard - Create a salutation</link></paragraph>
