Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
chart2/source/controller/main/UndoManager.cxx
chart2/source/tools/RegressionCurveHelper.cxx
sc/inc/address.hxx
sc/inc/attrib.hxx
sc/inc/bigrange.hxx
sc/inc/callform.hxx
sc/inc/cell.hxx
sc/inc/chartarr.hxx
sc/inc/chartlis.hxx
sc/inc/chgtrack.hxx
sc/inc/collect.hxx
sc/inc/compiler.hxx
sc/inc/detdata.hxx
sc/inc/document.hxx
sc/inc/fillinfo.hxx
sc/inc/olinetab.hxx
sc/inc/prnsave.hxx
sc/inc/queryparam.hxx
sc/inc/sc.hrc
sc/inc/scabstdlg.hxx
sc/inc/table.hxx
sc/inc/validat.hxx
sc/inc/zforauto.hxx
sc/source/core/data/documen2.cxx
sc/source/core/data/document.cxx
sc/source/core/data/table1.cxx
sc/source/core/tool/address.cxx
sc/source/core/tool/token.cxx
sc/source/filter/excel/frmbase.cxx
sc/source/filter/excel/impop.cxx
sc/source/filter/excel/xename.cxx
sc/source/filter/inc/formel.hxx
sc/source/filter/inc/xename.hxx
sc/source/filter/xml/xmlexprt.cxx
sc/source/filter/xml/xmlnexpi.cxx
sc/source/filter/xml/xmlnexpi.hxx
sc/source/ui/dbgui/filtdlg.cxx
sc/source/ui/inc/docfunc.hxx
sc/source/ui/inc/namedlg.hxx
sc/source/ui/namedlg/namedlg.cxx
sc/source/ui/src/namedlg.src

1 files changed, 9 insertions, 0 deletions

diff --git a/chart2/source/controller/dialogs/tp_DataSource.src b/chart2/source/controller/dialogs/tp_DataSource.src
index 3e1f8a51c68a..9173a9c709ab 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.src
+++ b/chart2/source/controller/dialogs/tp_DataSource.src
@@ -29,6 +29,7 @@
 
 TabPage TP_DATA_SOURCE
 {
+    HelpID = "chart2:TabPage:TP_DATA_SOURCE";
     Hide = TRUE;
     Size = MAP_APPFONT ( 248, 140 );
     SVLook = TRUE ;
@@ -86,6 +87,7 @@ TabPage TP_DATA_SOURCE
     };
     Edit EDT_RANGE
     {
+        HelpID = "chart2:Edit:TP_DATA_SOURCE:EDT_RANGE";
         Border = TRUE;
         TabStop = TRUE;
         Pos  = MAP_APPFONT ( 82 , 89  );
@@ -93,6 +95,7 @@ TabPage TP_DATA_SOURCE
     };
     ImageButton IMB_RANGE_MAIN
     {
+        HelpID = "chart2:ImageButton:TP_DATA_SOURCE:IMB_RANGE_MAIN";
         TabStop = TRUE;
         Pos  = MAP_APPFONT ( 228 , 88  );
         Size = MAP_APPFONT ( 14 , 14 );
@@ -118,6 +121,7 @@ TabPage TP_DATA_SOURCE
 
     Edit EDT_CATEGORIES
     {
+        HelpID = "chart2:Edit:TP_DATA_SOURCE:EDT_CATEGORIES";
         Border = TRUE;
         TabStop = TRUE;
         Pos  = MAP_APPFONT ( 82 , 117  );
@@ -125,6 +129,7 @@ TabPage TP_DATA_SOURCE
     };
     ImageButton IMB_RANGE_CAT
     {
+        HelpID = "chart2:ImageButton:TP_DATA_SOURCE:IMB_RANGE_CAT";
         TabStop = TRUE;
         Pos  = MAP_APPFONT ( 228 , 116  );
         Size = MAP_APPFONT ( 14 , 14 );
@@ -134,6 +139,7 @@ TabPage TP_DATA_SOURCE
 
     PushButton BTN_ADD
     {
+        HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_ADD";
         TabStop = TRUE;
         Disable = FALSE;
         Pos  = MAP_APPFONT ( 6 , 105  );
@@ -143,6 +149,7 @@ TabPage TP_DATA_SOURCE
     };
     PushButton BTN_REMOVE
     {
+        HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_REMOVE";
         TabStop = TRUE;
         Disable = TRUE;
         Pos  = MAP_APPFONT ( 6 , 121  );
@@ -154,6 +161,7 @@ TabPage TP_DATA_SOURCE
     // Note: Text is only a black triangle symbol
     PushButton BTN_UP
     {
+        HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_UP";
         TabStop = TRUE;
         Disable = TRUE;
         Pos  = MAP_APPFONT ( 64 , 105  );
@@ -163,6 +171,7 @@ TabPage TP_DATA_SOURCE
     // Note: Text is only a black triangle symbol
     PushButton BTN_DOWN
     {
+        HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_DOWN";
         TabStop = TRUE;
         Disable = TRUE;
         Pos  = MAP_APPFONT ( 64 , 121  );