Add correct tabpage to chart property dialog.

- Added needed strings resources and ids.
- Added code to handle X and Z errorbars.

4 files changed, 34 insertions, 4 deletions

diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc
index b2f79fc09148..507b54150771 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -71,6 +71,7 @@
 
 #define TP_TRENDLINE    918
 #define TP_YERRORBAR    919
+#define TP_XERRORBAR    923
 
 //-----------------------------------------------------------------------------
 //listbox Ids:
diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src
index 67967140ae71..5a3a500ff849 100644
--- a/chart2/source/controller/dialogs/Strings.src
+++ b/chart2/source/controller/dialogs/Strings.src
@@ -135,11 +135,21 @@ String STR_PAGE_TRENDLINE_TYPE
     Text[ en-US ] = "Type";
 };
 
+String STR_PAGE_XERROR_BARS
+{
+    Text[ en-US ] = "X Error Bars";
+};
+
 String STR_PAGE_YERROR_BARS
 {
     Text[ en-US ] = "Y Error Bars";
 };
 
+String STR_PAGE_ZERROR_BARS
+{
+    Text[ en-US ] = "Z Error Bars";
+};
+
 String STR_PAGE_ALIGNMENT
 {
     Text [ en-US ] = "Alignment" ;
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 0b586c6ad11c..ee478ac93053 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -447,14 +447,20 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent,
             break;
         }
 
-        case OBJECTTYPE_DATA_ERRORS:
         case OBJECTTYPE_DATA_ERRORS_X:
+            AddTabPage(TP_XERRORBAR, String(SchResId(STR_PAGE_XERROR_BARS)), ErrorBarsTabPage::Create, NULL);
+            AddTabPage(RID_SVXPAGE_LINE, String(SchResId(STR_PAGE_LINE)));
+            break;
+
+        case OBJECTTYPE_DATA_ERRORS:
         case OBJECTTYPE_DATA_ERRORS_Y:
-        case OBJECTTYPE_DATA_ERRORS_Z:
             AddTabPage(TP_YERRORBAR, String(SchResId(STR_PAGE_YERROR_BARS)), ErrorBarsTabPage::Create, NULL);
             AddTabPage(RID_SVXPAGE_LINE, String(SchResId(STR_PAGE_LINE)));
             break;
 
+        case OBJECTTYPE_DATA_ERRORS_Z:
+            break;
+
         case OBJECTTYPE_GRID:
         case OBJECTTYPE_SUBGRID:
         case OBJECTTYPE_DATA_AVERAGE_LINE:
@@ -616,7 +622,18 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
                aSet.Put (SvxNumberInfoItem( m_pNumberFormatter, (const sal_uInt16)SID_ATTR_NUMBERFORMAT_INFO));
             rPage.PageCreated(aSet);
             break;
-
+        case TP_XERRORBAR:
+        {
+            ErrorBarsTabPage * pTabPage = dynamic_cast< ErrorBarsTabPage * >( &rPage );
+            OSL_ASSERT( pTabPage );
+            if( pTabPage )
+            {
+                pTabPage->SetAxisMinorStepWidthForErrorBarDecimals( m_fAxisMinorStepWidthForErrorBarDecimals );
+                pTabPage->SetErrorBarType( ErrorBarResources::ERROR_BAR_X );
+                pTabPage->SetChartDocumentForRangeChoosing( m_pParameter->getDocument());
+            }
+            break;
+        }
         case TP_YERRORBAR:
         {
             ErrorBarsTabPage * pTabPage = dynamic_cast< ErrorBarsTabPage * >( &rPage );
diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc
index de3c56a914f8..e1af6d6b223b 100644
--- a/chart2/source/inc/Strings.hrc
+++ b/chart2/source/inc/Strings.hrc
@@ -30,7 +30,7 @@
 // this includes no link dependency
 #include <svl/solar.hrc>
 
-//next free is 293
+//next free is 295
 //single free: 139
 
 //-----------------------------------------------------------------------------
@@ -232,7 +232,9 @@
 #define STR_PAGE_ILLUMINATION                (RID_APP_START + 237)
 
 #define STR_PAGE_TRENDLINE_TYPE              (RID_APP_START + 89)
+#define STR_PAGE_XERROR_BARS                 (RID_APP_START + 293)
 #define STR_PAGE_YERROR_BARS                 (RID_APP_START + 206)
+#define STR_PAGE_ZERROR_BARS                 (RID_APP_START + 294)
 #define STR_CONTROLTEXT_ERROR_BARS_FROM_DATA (RID_APP_START + 276)
 
 #define STR_DLG_CHART_WIZARD                 (RID_APP_START + 228)