[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/inc sw/source

[Gabor Kelemen]

 sw/inc/helpid.h                          |    6 ++++++
 sw/source/ui/dbui/mmaddressblockpage.cxx |   10 ++++++++++
 2 files changed, 16 insertions(+)

New commits:
commit a1a182efeda461d3a59ca7a81f51a9d2b6cdae04
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Thu Jun 1 18:40:49 2017 +0200

    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 at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit bad19f8ada3978a8eb603719aa0767a89281c68f)
    Reviewed-on: https://gerrit.libreoffice.org/38350
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

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 6c9c69e81774..4e9cce014c5e 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();