From b28f1c1eafe23a8106592aeef0dfe0e235eb0b9a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 14 Sep 2013 15:14:32 +0100 Subject: update help ids for select address block dialog .ui conversion Change-Id: Ic30b35c4a87617cb031d65a59dd3e7bce4e7ec3d --- helpers/help_hid.lst | 8 -------- source/text/swriter/01/mm_seladdblo.xhp | 15 ++++++++------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index b5bec9f229..47fd3f302b 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 6365a58f26..95abaae9c6 100644 --- a/source/text/swriter/01/mm_seladdblo.xhp +++ b/source/text/swriter/01/mm_seladdblo.xhp @@ -31,28 +31,29 @@ + Select Address Block Select, edit, or delete an address block layout for mail merge. Select the address block which you want to use Select the block in the list that you want to use for mail merge addresses, and click OK. - + Never include country/region Excludes country or regional information from the address block. - + Always include country/region Includes country or regional information in the address block. - + Only include country/region if it is not: Only includes country or regional information in the address block if the value differs from the value that you enter in the text box. - + Enter the country/region string that shall not be printed. - + New Opens the New Address Block dialog where you can define a new address block layout. - + Edit Opens the New Address Block dialog where you can edit the selected address block layout. - + Delete Deletes the selected address block layout. -- cgit