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

Sat Sep 14 08:10:52 PDT 2013

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

New commits:
commit b28f1c1eafe23a8106592aeef0dfe0e235eb0b9a
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Sat Sep 14 15:14:32 2013 +0100

    update help ids for select address block dialog .ui conversion
    
    Change-Id: Ic30b35c4a87617cb031d65a59dd3e7bce4e7ec3d

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index b5bec9f..47fd3f3 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2422,7 +2422,6 @@ HID_MM_OUTPUTTYPEPAGE,54956,
 HID_MM_PREPAREMERGEPAGE,54959,
 HID_MM_PREV_PAGE,55017,
 HID_MM_QUERY,54991,
-HID_MM_SELECTADDRESSBLOCK,54971,
 HID_MM_SELECTDBTABLEDDIALOG,54963,
 HID_MM_SELECTDBTABLEDDIALOG_LISTBOX,54964,
 HID_MM_SENDMAILS,54983,
@@ -7279,7 +7278,6 @@ 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_DLG_MM_QUERY_ED_TEXT,1435469884,
-sw_Edit_DLG_MM_SELECTADDRESSBLOCK_ED_COUNTRY,1435322396,
 sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319,
 sw_Edit_TP_LINENUMBERING_ED_DIVISOR,878888975,
 sw_Edit_TP_OPTCAPTION_PAGE_EDT_TEXT,878938130,
@@ -7419,9 +7417,6 @@ sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_FIRST,898273795,
 sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_LAST,898273799,
 sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_NEXT,898273798,
 sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_PREV,898273796,
-sw_PushButton_DLG_MM_SELECTADDRESSBLOCK_PB_CUSTOMIZE,1435324951,
-sw_PushButton_DLG_MM_SELECTADDRESSBLOCK_PB_DELETE,1435324950,
-sw_PushButton_DLG_MM_SELECTADDRESSBLOCK_PB_NEW,1435324949,
 sw_PushButton_DLG_MM_SELECTDBTABLEDDIALOG_PB_PREVIEW,1435210243,
 sw_PushButton_DLG_MM_TESTACCOUNTSETTINGS_PB_STOP,1427132964,
 sw_PushButton_DLG_PAGEPREVIEW_PRINTOPTIONS_PB_STANDARD,1411289624,
@@ -7452,9 +7447,6 @@ sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEMERGEDDOC,898302468,
 sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVESTARTDOC,898302467,
 sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SENDALL,898302503,
 sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SENDMAIL,898302470,
-sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_ALWAYS,1435320858,
-sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_DEPENDENT,1435320859,
-sw_RadioButton_DLG_MM_SELECTADDRESSBLOCK_RB_NEVER,1435320857,
 sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_LANDSCAPE,1411285528,
 sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_PORTRAIT,1411285529,
 sw_RadioButton_TP_FOOTNOTE_PAGE_RB_MAXHEIGHT,877953538,
diff --git a/source/text/swriter/01/mm_seladdblo.xhp b/source/text/swriter/01/mm_seladdblo.xhp
index 6365a58..95abaae 100644
--- a/source/text/swriter/01/mm_seladdblo.xhp
+++ b/source/text/swriter/01/mm_seladdblo.xhp
@@ -31,28 +31,29 @@
 </history>
 </meta>
 <body>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/SelectBlockDialog" id="bm_id6604815" localize="false"/>
 <paragraph role="heading" id="par_idN10539" xml-lang="en-US" level="1" l10n="NEW">Select Address Block</paragraph>
 <paragraph role="paragraph" id="par_idN1053D" xml-lang="en-US" l10n="NEW">Select, edit, or delete an address block layout for <link href="text/swriter/01/mailmerge03.xhp">mail merge</link>.</paragraph>
 <paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="2" l10n="NEW">Select the address block which you want to use</paragraph>
 <paragraph role="paragraph" id="par_idN10552" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the block in the list that you want to use for mail merge addresses, and click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_NEVER" id="bm_id6604815" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/never" id="bm_id6604815" localize="false"/>
 <paragraph role="heading" id="par_idN10555" xml-lang="en-US" level="2" l10n="NEW">Never include country/region</paragraph>
 <paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Excludes country or regional information from the address block.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_ALWAYS" id="bm_id2571184" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/always" id="bm_id2571184" localize="false"/>
 <paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Always include country/region</paragraph>
 <paragraph role="paragraph" id="par_idN10560" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes country or regional information in the address block.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_DEPENDENT" id="bm_id6947538" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/dependent" id="bm_id6947538" localize="false"/>
 <paragraph role="heading" id="par_idN10563" xml-lang="en-US" level="2" l10n="NEW">Only include country/region if it is not:</paragraph>
 <paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only includes country or regional information in the address block if the value differs from the value that you enter in the text box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_SELECTADDRESSBLOCK:ED_COUNTRY" id="bm_id7257606" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/country" id="bm_id7257606" localize="false"/>
 <paragraph role="paragraph" id="par_idN10651" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the country/region string that shall not be printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_NEW" id="bm_id1533249" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/new" id="bm_id1533249" localize="false"/>
 <paragraph role="heading" id="par_idN1056A" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
 <paragraph role="paragraph" id="par_idN1056E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_newaddblo.xhp">New Address Block</link> dialog where you can define a new address block layout.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_CUSTOMIZE" id="bm_id1784112" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/edit" id="bm_id1784112" localize="false"/>
 <paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="2" l10n="NEW">Edit</paragraph>
 <paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_newaddblo.xhp">New Address Block</link> dialog where you can edit the selected address block layout.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_DELETE" id="bm_id2646565" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/delete" id="bm_id2646565" localize="false"/>
 <paragraph role="heading" id="par_idN10594" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
 <paragraph role="paragraph" id="par_idN10598" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected address block layout.</ahelp></paragraph>
 </body>
