[Libreoffice-commits] core.git: svx/source

[Gabor Kelemen]

 svx/source/dialog/hdft.cxx |   13 +++++++++++++
 1 file changed, 13 insertions(+)

New commits:
commit 16fa2d72ba0254adc7c1bec97ade5350b4da1a82
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Fri Dec 30 00:20:03 2016 +0100

    Add custom HIDs for the Page Style - Footer tabpage
    
    This is necessary because the Header and Footer tabpages
    use a shared .ui file and I can't link different help
    content to the same ui elements.
    
    Change-Id: I5718dc3bf1dfae5962ebe1f49f5c3d75d958f1c5
    Reviewed-on: https://gerrit.libreoffice.org/32499
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index d2b28df..f1ee794 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -170,6 +170,19 @@ SvxHFPage::SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 n
     {
         get(m_pPageLbl,"labelFooterFormat");
         get(m_pTurnOnBox, "checkFooterOn");
+
+        /* Set custom HIDs for the Footer help page (shared/01/05040400.xhp)
+        otherwise it would display the same extended help
+        on both the Header and Footer tabs */
+        m_pCntSharedBox->SetHelpId( "SVX_HID_FOOTER_CHECKSAMELR" );
+        m_pCntSharedFirstBox->SetHelpId( "SVX_HID_FOOTER_CHECKSAMEFP" );
+        m_pLMEdit->SetHelpId( "SVX_HID_FOOTER_SPINMARGLEFT" );
+        m_pRMEdit->SetHelpId( "SVX_HID_FOOTER_SPINMARGRIGHT" );
+        m_pDistEdit->SetHelpId( "SVX_HID_FOOTER_SPINSPACING" );
+        m_pDynSpacingCB->SetHelpId( "SVX_HID_FOOTER_CHECKDYNSPACING" );
+        m_pHeightEdit->SetHelpId( "SVX_HID_FOOTER_SPINHEIGHT" );
+        m_pHeightDynBtn->SetHelpId( "SVX_HID_FOOTER_CHECKAUTOFIT" );
+        m_pBackgroundBtn->SetHelpId( "SVX_HID_FOOTER_BUTTONMORE" );
     }
     else //Header
     {