diff options
| -rw-r--r-- | helpers/help_hid.lst | 14 | ||||
| -rw-r--r-- | source/text/swriter/01/mailmerge04.xhp | 8 |
2 files changed, 4 insertions, 18 deletions
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 77206d6029..8fe7150f80 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2291,15 +2291,6 @@ HID_MM_BODY_PB_MALE,55030, HID_MM_CREATEADDRESSLIST,54966, HID_MM_CUSTOMFIELDS,54986, HID_MM_DBTABLEPREVIEWDIALOG,54965, -HID_MM_GREETINGSPAGE,54958, -HID_MM_GREETINGS_CB_FEMALEFIELD,55024, -HID_MM_GREETINGS_CB_NEUTRAL,55025, -HID_MM_GREETINGS_CB_PERSONALIZED,55018, -HID_MM_GREETINGS_LB_FEMALE,55019, -HID_MM_GREETINGS_LB_FEMALECOLUMN,55023, -HID_MM_GREETINGS_LB_MALE,55021, -HID_MM_GREETINGS_PB_FEMALE,55020, -HID_MM_GREETINGS_PB_MALE,55022, HID_MM_HEADER_0,55035, HID_MM_HEADER_1,55036, HID_MM_HEADER_10,55045, @@ -6367,7 +6358,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_GREETINGS_PAGE_CB_GREETINGLINE,898253839, sw_CheckBox_DLG_MM_LAYOUT_PAGE_CB_ALIGN,898499596, sw_CheckBox_DLG_MM_MAILBODY_CB_GREETINGLINE,1435403279, sw_CheckBox_DLG_MM_MERGE_PAGE_CB_BACKWARDS,898286601, @@ -6410,10 +6400,7 @@ 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, 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_GREETINGS_PAGE_IB_NEXTSET,898264597, -sw_ImageButton_DLG_MM_GREETINGS_PAGE_IB_PREVSET,898264596, sw_ImageButton_TP_LAB_LAB_BTN_INSERT,909700627, sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_DOWN,888499833, sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_UP,888499832, @@ -6512,7 +6499,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_GREETINGS_PAGE_PB_ASSIGN,898257426, sw_PushButton_DLG_MM_LAYOUT_PAGE_MF_UP,898503177, sw_PushButton_DLG_MM_LAYOUT_PAGE_PB_DOWN,898503179, sw_PushButton_DLG_MM_MERGE_PAGE_PB_EDIT,898290179, diff --git a/source/text/swriter/01/mailmerge04.xhp b/source/text/swriter/01/mailmerge04.xhp index f71167dc46..bc408fa204 100644 --- a/source/text/swriter/01/mailmerge04.xhp +++ b/source/text/swriter/01/mailmerge04.xhp @@ -35,7 +35,7 @@ <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge04.xhp">Mail Merge Wizard - Create a Salutation</link></paragraph> <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the properties for the salutation. If the mail merge database contains gender information, you can specify different salutations based on the gender of the recipient.</paragraph> </section> -<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_MM_GREETINGS_PAGE_CB_GREETINGLINE" id="bm_id274666" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmsalutationpage/greeting" id="bm_id274666" localize="false"/> <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">This document should contain a salutation</paragraph> <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a salutation.</ahelp></paragraph> <!-- removed HID 898253826 --> @@ -64,11 +64,11 @@ <paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the default salutation that is used when you do not specify a personalized salutation.</ahelp></paragraph> <paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="3" l10n="NEW">Preview</paragraph> <paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays a preview of the salutation.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/SW_PUSHBUTTON_DLG_MM_GREETINGS_PAGE_PB_ASSIGN" id="bm_id9288918" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmsalutationpage/assign" id="bm_id9288918" localize="false"/> <paragraph role="heading" id="par_idN105B8" xml-lang="en-US" level="4" l10n="NEW">Match fields</paragraph> <paragraph role="paragraph" id="par_idN105BC" 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_GREETINGS_PAGE_IB_PREVSET" id="bm_id3859675" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/SW_IMAGEBUTTON_DLG_MM_GREETINGS_PAGE_IB_NEXTSET" id="bm_id991546" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmsalutationpage/prev" id="bm_id3859675" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmsalutationpage/next" id="bm_id991546" localize="false"/> <paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="4" l10n="NEW">(Browse buttons)</paragraph> <paragraph role="paragraph" id="par_idN105D1" 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_idN105D4" xml-lang="en-US" l10n="CHG"><link href="text/swriter/01/mailmerge05.xhp" name="Mail Merge Wizard - Adjust layout">Mail Merge Wizard - Adjust layout</link></paragraph> |