summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@ubuntu.com>2017-06-01 18:40:49 +0200
committerKatarina Behrens <Katarina.Behrens@cib.de>2017-06-02 10:43:12 +0200
commitbad19f8ada3978a8eb603719aa0767a89281c68f (patch)
treeafffefd271b8426ae7472c4894496bbcc5f59e33
parent5872221094834af8553b3a7028d52f26dda391fa (diff)
tdf#102930 Add custom HIDS for New Address Block page
The New Address Block and Edit Address Block windows in Mail Merge wizard use the same ui file as the Custom Salutation windows, yet they differ slightly in appearance and a bit more in functionality. There is already a help page for this, so we need a few HIDs to be able to hook into that. Change-Id: I5d1e11d62e28c02d74e0e6833e493923a5d699cf Reviewed-on: https://gerrit.libreoffice.org/38327 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
-rw-r--r--sw/inc/helpid.h6
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx10
2 files changed, 16 insertions, 0 deletions
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 767654727854..b603262a130e 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -176,6 +176,12 @@
#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_ADDBLOCK_ELEMENTS "SW_HID_MM_ADDBLOCK_ELEMENTS"
+#define HID_MM_ADDBLOCK_INSERT "SW_HID_MM_ADDBLOCK_INSERT"
+#define HID_MM_ADDBLOCK_REMOVE "SW_HID_MM_ADDBLOCK_REMOVE"
+#define HID_MM_ADDBLOCK_DRAG "SW_HID_MM_ADDBLOCK_DRAG"
+#define HID_MM_ADDBLOCK_PREVIEW "SW_HID_MM_ADDBLOCK_PREVIEW"
+#define HID_MM_ADDBLOCK_MOVEBUTTONS "SW_HID_MM_ADDBLOCK_MOVEBUTTONS"
#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/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 4f80954808a2..f78f9c9c1927 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -535,6 +535,16 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
if(eType == ADDRESSBLOCK_EDIT)
SetText(SwResId(ST_TITLE_EDIT));
m_pDragED->SetText("\n\n\n\n\n");
+ /* Set custom HIDs for swriter/01/mm_newaddblo.xhp */
+ m_pAddressElementsLB->SetHelpId( HID_MM_ADDBLOCK_ELEMENTS );
+ m_pInsertFieldIB->SetHelpId( HID_MM_ADDBLOCK_INSERT );
+ m_pRemoveFieldIB->SetHelpId( HID_MM_ADDBLOCK_REMOVE );
+ m_pDragED->SetHelpId( HID_MM_ADDBLOCK_DRAG );
+ m_pPreviewWIN->SetHelpId( HID_MM_ADDBLOCK_PREVIEW );
+ m_pRightIB->SetHelpId( HID_MM_ADDBLOCK_MOVEBUTTONS );
+ m_pLeftIB->SetHelpId( HID_MM_ADDBLOCK_MOVEBUTTONS );
+ m_pDownIB->SetHelpId( HID_MM_ADDBLOCK_MOVEBUTTONS );
+ m_pUpIB->SetHelpId( HID_MM_ADDBLOCK_MOVEBUTTONS );
}
const ResStringArray& rHeaders = m_rConfigItem.GetDefaultAddressHeaders();