[Libreoffice-commits] core.git: sw/inc sw/source

[Caolán McNamara]

 sw/inc/helpid.h                        |    3 ---
 sw/source/ui/dbui/mmoutputtypepage.cxx |    2 --
 2 files changed, 5 deletions(-)

New commits:
commit 2e0561c9962e1205b68ae0c9971c4df7b141f535
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 23 09:41:29 2014 +0100

    drop helpids that go nowhere
    
    Change-Id: I64c060ac849f8b055f8b63bba8ecb59ee3ef2d9a

diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 2f8dc9e..f6dfdbc 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -365,10 +365,7 @@
 #define HID_MODULE_TOOLBOX                                      "SW_HID_MODULE_TOOLBOX"
 
 #define HID_MM_SELECTDBTABLEDDIALOG                             "SW_HID_MM_SELECTDBTABLEDDIALOG"
-#define HID_MM_SENDMAILS                                        "SW_HID_MM_SENDMAILS"
-#define HID_MM_SENDMAILS_STATUSLB                               "SW_HID_MM_SENDMAILS_STATUSLB"
 #define HID_MAILMERGECHILD                                      "SW_HID_MAILMERGECHILD"
-#define HID_MM_MAILSTATUS_TLB                                   "SW_HID_MM_MAILSTATUS_TLB"
 #define HID_RETURN_TO_MAILMERGE                                 "SW_HID_RETURN_TO_MAILMERGE"
 
 #define HID_NID_TBL                                             "SW_HID_NID_TBL"
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 514d77c..29aecd3 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -264,7 +264,6 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
     m_nStatusHeight = m_pContainer->get_height_request();
     OUString sTask(SW_RES(ST_TASK));
     OUString sStatus(SW_RES(ST_STATUS));
-    m_pStatus->SetHelpId(HID_MM_SENDMAILS_STATUSLB);
 
     m_pDetails->SetClickHdl(LINK( this, SwSendMailDialog, DetailsHdl_Impl));
     m_pStop->SetClickHdl(LINK( this, SwSendMailDialog, StopHdl_Impl));
@@ -279,7 +278,6 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
                             nPos2,
                             HIB_LEFT | HIB_VCENTER );
 
-    m_pStatus->SetHelpId(HID_MM_MAILSTATUS_TLB);
     static long nTabs[] = {2, 0, nPos1};
     m_pStatus->SetStyle( m_pStatus->GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
     m_pStatus->SetSelectionMode( SINGLE_SELECTION );