sw/inc/helpid.h | 8 --------
sw/source/ui/dbui/mmgreetingspage.cxx | 9 ---------
2 files changed, 17 deletions(-)
New commits:
commit 3e6151663dcf4562a18853c4c3fca0c5f8666a16
Author: Gabor Kelemen <kelem...@ubuntu.com>
Date: Sat Mar 11 22:03:28 2017 +0100
Drop unnecessary HIDs
These are used for the Mail Merge Wizard's
E-mail Message window: sw/uiconfig/swriter/ui/mmmailbody.ui
but the default HIDs will work just fine.
Change-Id: I2e31333ed5dc6e4804488c8412aacab02e2799e0
Reviewed-on: https://gerrit.libreoffice.org/36092
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index f06dac6c83ae..5bea9367c9df 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -188,14 +188,6 @@
#define HID_NID_NEXT
"SW_HID_NID_NEXT"
#define HID_MM_NEXT_PAGE
"SW_HID_MM_NEXT_PAGE"
#define HID_MM_PREV_PAGE
"SW_HID_MM_PREV_PAGE"
-#define HID_MM_BODY_CB_PERSONALIZED
"SW_HID_MM_BODY_CB_PERSONALIZED"
-#define HID_MM_BODY_LB_FEMALE
"SW_HID_MM_BODY_LB_FEMALE"
-#define HID_MM_BODY_PB_FEMALE
"SW_HID_MM_BODY_PB_FEMALE"
-#define HID_MM_BODY_LB_MALE
"SW_HID_MM_BODY_LB_MALE"
-#define HID_MM_BODY_PB_MALE
"SW_HID_MM_BODY_PB_MALE"
-#define HID_MM_BODY_LB_FEMALECOLUMN
"SW_HID_MM_BODY_LB_FEMALECOLUMN"
-#define HID_MM_BODY_CB_FEMALEFIELD
"SW_HID_MM_BODY_CB_FEMALEFIELD"
-#define HID_MM_BODY_CB_NEUTRAL
"SW_HID_MM_BODY_CB_NEUTRAL"
#define HID_TBX_FORMULA_CALC
"SW_HID_TBX_FORMULA_CALC"
#define HID_TBX_FORMULA_CANCEL
"SW_HID_TBX_FORMULA_CANCEL"
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx
b/sw/source/ui/dbui/mmgreetingspage.cxx
index 3ebcb8b507a6..569dcd977216 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -434,15 +434,6 @@ SwMailBodyDialog::SwMailBodyDialog(vcl::Window* pParent) :
get(m_pOK, "ok");
m_bIsTabPage = false;
- m_pPersonalizedCB->SetHelpId( HID_MM_BODY_CB_PERSONALIZED );
- m_pFemaleLB->SetHelpId( HID_MM_BODY_LB_FEMALE );
- m_pFemalePB->SetHelpId( HID_MM_BODY_PB_FEMALE );
- m_pMaleLB->SetHelpId( HID_MM_BODY_LB_MALE );
- m_pMalePB->SetHelpId( HID_MM_BODY_PB_MALE );
- m_pFemaleColumnLB->SetHelpId( HID_MM_BODY_LB_FEMALECOLUMN );
- m_pFemaleFieldCB->SetHelpId( HID_MM_BODY_CB_FEMALEFIELD );
- m_pNeutralCB->SetHelpId( HID_MM_BODY_CB_NEUTRAL );
-
m_pGreetingLineCB->SetClickHdl(LINK(this, SwMailBodyDialog,
ContainsHdl_Impl));
Link<Button*,void> aIndividualLink = LINK(this, SwGreetingsHandler,
IndividualHdl_Impl);
m_pPersonalizedCB->SetClickHdl(aIndividualLink);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
