diff options
| -rw-r--r-- | helpers/help_hid.lst | 9 | ||||
| -rw-r--r-- | source/text/swriter/01/mm_cusgrelin.xhp | 19 |
2 files changed, 10 insertions, 18 deletions
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 280b81430b..b5bec9f229 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2387,7 +2387,6 @@ HID_MM_BODY_PB_MALE,55030, HID_MM_COPYTO,54975, HID_MM_CREATEADDRESSLIST,54966, HID_MM_CUSTOMFIELDS,54986, -HID_MM_CUSTOMIZEADDRESSBLOCK,54970, HID_MM_DBTABLEPREVIEWDIALOG,54965, HID_MM_DOCSELECTPAGE,54955, HID_MM_GREETINGSPAGE,54958, @@ -7267,7 +7266,6 @@ sw_CheckBox_TP_TABLE_TEXTFLOW_CB_KEEP,878511248, sw_CheckBox_TP_TABLE_TEXTFLOW_CB_PAGEBREAK,878511235, sw_CheckBox_TP_TABLE_TEXTFLOW_CB_PAGECOLL,878511240, sw_CheckBox_TP_TABLE_TEXTFLOW_CB_SPLIT,878511249, -sw_ComboBox_DLG_MM_CUSTOMIZEADDRESSBLOCK_CB_FIELD,1435308087, sw_ComboBox_TP_OPTCAPTION_PAGE_BOX_CATEGORY,878940174, sw_Edit_DLG_BIB_BASE_ED_NAME,1428719626, sw_Edit_DLG_GLOSSARY_ED_NAME,1428637700, @@ -7291,12 +7289,6 @@ 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_CUSTOMIZEADDRESSBLOCK_IB_DOWN,1435315765, -sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_INSERTFIELD,1435315754, -sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_LEFT,1435315763, -sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_REMOVEFIELD,1435315755, -sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_RIGHT,1435315764, -sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_UP,1435315762, 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, @@ -7367,7 +7359,6 @@ sw_ModalDialog_DLG_CHANGE_DB,1419591680, sw_ModalDialog_DLG_DBSELECTION,1435009024, sw_ModalDialog_DLG_MAILMERGEWIZARD,1435058176, sw_MultiLineEdit_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDWARNING_ED_DETAILS,1972357645, -sw_MultiLineEdit_DLG_MM_CUSTOMIZEADDRESSBLOCK_ED_DRAG,1435306545, sw_MultiLineEdit_DLG_MM_MAILBODY_MLE_BODY,1435404831, sw_MultiLineEdit_DLG_MM_TESTACCOUNTSETTINGS_ED_ERROR,1427130914, sw_MultiLineEdit_TP_LAB_LAB_EDT_WRITING,909691395, diff --git a/source/text/swriter/01/mm_cusgrelin.xhp b/source/text/swriter/01/mm_cusgrelin.xhp index 645e03c1b9..0f359efaaf 100644 --- a/source/text/swriter/01/mm_cusgrelin.xhp +++ b/source/text/swriter/01/mm_cusgrelin.xhp @@ -31,29 +31,30 @@ </history> </meta> <body> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/addressblockdialog/AddressBlockDialog" id="bm_id8578143" localize="false"/> <paragraph role="heading" id="par_idN1053C" xml-lang="en-US" level="1" l10n="NEW">Custom Salutation</paragraph> <paragraph role="paragraph" id="par_idN10540" xml-lang="en-US" l10n="NEW">Specify the salutation layout for <link href="text/swriter/01/mailmerge04.xhp">mail merge</link> or <link href="text/swriter/01/mm_emabod.xhp">e-mail merge</link> documents. The name of this dialog is different for female recipients and male recipients.</paragraph> -<bookmark xml-lang="en-US" branch="hid/SW_HID_MM_CUSTOMFIELDS" id="bm_id8578142" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/addressblockdialog/addresses" id="bm_id8578142" localize="false"/> <paragraph role="heading" id="par_idN10551" xml-lang="en-US" level="2" l10n="NEW">Salutation elements</paragraph> <paragraph role="paragraph" id="par_idN10555" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a field and drag the field to the other list.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_INSERTFIELD" id="bm_id5275734" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/addressblockdialog/toaddr" id="bm_id5275734" localize="false"/> <paragraph role="heading" id="par_idN10558" xml-lang="en-US" level="2" l10n="NEW">></paragraph> <paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds the selected field from the list of salutation elements to the other list. You can add a field more than once.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_REMOVEFIELD" id="bm_id6546525" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/addressblockdialog/fromaddr" id="bm_id6546525" localize="false"/> <paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW"><</paragraph> <paragraph role="paragraph" id="par_idN10563" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Removes the selected field from the other list.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/sw:MultiLineEdit:DLG_MM_CUSTOMIZEADDRESSBLOCK:ED_DRAG" id="bm_id1746574" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/addressblockdialog/addressdest" id="bm_id1746574" localize="false"/> <paragraph role="heading" id="par_idN10566" xml-lang="en-US" level="2" l10n="NEW">Drag salutation elements into the box below</paragraph> <paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Arrange the fields by drag-and-drop or use the arrow buttons.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:DLG_MM_CUSTOMIZEADDRESSBLOCK:CB_FIELD" id="bm_id8161564" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/addressblockdialog/custom" id="bm_id8161564" localize="false"/> <paragraph role="heading" id="par_idN1056D" xml-lang="en-US" level="2" l10n="NEW">Customize salutation</paragraph> <paragraph role="paragraph" id="par_idN10571" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a value from the list for the salutation and the punctuation mark fields.</ahelp></paragraph> <paragraph role="heading" id="par_idN10574" xml-lang="en-US" level="2" l10n="NEW">Preview</paragraph> <paragraph role="paragraph" id="par_idN10578" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays a preview of the first database record with the current salutation layout.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_UP" id="bm_id1669972" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_LEFT" id="bm_id1744743" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_RIGHT" id="bm_id1376384" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_DOWN" id="bm_id7465132" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/addressblockdialog/up" id="bm_id1669972" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/addressblockdialog/left" id="bm_id1744743" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/addressblockdialog/right" id="bm_id1376384" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/addressblockdialog/down" id="bm_id7465132" localize="false"/> <paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">(Arrow Buttons)</paragraph> <paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select an item in the list and click an arrow button to move the item.</ahelp></paragraph> </body> |