helpers/help_hid.lst | 8 --------
source/text/swriter/01/mailmerge06.xhp | 15 ++++++++-------
2 files changed, 8 insertions(+), 15 deletions(-)
New commits:
commit 2dad7542c215024cd26ae42030e01ab772f2f9d5
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Mar 24 14:19:15 2014 +0000
update help ids for prepare mail merge wizard page .ui conversion
Change-Id: Ib775fa668793296796a568280289004a4ffd0988
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 4784745..6542891 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2308,7 +2308,6 @@ HID_MM_MAILSTATUS_TLB,54988,
HID_MM_MERGEPAGE,54960,
HID_MM_NEXT_PAGE,55016,
HID_MM_OUTPUTPAGE,54961,
-HID_MM_PREPAREMERGEPAGE,54959,
HID_MM_PREV_PAGE,55017,
HID_MM_SELECTDBTABLEDDIALOG,54963,
HID_MM_SELECTDBTABLEDDIALOG_LISTBOX,54964,
@@ -6336,7 +6335,6 @@ sw_CheckBox_DLG_MM_MAILBODY_CB_GREETINGLINE,1435403279,
sw_CheckBox_DLG_MM_MERGE_PAGE_CB_BACKWARDS,898286601,
sw_CheckBox_DLG_MM_MERGE_PAGE_CB_MATCHCASE,898286602,
sw_CheckBox_DLG_MM_MERGE_PAGE_CB_WHOLEWORDS,898286600,
-sw_CheckBox_DLG_MM_PREPAREMERGE_PAGE_CB_EXCLUDE,898270216,
sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186,
sw_CheckBox_TP_FORMAT_TABLE_CB_REL_WIDTH,878216196,
sw_CheckBox_TP_LAB_LAB_BOX_ADDR,909689858,
@@ -6439,7 +6437,6 @@ sw_NumericField_DLG_MAILMERGE_NF_TO,1446615047,
sw_NumericField_DLG_MM_CREATEADDRESSLIST_NF_SETNO,1435244554,
sw_NumericField_DLG_MM_OUTPUT_PAGE_NF_FROM,898308112,
sw_NumericField_DLG_MM_OUTPUT_PAGE_NF_TO,898308114,
-sw_NumericField_DLG_MM_PREPAREMERGE_PAGE_ED_RECORD,898275333,
sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_COLS,1411291141,
sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_ROWS,1411291139,
sw_NumericField_TP_LINENUMBERING_NF_DIV_INTERVAL,878893073,
@@ -6478,11 +6475,6 @@ sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SAVENOW,898306579,
sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SAVESTARTDOC,898306568,
sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SENDAS,898306598,
sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SENDDOCUMENTS,898306600,
-sw_PushButton_DLG_MM_PREPAREMERGE_PAGE_PB_EDIT,898273802,
-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_SELECTDBTABLEDDIALOG_PB_PREVIEW,1435210243,
sw_PushButton_DLG_PAGEPREVIEW_PRINTOPTIONS_PB_STANDARD,1411289624,
sw_PushButton_DLG_SYNC_BTN_BTN_SYNC,1983500820,
diff --git a/source/text/swriter/01/mailmerge06.xhp
b/source/text/swriter/01/mailmerge06.xhp
index 2d6ddd4..0f06afa 100644
--- a/source/text/swriter/01/mailmerge06.xhp
+++ b/source/text/swriter/01/mailmerge06.xhp
@@ -32,21 +32,22 @@
</meta>
<body>
<section id="preparemerge">
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmpreparepage/MMPreparePage" id="bm_id9046601"
localize="false"/>
<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"
l10n="NEW"><link href="text/swriter/01/mailmerge06.xhp">Mail Merge Wizard -
Edit Document</link></paragraph>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"
l10n="NEW">Browse through the document previews, exclude single recipients, and
edit the main document.</paragraph>
</section>
-<bookmark xml-lang="en-US"
branch="hid/sw:NumericField:DLG_MM_PREPAREMERGE_PAGE:ED_RECORD"
id="bm_id9046601" localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmpreparepage/record-nospin" id="bm_id9046601"
localize="false"/>
<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2"
l10n="NEW">Recipient</paragraph>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Enter the address record number of a recipient to
preview the mail merge document for the recipient.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_FIRST" id="bm_id735801"
localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_PREV" id="bm_id290536"
localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_NEXT" id="bm_id2619708"
localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_LAST" id="bm_id1293679"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmpreparepage/first"
id="bm_id735801" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmpreparepage/prev"
id="bm_id290536" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmpreparepage/next"
id="bm_id2619708" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmpreparepage/last"
id="bm_id1293679" localize="false"/>
<paragraph role="paragraph" id="par_idN10604" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Use the browse buttons to scroll through the address
records.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/sw:CheckBox:DLG_MM_PREPAREMERGE_PAGE:CB_EXCLUDE" id="bm_id108340"
localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmpreparepage/exclude" id="bm_id108340"
localize="false"/>
<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="3"
l10n="NEW">Exclude this recipient</paragraph>
<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Excludes the current recipient from this mail
merge.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_EDIT" id="bm_id1743827"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmpreparepage/edit"
id="bm_id1743827" localize="false"/>
<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2"
l10n="NEW">Edit Document</paragraph>
<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Minimizes the wizard so that you can edit the main
mail merge document for all recipients.</ahelp> To return to the wizard, click
the <emph>Return to Mail Merge Wizard</emph> button.</paragraph>
<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US"
l10n="CHG"><link href="text/swriter/01/mailmerge07.xhp" name="Mail Merge Wizard
- Personalize document">Mail Merge Wizard - Personalize
document</link></paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
