[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

Thu Jun 12 02:21:41 PDT 2014

helpers/help_hid.lst                 |   17 -----------------
 source/text/swriter/01/mm_matfie.xhp |    1 +
 2 files changed, 1 insertion(+), 17 deletions(-)

New commits:
commit 179e4d655622b1926a2de0e8bc93627961fcc3c7
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Thu Jun 12 10:11:54 2014 +0100

    connect match fields help to dialog
    
    Change-Id: I7bef5bb5f7d25d1c4bf403fd44664002f45f4704

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 7571dcc..e520bfa 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2040,8 +2040,6 @@ HID_MEMO_PAGE3,53291,
 HID_MEMO_PAGE4,53292,
 HID_MEMO_PAGE5,53293,
 HID_MERGE_PRINTMONITOR,52773,
-HID_MM_ASSIGNFIELDS,54972,
-HID_MM_ASSIGN_FIELDS,55034,
 HID_MM_BODY_CB_FEMALEFIELD,55032,
 HID_MM_BODY_CB_NEUTRAL,55033,
 HID_MM_BODY_CB_PERSONALIZED,55026,
@@ -2052,20 +2050,6 @@ HID_MM_BODY_PB_FEMALE,55028,
 HID_MM_BODY_PB_MALE,55030,
 HID_MM_CUSTOMFIELDS,54986,
 HID_MM_DBTABLEPREVIEWDIALOG,54965,
-HID_MM_HEADER_0,55035,
-HID_MM_HEADER_1,55036,
-HID_MM_HEADER_10,55045,
-HID_MM_HEADER_11,55046,
-HID_MM_HEADER_12,55047,
-HID_MM_HEADER_13,55048,
-HID_MM_HEADER_2,55037,
-HID_MM_HEADER_3,55038,
-HID_MM_HEADER_4,55039,
-HID_MM_HEADER_5,55040,
-HID_MM_HEADER_6,55041,
-HID_MM_HEADER_7,55042,
-HID_MM_HEADER_8,55043,
-HID_MM_HEADER_9,55044,
 HID_MM_MAILBODY,54982,
 HID_MM_MAILSTATUS_TLB,54988,
 HID_MM_NEXT_PAGE,55016,
@@ -5906,7 +5890,6 @@ sw_ListBox_DLG_FLD_DROPDOWN_LB_LISTITEMS,1419644418,
 sw_ListBox_DLG_MAILMERGE_LB_ADDRESSFLD,1446612494,
 sw_ListBox_DLG_MAILMERGE_LB_COLUMN,1446612510,
 sw_ListBox_DLG_MAILMERGE_LB_FILTER,1446612524,
-sw_ListBox_DLG_MM_ASSIGNFIELDS_CT_FIELDS_LB_FIELDS,1074908678,
 sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINEPOS,877956631,
 sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINETYPE,877956629,
 sw_ListBox_TP_FORMAT_TABLE_LB_TEXTORIENTATION,878218796,
diff --git a/source/text/swriter/01/mm_matfie.xhp b/source/text/swriter/01/mm_matfie.xhp
index 8b28ea5..960f409 100644
--- a/source/text/swriter/01/mm_matfie.xhp
+++ b/source/text/swriter/01/mm_matfie.xhp
@@ -31,6 +31,7 @@
 </history>
 </meta>
 <body>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/assignfieldsdialog/AssignFieldsDialog" id="bm_id8489027" localize="false"/>
 <paragraph role="heading" id="par_idN10539" xml-lang="en-US" level="1" l10n="NEW">Match Fields</paragraph>
 <paragraph role="paragraph" id="par_idN1053D" xml-lang="en-US" l10n="NEW">Matches the logical field names of the layout dialog to the field names in your database when you create new <link href="text/swriter/01/mailmerge03.xhp">address blocks</link> or <link href="text/swriter/01/mailmerge04.xhp">salutations</link>.</paragraph>
 <paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="2" l10n="NEW">Matches to:</paragraph>
