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

[Gabor Kelemen]

 chart2/source/controller/dialogs/res_ErrorBar.cxx |    2 ++
 chart2/source/controller/inc/HelpIds.hrc          |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 610968f029f87315341cc43d08afd4c69b0c4ae7
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Tue May 30 22:55:03 2017 +0200

    Add custom HID to the 'From Data Table' option
    
    On the X/Y Error Bars window a custom text is
    set for a radiobutton if the chart has its own data table.
    The difference is explained in the help, let's display the
    correct description in the extended help.
    
    Change-Id: Idaa6038818bc4f87ea490a457e7c96ff741f1f77
    Reviewed-on: https://gerrit.libreoffice.org/38240
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 4d0f4fefeb128cf7d61ebfceb8fb2befd3e98904)
    Reviewed-on: https://gerrit.libreoffice.org/38349
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 97b5d31a4fe5..03e24cc512ce 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -23,6 +23,7 @@
 #include "RangeSelectionHelper.hxx"
 #include "TabPageNotifiable.hxx"
 #include "macros.hxx"
+#include "HelpIds.hrc"
 
 #include <rtl/math.hxx>
 #include <vcl/dialog.hxx>
@@ -197,6 +198,7 @@ void ErrorBarResources::SetChartDocumentForRangeChoosing(
     if( m_bHasInternalDataProvider )
     {
         m_pRbRange->SetText(m_pUIStringRbRange->GetText());
+        m_pRbRange->SetHelpId( HID_SCH_ERROR_BARS_FROM_DATA );
     }
 
     if( m_pRbRange->IsChecked())
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc
index 9f5aeb76e503..48616bb29210 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -20,7 +20,7 @@
 #define CHART_HELPIDS_HRC
 
 #define HID_SCH_WIN_DOCUMENT                                "CHART2_HID_SCH_WIN_DOCUMENT"
-
+#define HID_SCH_ERROR_BARS_FROM_DATA                        "CHART2_SCH_ERROR_BARS_FROM_DATA"