helpers/help_hid.lst | 5 -----
source/text/swriter/01/mm_emabod.xhp | 5 +++--
2 files changed, 3 insertions(+), 7 deletions(-)
New commits:
commit 5e7710362c86e7559f15d9c3dea4e392c2605caf
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 2 12:09:41 2014 +0100
update help ids for mailmerge body dialog .ui conversion
Change-Id: I7f312236f7bb3398724eec24ab2d674068380661
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 401e55d..34d66d6 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2026,8 +2026,6 @@ HID_MM_BODY_LB_MALE,55029,
HID_MM_BODY_PB_FEMALE,55028,
HID_MM_BODY_PB_MALE,55030,
HID_MM_CUSTOMFIELDS,54986,
-HID_MM_DBTABLEPREVIEWDIALOG,54965,
-HID_MM_MAILBODY,54982,
HID_MM_MAILSTATUS_TLB,54988,
HID_MM_NEXT_PAGE,55016,
HID_MM_PREV_PAGE,55017,
@@ -5740,7 +5738,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_MAILBODY_CB_GREETINGLINE,1435403279,
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,
@@ -5774,7 +5771,6 @@ sw_Edit_DLG_MAILMERGE_ED_PATH,1446610969,
sw_Edit_DLG_MAILMERGE_ED_SUBJECT,1446610960,
sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319,
sw_Edit_TP_LINENUMBERING_ED_DIVISOR,878888975,
-sw_FT_BODY_DLG_MM_MAILBODY,1435402240,
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,
@@ -5829,7 +5825,6 @@ sw_MetricField_TP_TABLE_COLUMN_ED_SPACE,888494718,
sw_ModalDialog_DLG_CHANGE_DB,1419591680,
sw_ModalDialog_DLG_DBSELECTION,1435009024,
sw_ModalDialog_DLG_MAILMERGEWIZARD,1435058176,
-sw_MultiLineEdit_DLG_MM_MAILBODY_MLE_BODY,1435404831,
sw_MultiLineEdit_TP_LAB_LAB_EDT_WRITING,909691395,
sw_NumericField_DLG_MAILMERGE_NF_FROM,1446615045,
sw_NumericField_DLG_MAILMERGE_NF_TO,1446615047,
diff --git a/source/text/swriter/01/mm_emabod.xhp
b/source/text/swriter/01/mm_emabod.xhp
index 1b7501d..e407eb2 100644
--- a/source/text/swriter/01/mm_emabod.xhp
+++ b/source/text/swriter/01/mm_emabod.xhp
@@ -31,9 +31,10 @@
</history>
</meta>
<body>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmmailbody/MailBodyDialog" id="bm_id495011"
localize="false"/>
<paragraph role="heading" id="par_idN1053C" xml-lang="en-US" level="1"
l10n="NEW">E-Mail Message</paragraph>
<paragraph role="paragraph" id="par_idN10540" xml-lang="en-US" l10n="NEW">Type
the message and the salutation for files that you send as <link
href="text/swriter/01/mailmerge08.xhp">e-mail</link> attachments.</paragraph>
-<bookmark xml-lang="en-US"
branch="hid/SW_CHECKBOX_DLG_MM_MAILBODY_CB_GREETINGLINE" id="bm_id1831110"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/greeting"
id="bm_id1831110" localize="false"/>
<paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="2"
l10n="NEW">This e-mail should contain a salutation</paragraph>
<paragraph role="paragraph" id="par_idN10558" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Adds a salutation to the e-mail.</ahelp></paragraph>
<!-- removed HID 1435403266 -->
@@ -60,7 +61,7 @@
<!-- removed HID 1435406350 -->
<paragraph role="heading" id="par_idN105A8" xml-lang="en-US" level="3"
l10n="NEW">General salutation</paragraph>
<paragraph role="paragraph" id="par_idN105AC" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select the default greeting to use if a personalized
salutation cannot be created.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/SW_MULTILINEEDIT_DLG_MM_MAILBODY_MLE_BODY" id="bm_id495010"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/bodymle"
id="bm_id495010" localize="false"/>
<paragraph role="heading" id="par_idN105AF" xml-lang="en-US" level="3"
l10n="NEW">Write your message here</paragraph>
<paragraph role="paragraph" id="par_idN105B3" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Enter the main text of the e-mail.</ahelp></paragraph>
</body>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
