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

Mon Jun 9 04:28:01 PDT 2014

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

New commits:
commit 2a3ca8223d8669fe1f00445af80d7b84bfd73b00
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Mon Jun 9 10:45:29 2014 +0100

    connect help for create address list to the dialog
    
    Change-Id: I8d9505e43de87ca01c9ca0cd871b065505d31996

diff --git a/source/text/swriter/01/mm_newaddlis.xhp b/source/text/swriter/01/mm_newaddlis.xhp
index 540b0b2..ee6798b 100644
--- a/source/text/swriter/01/mm_newaddlis.xhp
+++ b/source/text/swriter/01/mm_newaddlis.xhp
@@ -31,6 +31,7 @@
 </history>
 </meta>
 <body>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/createaddresslist/CreateAddressList" id="bm_id3153966" localize="false"/>
 <paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1" l10n="NEW">New Address List</paragraph>
 <paragraph role="paragraph" id="par_idN10546" xml-lang="en-US" l10n="NEW">Enter new addresses or edit the addresses for <link href="text/swriter/01/mailmerge03.xhp">mail merge</link> documents. When you click <emph>OK</emph>, a dialog prompts you for the location to save the address list.</paragraph>
 <paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="2" l10n="NEW">Address Information</paragraph>
commit 82bf2a5059b0b1b76f0966a3b73ad757788703f9
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Mon Jun 9 10:43:23 2014 +0100

    drop unused helpids
    
    Change-Id: Idd3e6887519a1031e2ce1893ad1695e6962a0c13

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a58d44e..1efe17a 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2050,7 +2050,6 @@ HID_MM_BODY_LB_FEMALECOLUMN,55031,
 HID_MM_BODY_LB_MALE,55029,
 HID_MM_BODY_PB_FEMALE,55028,
 HID_MM_BODY_PB_MALE,55030,
-HID_MM_CREATEADDRESSLIST,54966,
 HID_MM_CUSTOMFIELDS,54986,
 HID_MM_DBTABLEPREVIEWDIALOG,54965,
 HID_MM_HEADER_0,55035,
@@ -5977,7 +5976,6 @@ 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,
-sw_NumericField_DLG_MM_CREATEADDRESSLIST_NF_SETNO,1435244554,
 sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_COLS,1411291141,
 sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_ROWS,1411291139,
 sw_NumericField_TP_LINENUMBERING_NF_DIV_INTERVAL,878893073,
@@ -5999,14 +5997,6 @@ sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_DETAILS,1972294210,
 sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_STOP,1972294213,
 sw_PushButton_DLG_MAILMERGE_PB_ATTACH,1446613538,
 sw_PushButton_DLG_MAILMERGE_PB_PATH,1446613530,
-sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_CUSTOMIZE,1435243014,
-sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_DELETE,1435243012,
-sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_END,1435243020,
-sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_FIND,1435243013,
-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_SELECTDBTABLEDDIALOG_PB_PREVIEW,1435210243,
 sw_PushButton_DLG_PAGEPREVIEW_PRINTOPTIONS_PB_STANDARD,1411289624,
 sw_PushButton_DLG_SYNC_BTN_BTN_SYNC,1983500820,
