removetooltypes01: Rebase to DEV300m99

18 files changed, 730 insertions, 203 deletions

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 120639b9d339..e92e32a57958 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -47,7 +47,7 @@
 #include "ChartModelHelper.hxx"
 #include "CommonConverters.hxx"
 #include "macros.hxx"
-#include "chartview/NumberFormatterWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 #include "servicenames_charttypes.hxx"
 #include "ResId.hxx"
 #include "Bitmaps.hrc"
@@ -64,6 +64,7 @@
 #include <com/sun/star/chart2/XChartType.hpp>
 
 #include <com/sun/star/container/XIndexReplace.hpp>
+#include <com/sun/star/util/XNumberFormats.hpp>
 
 #include <algorithm>
 #include <functional>
@@ -696,6 +697,23 @@ String DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
                                       GetNumberFormatKey( nRow, nColumnId ),
                                       fData, nLabelColor, bColorChanged ));
         }
+        else if( m_apDataBrowserModel->getCellType( nColIndex, nRow ) == DataBrowserModel::TEXTORDATE )
+        {
+            uno::Any aAny = m_apDataBrowserModel->getCellAny( nColIndex, nRow );
+            OUString aText;
+            double fDouble=0.0;
+            if( aAny>>=aText )
+                aResult = aText;
+            else if( aAny>>=fDouble )
+            {
+                sal_Int32 nLabelColor;
+                bool bColorChanged = false;
+                sal_Int32 nDateNumberFormat = DiagramHelper::getDateNumberFormat( Reference< util::XNumberFormatsSupplier >( m_xChartDoc, uno::UNO_QUERY) );
+                if( ! ::rtl::math::isNan( fDouble ) && m_spNumberFormatterWrapper.get() )
+                    aResult = String( m_spNumberFormatterWrapper->getFormattedString(
+                        nDateNumberFormat, fDouble, nLabelColor, bColorChanged ));
+            }
+        }
         else
         {
             OSL_ASSERT( m_apDataBrowserModel->getCellType( nColIndex, nRow ) == DataBrowserModel::TEXT );
@@ -854,6 +872,9 @@ void DataBrowser::SetDataFromModel(
         new NumberFormatterWrapper(
             Reference< util::XNumberFormatsSupplier >( m_xChartDoc, uno::UNO_QUERY )));
 
+    if( m_spNumberFormatterWrapper.get() )
+        m_aNumberEditField.SetFormatter( m_spNumberFormatterWrapper->getSvNumberFormatter() );
+
     RenewTable();
 
     const sal_Int32 nColCnt  = m_apDataBrowserModel->getColumnCount();
@@ -1134,6 +1155,22 @@ sal_uInt32 DataBrowser::GetNumberFormatKey( sal_Int32 nRow, sal_uInt16 nCol ) co
     return m_apDataBrowserModel->getNumberFormatKey( lcl_getColumnInData( nCol ), lcl_getRowInData( nRow ));
 }
 
+bool DataBrowser::isDateString( rtl::OUString aInputString, double& fOutDateValue )
+{
+    sal_uInt32 nNumberFormat=0;
+    SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper.get() ? m_spNumberFormatterWrapper->getSvNumberFormatter() : 0;
+    if( aInputString.getLength() > 0 &&  pSvNumberFormatter && pSvNumberFormatter->IsNumberFormat( aInputString, nNumberFormat, fOutDateValue ) )
+    {
+        Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( m_xChartDoc, uno::UNO_QUERY );
+        Reference< util::XNumberFormats > xNumberFormats;
+        if( xNumberFormatsSupplier.is() )
+             xNumberFormats = Reference< util::XNumberFormats >( xNumberFormatsSupplier->getNumberFormats() );
+        if( DiagramHelper::isDateNumberFormat( nNumberFormat, xNumberFormats ) )
+            return true;
+    }
+    return false;
+}
+
 sal_Bool DataBrowser::SaveModified()
 {
     if( ! IsModified() )
@@ -1146,6 +1183,7 @@ sal_Bool DataBrowser::SaveModified()
 
     DBG_ASSERT( nRow >= 0 || nCol >= 0, "This cell should not be modified!" );
 
+    SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper.get() ? m_spNumberFormatterWrapper->getSvNumberFormatter() : 0;
     switch( m_apDataBrowserModel->getCellType( nCol, nRow ))
     {
         case DataBrowserModel::NUMBER:
@@ -1155,11 +1193,8 @@ sal_Bool DataBrowser::SaveModified()
             String aText( m_aNumberEditField.GetText());
             // an empty string is valid, if no numberformatter exists, all
             // values are treated as valid
-            if( aText.Len() > 0 &&
-                m_spNumberFormatterWrapper.get() &&
-                m_spNumberFormatterWrapper->getSvNumberFormatter() &&
-                ! m_spNumberFormatterWrapper->getSvNumberFormatter()->IsNumberFormat(
-                    aText, nDummy, fDummy ))
+            if( aText.Len() > 0 && pSvNumberFormatter &&
+                ! pSvNumberFormatter->IsNumberFormat( aText, nDummy, fDummy ) )
             {
                 bChangeValid = sal_False;
             }
@@ -1170,6 +1205,17 @@ sal_Bool DataBrowser::SaveModified()
             }
         }
         break;
+        case DataBrowserModel::TEXTORDATE:
+        {
+            OUString aText( m_aTextEditField.GetText() );
+            double fDateValue=0.0;
+            bChangeValid = sal_False;
+            if( isDateString( aText, fDateValue ) )
+                bChangeValid = m_apDataBrowserModel->setCellAny( nCol, nRow, uno::makeAny( fDateValue ) );
+            if(!bChangeValid)
+                bChangeValid = m_apDataBrowserModel->setCellAny( nCol, nRow, uno::makeAny( aText ) );
+        }
+        break;
         case DataBrowserModel::TEXT:
         {
             OUString aText( m_aTextEditField.GetText());
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index cb9696770fcd..251c4d29fbe3 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -93,6 +93,8 @@ public:
     */
     double GetCellNumber( long nRow, sal_uInt16 nColumnId ) const;
 
+    bool isDateString( rtl::OUString aInputString, double& fOutDateValue );
+
     // Window
     virtual void Resize();
 
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index c0b865536686..23fda0f472af 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -43,6 +43,7 @@
 #include "ExplicitCategoriesProvider.hxx"
 
 #include <com/sun/star/container/XIndexReplace.hpp>
+#include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart2/XInternalDataProvider.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
@@ -589,7 +590,7 @@ Reference< chart2::XDataSeries >
     return 0;
 }
 
-DataBrowserModel::eCellType DataBrowserModel::getCellType( sal_Int32 nAtColumn, sal_Int32 /* nAtRow */ )
+DataBrowserModel::eCellType DataBrowserModel::getCellType( sal_Int32 nAtColumn, sal_Int32 /* nAtRow */ ) const
 {
     eCellType eResult = TEXT;
     tDataColumnVector::size_type nIndex( nAtColumn );
@@ -619,6 +620,26 @@ double DataBrowserModel::getCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow )
     return fResult;
 }
 
+uno::Any DataBrowserModel::getCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow )
+{
+    uno::Any aResult;
+
+    tDataColumnVector::size_type nIndex( nAtColumn );
+    if( nIndex < m_aColumns.size() &&
+        m_aColumns[ nIndex ].m_xLabeledDataSequence.is())
+    {
+        Reference< chart2::data::XDataSequence > xData(
+            m_aColumns[ nIndex ].m_xLabeledDataSequence->getValues() );
+        if( xData.is() )
+        {
+            Sequence< uno::Any > aValues( xData->getData());
+            if( nAtRow < aValues.getLength())
+                aResult = aValues[nAtRow];
+        }
+    }
+    return aResult;
+}
+
 OUString DataBrowserModel::getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow )
 {
     OUString aResult;
@@ -800,7 +821,7 @@ void DataBrowserModel::updateFromModel()
                 aCategories.m_aUIRoleName = DialogModel::GetRoleDataLabel();
             else
                 aCategories.m_aUIRoleName = lcl_getUIRoleName( xCategories );
-            aCategories.m_eCellType = TEXT;
+            aCategories.m_eCellType = TEXTORDATE;
             m_aColumns.push_back( aCategories );
             ++nHeaderStart;
         }
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx
index d16bbe24ce1e..94af7fbead13 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.hxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx
@@ -81,13 +81,15 @@ public:
     enum eCellType
     {
         NUMBER,
-        TEXT
+        TEXT,
+        TEXTORDATE
     };
 
-    eCellType getCellType( sal_Int32 nAtColumn, sal_Int32 nAtRow );
+    eCellType getCellType( sal_Int32 nAtColumn, sal_Int32 nAtRow ) const;
     /// If getCellType( nAtColumn, nAtRow ) returns TEXT, the result will be Nan
     double getCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow );
     ::rtl::OUString getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow );
+    ::com::sun::star::uno::Any getCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow );
     sal_uInt32 getNumberFormatKey( sal_Int32 nAtColumn, sal_Int32 nAtRow );
 
     /// returns </sal_True> if the number could successfully be set at the given position
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index eedd2e3c6ba9..6e145dc1dfbf 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -160,7 +160,7 @@ void lcl_createRoleIndexMap( lcl_tRoleIndexMap & rOutMap )
 struct lcl_DataSeriesContainerAppend : public
     ::std::iterator< ::std::output_iterator_tag, Reference< XDataSeriesContainer > >
 {
-    typedef ::std::vector< chart::DialogModel::tSeriesWithChartTypeByName > tContainerType;
+    typedef ::std::vector< ::chart::DialogModel::tSeriesWithChartTypeByName > tContainerType;
 
     explicit lcl_DataSeriesContainerAppend( tContainerType & rCnt )
             : m_rDestCnt( rCnt )
@@ -180,7 +180,7 @@ struct lcl_DataSeriesContainerAppend : public
                 for( sal_Int32 nI = 0; nI < aSeq.getLength(); ++ nI )
                 {
                     m_rDestCnt.push_back(
-                        chart::DialogModel::tSeriesWithChartTypeByName(
+                        ::chart::DialogModel::tSeriesWithChartTypeByName(
                             ::chart::DataSeriesHelper::getDataSeriesLabel( aSeq[nI], aRole ),
                             ::std::make_pair( aSeq[nI], xCT )));
                 }
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 9057b850332f..483424d04497 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -40,7 +40,7 @@
 #include "AxisIndexDefines.hxx"
 #include "ExplicitCategoriesProvider.hxx"
 #include "CommonConverters.hxx"
-#include "chartview/NumberFormatterWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 #include "RegressionCurveHelper.hxx"
 #include <rtl/math.hxx>
 #include <tools/debug.hxx>
@@ -191,14 +191,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal
 
     if( aX.getLength() == 0 )
     {
-        rtl::OUString aCategory = ::rtl::OUString( String(SchResId(STR_TIP_CATEGORY_VALUE)));
-
-        replaceParamterInString( aCategory
-            , C2U("%CATEGORYVALUE")
-            , ExplicitCategoriesProvider::getCategoryByIndex( xCooSys, xChartModel, nPointIndex )
-            );
-
-        aRet = aCategory;
+        aRet = ExplicitCategoriesProvider::getCategoryByIndex( xCooSys, xChartModel, nPointIndex );
     }
     else
     {
diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src
index 4b4cec65426e..1c0a066df046 100644
--- a/chart2/source/controller/dialogs/Strings.src
+++ b/chart2/source/controller/dialogs/Strings.src
@@ -388,11 +388,6 @@ String STR_TIP_DATAPOINT_VALUES
     Text [ en-US ] = "Values: %POINTVALUES";
 };
 
-String STR_TIP_CATEGORY_VALUE
-{
-    Text [ en-US ] = "'%CATEGORYVALUE'";
-};
-
 String STR_TIP_DATAPOINT
 {
     Text [ en-US ] = "Data Point %POINTNUMBER, data series %SERIESNUMBER, values: %POINTVALUES";
@@ -463,6 +458,10 @@ String STR_ACTION_NOTPOSSIBLE
 {
     Text [ en-US ] = "This function cannot be completed with the selected objects." ;
 };
+String STR_ACTION_EDIT_TEXT
+{
+    Text [ en-US ] = "Edit text";
+};
 
 String STR_COLUMN_LABEL
 {
diff --git a/chart2/source/controller/dialogs/Strings_Scale.src b/chart2/source/controller/dialogs/Strings_Scale.src
index e7a3d6c2b1cf..6f8b75d9509c 100644
--- a/chart2/source/controller/dialogs/Strings_Scale.src
+++ b/chart2/source/controller/dialogs/Strings_Scale.src
@@ -42,3 +42,11 @@ String STR_MIN_GREATER_MAX
 {
     Text [ en-US ] = "The minimum must be lower than the maximum. Check your input." ;
 };
+String STR_INVALID_INTERVALS
+{
+    Text [ en-US ] = "The major interval needs to be greater than the minor interval. Check your input." ;
+};
+String STR_INVALID_TIME_UNIT
+{
+    Text [ en-US ] = "The major and minor interval need to be greater or equal to the resolution. Check your input." ;
+};
diff --git a/chart2/source/controller/dialogs/TabPages.hrc b/chart2/source/controller/dialogs/TabPages.hrc
index 1f445083738f..dbc166e4f2cd 100644
--- a/chart2/source/controller/dialogs/TabPages.hrc
+++ b/chart2/source/controller/dialogs/TabPages.hrc
@@ -111,31 +111,6 @@
 #define FT_AXIS_TEXTDIR                 19
 #define LB_AXIS_TEXTDIR                 20
 
-//#define TP_SCALE        903
-
-#define FL_SCALE            1
-
-#define TXT_MIN             1
-#define TXT_MAX             2
-#define TXT_STEP_MAIN       3
-#define TXT_STEP_HELP       4
-#define TXT_ORIGIN          5
-
-#define CBX_AUTO_MIN        1
-#define CBX_AUTO_MAX        2
-#define CBX_AUTO_STEP_MAIN  3
-#define CBX_AUTO_STEP_HELP  4
-#define CBX_AUTO_ORIGIN     5
-#define CBX_LOGARITHM       6
-#define CBX_REVERSE         7
-
-#define EDT_STEP_MAIN       1
-#define EDT_MAX             2
-#define EDT_MIN             3
-#define EDT_ORIGIN          4
-
-#define MT_STEPHELP         10
-
 //#define TP_AXIS_POSITIONS   904
 
 #define FL_AXIS_LINE        1
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index 50aa10ec6e6b..9c0d8f1e1b10 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -118,7 +118,7 @@ double InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals(
             pExplicitValueProvider->getExplicitValuesForAxis( xAxis,aExplicitScale, aExplicitIncrement );
 
             fStepWidth = aExplicitIncrement.Distance;
-            if( aExplicitIncrement.SubIncrements.getLength()  && aExplicitIncrement.SubIncrements[0].IntervalCount>0 )
+            if( !aExplicitIncrement.SubIncrements.empty() && aExplicitIncrement.SubIncrements[0].IntervalCount>0 )
                 fStepWidth=fStepWidth/double(aExplicitIncrement.SubIncrements[0].IntervalCount);
             else
                 fStepWidth/=10;
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 77739fdff317..0102a970e0c5 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -56,7 +56,7 @@
 #include "ChartTypeHelper.hxx"
 #include "ObjectNameProvider.hxx"
 #include "DiagramHelper.hxx"
-#include "chartview/NumberFormatterWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 #include "AxisIndexDefines.hxx"
 #include "AxisHelper.hxx"
 #include "ExplicitCategoriesProvider.hxx"
@@ -181,7 +181,7 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel
                 ScaleData aData( xAxis->getScaleData() );
                 if( chart2::AxisType::SERIES == aData.AxisType )
                     m_bHasScaleProperties = false;
-                if( chart2::AxisType::REALNUMBER == aData.AxisType || chart2::AxisType::PERCENT == aData.AxisType )
+                if( chart2::AxisType::SERIES != aData.AxisType )
                     m_bHasNumberProperties = true;
 
                 sal_Int32 nCooSysIndex=0;
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index d2b62e07214f..46b4d30865d7 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -474,12 +474,12 @@ IMPL_LINK( ErrorBarResources, ChooseRange, RangeSelectionButton *, pButton )
     if( pButton == &m_aIbRangePositive )
     {
         m_pCurrentRangeChoosingField = &m_aEdRangePositive;
-        aUIString = ::rtl::OUString( String( SchResId( STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS )));
+        aUIString = String( SchResId( STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS ));
     }
     else
     {
         m_pCurrentRangeChoosingField = &m_aEdRangeNegative;
-        aUIString = ::rtl::OUString( String( SchResId( STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS )));
+        aUIString = String( SchResId( STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS ));
     }
 
     OSL_ASSERT( m_pParentDialog );
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index f47c03da8197..63014c1a6824 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -142,13 +142,13 @@ sal_Bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs )
             bRadioButtonChecked = false;
 
         if( bRadioButtonChecked )
-            rOutAttrs.Put( SvxChartTextOrderItem( eOrder, SCHATTR_TEXT_ORDER ));
+            rOutAttrs.Put( SvxChartTextOrderItem( eOrder, SCHATTR_AXIS_LABEL_ORDER ));
     }
 
     if( aCbTextOverlap.GetState() != STATE_DONTKNOW )
-        rOutAttrs.Put( SfxBoolItem( SCHATTR_TEXT_OVERLAP, aCbTextOverlap.IsChecked() ) );
+        rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_LABEL_OVERLAP, aCbTextOverlap.IsChecked() ) );
     if( aCbTextBreak.GetState() != STATE_DONTKNOW )
-        rOutAttrs.Put( SfxBoolItem( SCHATTR_TEXTBREAK, aCbTextBreak.IsChecked() ) );
+        rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_LABEL_BREAK, aCbTextBreak.IsChecked() ) );
     if( aCbShowDescription.GetState() != STATE_DONTKNOW )
         rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_SHOWDESCR, aCbShowDescription.IsChecked() ) );
 
@@ -212,7 +212,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
         m_aLbTextDirection.SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pPoolItem)->GetValue()) );
 
     // Text overlap ----------
-    aState = rInAttrs.GetItemState( SCHATTR_TEXT_OVERLAP, sal_False, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_OVERLAP, sal_False, &pPoolItem );
     if( aState == SFX_ITEM_DONTCARE )
     {
         aCbTextOverlap.EnableTriState( sal_True );
@@ -231,7 +231,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     }
 
     // text break ----------
-    aState = rInAttrs.GetItemState( SCHATTR_TEXTBREAK, sal_False, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_BREAK, sal_False, &pPoolItem );
     if( aState == SFX_ITEM_DONTCARE )
     {
         aCbTextBreak.EnableTriState( sal_True );
@@ -256,7 +256,11 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     // text order ----------
     if( m_bShowStaggeringControls )
     {
+<<<<<<< local
         aState = rInAttrs.GetItemState( SCHATTR_TEXT_ORDER, sal_False, &pPoolItem );
+=======
+        aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_ORDER, FALSE, &pPoolItem );
+>>>>>>> other
         if( aState == SFX_ITEM_SET )
         {
             SvxChartTextOrder eOrder = static_cast< const SvxChartTextOrderItem * >( pPoolItem )->GetValue();
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index c2632d4be2e1..a59f5949c0bb 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -366,7 +366,7 @@ IMPL_LINK( RangeChooserTabPage, ChooseRangeHdl, void *, EMPTYARG )
 {
     rtl::OUString aRange = m_aED_Range.GetText();
     // using assignment for broken gcc 3.3
-    rtl::OUString aTitle = ::rtl::OUString( String( SchResId( STR_PAGE_DATA_RANGE ) ));
+    rtl::OUString aTitle = String( SchResId( STR_PAGE_DATA_RANGE ) );
 
     lcl_enableRangeChoosing( true, m_pParentDialog );
     m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this );
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 7d1fd9b7e026..1ca3e8b358b8 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -28,9 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_chart2.hxx"
 #include "tp_Scale.hxx"
+#include "tp_Scale.hrc"
 
 #include "ResId.hxx"
-#include "TabPages.hrc"
 #include "Strings.hrc"
 #include "chartview/ChartSfxItemIds.hxx"
 #include "NoWarningThisInCTOR.hxx"
@@ -72,6 +72,20 @@ namespace chart
 namespace
 {
 
+void lcl_placeControlAtX( Control& rControl, long nNewXPos )
+{
+    Point aPos( rControl.GetPosPixel() );
+    aPos.X() = nNewXPos;
+    rControl.SetPosPixel(aPos);
+}
+
+void lcl_placeControlAtY( Control& rControl, long nNewYPos )
+{
+    Point aPos( rControl.GetPosPixel() );
+    aPos.Y() = nNewYPos;
+    rControl.SetPosPixel(aPos);
+}
+
 void lcl_shiftControls( Control& rEdit, Control& rAuto, long nNewXPos )
 {
     Point aPos( rEdit.GetPosPixel() );
@@ -84,16 +98,15 @@ void lcl_shiftControls( Control& rEdit, Control& rAuto, long nNewXPos )
     rAuto.SetPosPixel(aPos);
 }
 
-void lcl_placeControlsAtY( Control& rTop, Control& rBottom, long nNewYPos )
+long lcl_getLabelDistance( Control& rControl )
 {
-    Point aPos( rTop.GetPosPixel() );
-    long nShift = nNewYPos - aPos.Y();
-    aPos.Y() = nNewYPos;
-    rTop.SetPosPixel(aPos);
+    return rControl.LogicToPixel( Size(RSC_SP_CTRL_DESC_X, 0), MapMode(MAP_APPFONT) ).Width();
+}
 
-    aPos = rBottom.GetPosPixel();
-    aPos.Y() += nShift;
-    rBottom.SetPosPixel(aPos);
+void lcl_setValue( FormattedField& rFmtField, double fValue )
+{
+    rFmtField.SetValue( fValue );
+    rFmtField.SetDefaultValue( fValue );
 }
 
 }
@@ -102,32 +115,51 @@ ScaleTabPage::ScaleTabPage(Window* pWindow,const SfxItemSet& rInAttrs) :
     SfxTabPage(pWindow, SchResId(TP_SCALE), rInAttrs),
 
     aFlScale(this, SchResId(FL_SCALE)),
+
+    aCbxReverse(this, SchResId(CBX_REVERSE)),
+    aCbxLogarithm(this, SchResId(CBX_LOGARITHM)),
+
+    m_aTxt_AxisType(this, SchResId (TXT_AXIS_TYPE)),
+    m_aLB_AxisType(this, SchResId(LB_AXIS_TYPE)),
+
     aTxtMin (this, SchResId (TXT_MIN)),
     aFmtFldMin(this, SchResId(EDT_MIN)),
     aCbxAutoMin(this, SchResId(CBX_AUTO_MIN)),
+
     aTxtMax(this, SchResId (TXT_MAX)),
     aFmtFldMax(this, SchResId(EDT_MAX)),
     aCbxAutoMax(this, SchResId(CBX_AUTO_MAX)),
+
+    m_aTxt_TimeResolution(this, SchResId (TXT_TIME_RESOLUTION)),
+    m_aLB_TimeResolution(this, SchResId(LB_TIME_RESOLUTION)),
+    m_aCbx_AutoTimeResolution(this, SchResId(CBX_AUTO_TIME_RESOLUTION)),
+
     aTxtMain (this, SchResId (TXT_STEP_MAIN)),
     aFmtFldStepMain(this, SchResId(EDT_STEP_MAIN)),
+    m_aMt_MainDateStep(this, SchResId(MT_MAIN_DATE_STEP)),
+    m_aLB_MainTimeUnit(this, SchResId(LB_MAIN_TIME_UNIT)),
     aCbxAutoStepMain(this, SchResId(CBX_AUTO_STEP_MAIN)),
+
+    aTxtHelpCount (this, SchResId (TXT_STEP_HELP_COUNT)),
     aTxtHelp (this, SchResId (TXT_STEP_HELP)),
     aMtStepHelp (this, SchResId (MT_STEPHELP)),
+    m_aLB_HelpTimeUnit(this, SchResId(LB_HELP_TIME_UNIT)),
     aCbxAutoStepHelp(this, SchResId(CBX_AUTO_STEP_HELP)),
 
     aTxtOrigin (this, SchResId (TXT_ORIGIN)),
     aFmtFldOrigin(this, SchResId(EDT_ORIGIN)),
     aCbxAutoOrigin(this, SchResId(CBX_AUTO_ORIGIN)),
 
-    aCbxLogarithm(this, SchResId(CBX_LOGARITHM)),
-    aCbxReverse(this, SchResId(CBX_REVERSE)),
-
     fMin(0.0),
     fMax(0.0),
     fStepMain(0.0),
     nStepHelp(0),
     fOrigin(0.0),
-    nAxisType(chart2::AxisType::REALNUMBER),
+    m_nTimeResolution(1),
+    m_nMainTimeUnit(1),
+    m_nHelpTimeUnit(1),
+    m_nAxisType(chart2::AxisType::REALNUMBER),
+    m_bAllowDateAxis(false),
     pNumFormatter(NULL),
     m_bShowAxisOrigin(false)
 {
@@ -139,6 +171,26 @@ ScaleTabPage::ScaleTabPage(Window* pWindow,const SfxItemSet& rInAttrs) :
     aCbxAutoStepMain.SetClickHdl(LINK(this, ScaleTabPage, EnableValueHdl));
     aCbxAutoStepHelp.SetClickHdl(LINK(this, ScaleTabPage, EnableValueHdl));
     aCbxAutoOrigin.SetClickHdl(LINK(this, ScaleTabPage, EnableValueHdl));
+    m_aCbx_AutoTimeResolution.SetClickHdl(LINK(this, ScaleTabPage, EnableValueHdl));
+
+    m_aLB_AxisType.SetDropDownLineCount(3);
+    m_aLB_AxisType.SetSelectHdl(LINK(this, ScaleTabPage, SelectAxisTypeHdl));
+
+    m_aLB_TimeResolution.SetDropDownLineCount(3);
+    m_aLB_MainTimeUnit.SetDropDownLineCount(3);
+    m_aLB_HelpTimeUnit.SetDropDownLineCount(3);
+
+    aFmtFldMin.SetModifyHdl(LINK(this, ScaleTabPage, FmtFieldModifiedHdl));
+    aFmtFldMax.SetModifyHdl(LINK(this, ScaleTabPage, FmtFieldModifiedHdl));
+    aFmtFldStepMain.SetModifyHdl(LINK(this, ScaleTabPage, FmtFieldModifiedHdl));
+    aFmtFldOrigin.SetModifyHdl(LINK(this, ScaleTabPage, FmtFieldModifiedHdl));
+}
+
+IMPL_LINK( ScaleTabPage, FmtFieldModifiedHdl, FormattedField*, pFmtFied )
+{
+    if( pFmtFied )
+        pFmtFied->SetDefaultValue( pFmtFied->GetValue() );
+    return 0;
 }
 
 void ScaleTabPage::StateChanged( StateChangedType nType )
@@ -155,10 +207,13 @@ void ScaleTabPage::AdjustControlPositions()
     long nLabelWidth = ::std::max( aTxtMin.CalcMinimumSize().Width(), aTxtMax.CalcMinimumSize().Width() );
     nLabelWidth = ::std::max( aTxtMain.CalcMinimumSize().Width(), nLabelWidth );
     nLabelWidth = ::std::max( aTxtHelp.CalcMinimumSize().Width(), nLabelWidth );
+    nLabelWidth = ::std::max( aTxtHelpCount.CalcMinimumSize().Width(), nLabelWidth );
     nLabelWidth = ::std::max( aTxtOrigin.CalcMinimumSize().Width(), nLabelWidth );
+    nLabelWidth = ::std::max( m_aTxt_TimeResolution.CalcMinimumSize().Width(), nLabelWidth );
+    nLabelWidth = ::std::max( m_aTxt_AxisType.CalcMinimumSize().Width(), nLabelWidth );
     nLabelWidth+=1;
 
-    long nLabelDistance = aTxtMin.LogicToPixel( Size(RSC_SP_CTRL_DESC_X, 0), MapMode(MAP_APPFONT) ).Width();
+    long nLabelDistance = lcl_getLabelDistance(aTxtMin);
     long nNewXPos = aTxtMin.GetPosPixel().X() + nLabelWidth + nLabelDistance;
 
     //ensure that the auto checkboxes are wide enough and have correct size for calculation
@@ -167,9 +222,10 @@ void ScaleTabPage::AdjustControlPositions()
     aCbxAutoStepMain.SetSizePixel( aCbxAutoStepMain.CalcMinimumSize() );
     aCbxAutoStepHelp.SetSizePixel( aCbxAutoStepHelp.CalcMinimumSize() );
     aCbxAutoOrigin.SetSizePixel( aCbxAutoOrigin.CalcMinimumSize() );
+    m_aCbx_AutoTimeResolution.SetSizePixel( m_aCbx_AutoTimeResolution.CalcMinimumSize() );
 
     //ensure new pos is ok
-    long nWidthOfOtherControls = aCbxAutoMin.GetPosPixel().X() + aCbxAutoMin.GetSizePixel().Width() - aFmtFldMin.GetPosPixel().X();
+    long nWidthOfOtherControls = m_aLB_MainTimeUnit.GetPosPixel().X() + m_aLB_MainTimeUnit.GetSizePixel().Width() - aFmtFldMin.GetPosPixel().X();
     long nDialogWidth = GetSizePixel().Width();
 
     long nLeftSpace = nDialogWidth - nNewXPos - nWidthOfOtherControls;
@@ -181,72 +237,180 @@ void ScaleTabPage::AdjustControlPositions()
         aTxtMax.SetSizePixel(aSize);
         aTxtMain.SetSizePixel(aSize);
         aTxtHelp.SetSizePixel(aSize);
+        aTxtHelpCount.SetSizePixel(aSize);
         aTxtOrigin.SetSizePixel(aSize);
+        m_aTxt_TimeResolution.SetSizePixel(aSize);
+        m_aTxt_AxisType.SetSizePixel(aSize);
+
+        long nOrgAutoCheckX = aCbxAutoMin.GetPosPixel().X();
+        lcl_placeControlAtX( aCbxAutoStepMain, nOrgAutoCheckX );
+        lcl_placeControlAtX( aCbxAutoStepHelp, nOrgAutoCheckX );
 
         lcl_shiftControls( aFmtFldMin, aCbxAutoMin, nNewXPos );
         lcl_shiftControls( aFmtFldMax, aCbxAutoMax, nNewXPos );
         lcl_shiftControls( aFmtFldStepMain, aCbxAutoStepMain, nNewXPos );
+        lcl_placeControlAtX( m_aMt_MainDateStep, aFmtFldStepMain.GetPosPixel().X() );
         lcl_shiftControls( aMtStepHelp, aCbxAutoStepHelp, nNewXPos );
         lcl_shiftControls( aFmtFldOrigin, aCbxAutoOrigin, nNewXPos );
+        lcl_shiftControls( m_aLB_TimeResolution, m_aCbx_AutoTimeResolution, nNewXPos );
+        lcl_placeControlAtX( m_aLB_AxisType, nNewXPos );
+
+        nNewXPos = aCbxAutoStepMain.GetPosPixel().X() + aCbxAutoStepMain.GetSizePixel().Width() + nLabelDistance;
+        lcl_placeControlAtX( m_aLB_MainTimeUnit, nNewXPos );
+        lcl_placeControlAtX( m_aLB_HelpTimeUnit, nNewXPos );
     }
+    PlaceIntervalControlsAccordingToAxisType();
 }
 
-void ScaleTabPage::EnableControls()
+void ScaleTabPage::PlaceIntervalControlsAccordingToAxisType()
 {
-    bool bEnableForValueOrPercentAxis = chart2::AxisType::REALNUMBER == nAxisType || chart2::AxisType::PERCENT == nAxisType;
-    aFlScale.Enable( bEnableForValueOrPercentAxis );
-    aTxtMin.Enable( bEnableForValueOrPercentAxis );
-    aFmtFldMin.Enable( bEnableForValueOrPercentAxis );
-    aCbxAutoMin.Enable( bEnableForValueOrPercentAxis );
-    aTxtMax.Enable( bEnableForValueOrPercentAxis );
-    aFmtFldMax.Enable( bEnableForValueOrPercentAxis );
-    aCbxAutoMax.Enable( bEnableForValueOrPercentAxis );
-    aTxtMain.Enable( bEnableForValueOrPercentAxis );
-    aFmtFldStepMain.Enable( bEnableForValueOrPercentAxis );
-    aCbxAutoStepMain.Enable( bEnableForValueOrPercentAxis );
-    aTxtHelp.Enable( bEnableForValueOrPercentAxis );
-    aMtStepHelp.Enable( bEnableForValueOrPercentAxis );
-    aCbxAutoStepHelp.Enable( bEnableForValueOrPercentAxis );
-    aCbxLogarithm.Enable( bEnableForValueOrPercentAxis );
-
-    aTxtOrigin.Show( m_bShowAxisOrigin && bEnableForValueOrPercentAxis );
-    aFmtFldOrigin.Show( m_bShowAxisOrigin && bEnableForValueOrPercentAxis );
-    aCbxAutoOrigin.Show( m_bShowAxisOrigin && bEnableForValueOrPercentAxis );
-
-    long nNewYPos = aTxtOrigin.GetPosPixel().Y();
-    if( m_bShowAxisOrigin )
-        nNewYPos += ( aTxtOrigin.GetPosPixel().Y() - aTxtHelp.GetPosPixel().Y() );
-    lcl_placeControlsAtY( aCbxLogarithm, aCbxReverse, nNewYPos );
+    long nMinX = std::min( aCbxAutoStepMain.GetPosPixel().X(), m_aLB_MainTimeUnit.GetPosPixel().X() );
+    long nLabelDistance = lcl_getLabelDistance(aTxtMin);
+    long nListWidth = m_aLB_MainTimeUnit.GetSizePixel().Width();
+
+    if( chart2::AxisType::DATE == m_nAxisType )
+    {
+        lcl_placeControlAtX( m_aLB_MainTimeUnit, nMinX );
+        lcl_placeControlAtX( m_aLB_HelpTimeUnit, nMinX );
+        long nSecondX = nMinX + nListWidth + nLabelDistance;
+        lcl_placeControlAtX( aCbxAutoStepMain, nSecondX );
+        lcl_placeControlAtX( aCbxAutoStepHelp, nSecondX );
+
+        long nOne = m_aMt_MainDateStep.LogicToPixel( Size(0, 1), MapMode(MAP_APPFONT) ).Height();
+
+        long nYMajor = m_aMt_MainDateStep.GetPosPixel().Y();
+        lcl_placeControlAtY( aCbxAutoStepMain , nYMajor+(3*nOne));
+        lcl_placeControlAtY( aTxtMain , nYMajor+nOne+nOne);
+
+        long nYMinor = m_aLB_HelpTimeUnit.GetPosPixel().Y();
+        lcl_placeControlAtY( aMtStepHelp , nYMinor );
+        lcl_placeControlAtY( aCbxAutoStepHelp , nYMinor+(3*nOne));
+    }
+    else
+    {
+        lcl_placeControlAtX( aCbxAutoStepMain, nMinX );
+        lcl_placeControlAtX( aCbxAutoStepHelp, nMinX );
+        long nSecondX = nMinX + aCbxAutoStepMain.GetSizePixel().Width() + nLabelDistance;
+        long nSecondXMax = GetSizePixel().Width() - nListWidth;
+        if( nSecondX > nSecondXMax )
+            nSecondX = nSecondXMax;
+        lcl_placeControlAtX( m_aLB_MainTimeUnit, nSecondX );
+        lcl_placeControlAtX( m_aLB_HelpTimeUnit, nSecondX );
+    }
 }
 
+void ScaleTabPage::EnableControls()
+{
+    bool bValueAxis = chart2::AxisType::REALNUMBER == m_nAxisType || chart2::AxisType::PERCENT == m_nAxisType || chart2::AxisType::DATE == m_nAxisType;
+    bool bDateAxis = chart2::AxisType::DATE == m_nAxisType;
+
+    m_aTxt_AxisType.Show(m_bAllowDateAxis);
+    m_aLB_AxisType.Show(m_bAllowDateAxis);
+
+    aCbxLogarithm.Show( bValueAxis && !bDateAxis );
+    aTxtMin.Show( bValueAxis );
+    aFmtFldMin.Show( bValueAxis );
+    aCbxAutoMin.Show( bValueAxis );
+    aTxtMax.Show( bValueAxis );
+    aFmtFldMax.Show( bValueAxis );
+    aCbxAutoMax.Show( bValueAxis );
+    aTxtMain.Show( bValueAxis );
+    aFmtFldStepMain.Show( bValueAxis );
+    aCbxAutoStepMain.Show( bValueAxis );
+    aTxtHelp.Show( bValueAxis );
+    aTxtHelpCount.Show( bValueAxis );
+    aMtStepHelp.Show( bValueAxis );
+    aCbxAutoStepHelp.Show( bValueAxis );
+
+    aTxtOrigin.Show( m_bShowAxisOrigin && bValueAxis );
+    aFmtFldOrigin.Show( m_bShowAxisOrigin && bValueAxis );
+    aCbxAutoOrigin.Show( m_bShowAxisOrigin && bValueAxis );
+
+    aTxtHelpCount.Show( bValueAxis && !bDateAxis );
+    aTxtHelp.Show( bDateAxis );
+
+    m_aTxt_TimeResolution.Show( bDateAxis );
+    m_aLB_TimeResolution.Show( bDateAxis );
+    m_aCbx_AutoTimeResolution.Show( bDateAxis );
+
+    bool bWasDateAxis = m_aMt_MainDateStep.IsVisible();
+    if( bWasDateAxis != bDateAxis )
+    {
+        //transport value from one to other control
+        if( bWasDateAxis )
+            lcl_setValue( aFmtFldStepMain, m_aMt_MainDateStep.GetValue() );
+        else
+            m_aMt_MainDateStep.SetValue( static_cast<sal_Int32>(aFmtFldStepMain.GetValue()) );
+    }
+    aFmtFldStepMain.Show( bValueAxis && !bDateAxis );
+    m_aMt_MainDateStep.Show( bDateAxis );
+
+    m_aLB_MainTimeUnit.Show( bDateAxis );
+    m_aLB_HelpTimeUnit.Show( bDateAxis );
 
+    EnableValueHdl(&aCbxAutoMin);
+    EnableValueHdl(&aCbxAutoMax);
+    EnableValueHdl(&aCbxAutoStepMain);
+    EnableValueHdl(&aCbxAutoStepHelp);
+    EnableValueHdl(&aCbxAutoOrigin);
+    EnableValueHdl(&m_aCbx_AutoTimeResolution);
+}
 
 IMPL_LINK( ScaleTabPage, EnableValueHdl, CheckBox *, pCbx )
 {
+    bool bEnable = pCbx && !pCbx->IsChecked() && pCbx->IsEnabled();
     if (pCbx == &aCbxAutoMin)
     {
-        aFmtFldMin.Enable(!aCbxAutoMin.IsChecked());
+        aFmtFldMin.Enable( bEnable );
     }
     else if (pCbx == &aCbxAutoMax)
     {
-        aFmtFldMax.Enable(!aCbxAutoMax.IsChecked());
+        aFmtFldMax.Enable( bEnable );
     }
     else if (pCbx == &aCbxAutoStepMain)
     {
-        aFmtFldStepMain.Enable(!aCbxAutoStepMain.IsChecked());
+        aFmtFldStepMain.Enable( bEnable );
+        m_aMt_MainDateStep.Enable( bEnable );
+        m_aLB_MainTimeUnit.Enable( bEnable );
     }
     else if (pCbx == &aCbxAutoStepHelp)
     {
-        aMtStepHelp.Show ();
-        aMtStepHelp.Enable( ! aCbxAutoStepHelp.IsChecked() );
+        aMtStepHelp.Enable( bEnable );
+        m_aLB_HelpTimeUnit.Enable( bEnable );
+    }
+    else if (pCbx == &m_aCbx_AutoTimeResolution)
+    {
+        m_aLB_TimeResolution.Enable( bEnable );
     }
     else if (pCbx == &aCbxAutoOrigin)
     {
-        aFmtFldOrigin.Enable(!aCbxAutoOrigin.IsChecked());
+        aFmtFldOrigin.Enable( bEnable );
     }
     return 0;
 }
 
+enum AxisTypeListBoxEntry
+{
+    TYPE_AUTO=0,
+    TYPE_TEXT=1,
+    TYPE_DATE=2
+};
+
+IMPL_LINK( ScaleTabPage, SelectAxisTypeHdl, void *, EMPTYARG )
+{
+    USHORT nPos = m_aLB_AxisType.GetSelectEntryPos();
+    if( nPos==TYPE_DATE )
+        m_nAxisType = chart2::AxisType::DATE;
+    else
+        m_nAxisType = chart2::AxisType::CATEGORY;
+    if( chart2::AxisType::DATE == m_nAxisType )
+        aCbxLogarithm.Check(false);
+    EnableControls();
+    PlaceIntervalControlsAccordingToAxisType();
+    SetNumFormat();
+    return 0;
+}
+
 SfxTabPage* ScaleTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs)
 {
     return new ScaleTabPage(pWindow, rOutAttrs);
@@ -256,10 +420,18 @@ sal_Bool ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 {
     DBG_ASSERT( pNumFormatter, "No NumberFormatter available" );
 
-    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MIN      ,aCbxAutoMin.IsChecked()));
-    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MAX      ,aCbxAutoMax.IsChecked()));
-    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP,aCbxAutoStepHelp.IsChecked()));
-    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN   ,aCbxAutoOrigin.IsChecked()));
+    rOutAttrs.Put(SfxInt32Item(SCHATTR_AXISTYPE, m_nAxisType));
+    if(m_bAllowDateAxis)
+        rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_DATEAXIS, TYPE_AUTO==m_aLB_AxisType.GetSelectEntryPos()));
+
+    bool bAutoScale = false;
+    if( m_nAxisType==chart2::AxisType::CATEGORY )
+        bAutoScale = true;//reset scaling for category charts
+
+    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MIN      ,bAutoScale || aCbxAutoMin.IsChecked()));
+    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MAX      ,bAutoScale || aCbxAutoMax.IsChecked()));
+    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP,bAutoScale || aCbxAutoStepHelp.IsChecked()));
+    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN   ,bAutoScale || aCbxAutoOrigin.IsChecked()));
     rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_LOGARITHM     ,aCbxLogarithm.IsChecked()));
     rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_REVERSE       ,aCbxReverse.IsChecked()));
     rOutAttrs.Put(SvxDoubleItem(fMax     , SCHATTR_AXIS_MAX));
@@ -267,9 +439,15 @@ sal_Bool ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs)
     rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_STEP_HELP, nStepHelp));
     rOutAttrs.Put(SvxDoubleItem(fOrigin  , SCHATTR_AXIS_ORIGIN));
 
-    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN,aCbxAutoStepMain.IsChecked()));
+    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN,bAutoScale || aCbxAutoStepMain.IsChecked()));
     rOutAttrs.Put(SvxDoubleItem(fStepMain,SCHATTR_AXIS_STEP_MAIN));
 
+    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,bAutoScale || m_aCbx_AutoTimeResolution.IsChecked()));
+    rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_TIME_RESOLUTION,m_nTimeResolution));
+
+    rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_MAIN_TIME_UNIT,m_nMainTimeUnit));
+    rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_HELP_TIME_UNIT,m_nHelpTimeUnit));
+
     return sal_True;
 }
 
@@ -280,20 +458,50 @@ void ScaleTabPage::Reset(const SfxItemSet& rInAttrs)
         return;
 
     const SfxPoolItem *pPoolItem = NULL;
-    nAxisType=chart2::AxisType::REALNUMBER;
-    if (rInAttrs.GetItemState(SCHATTR_AXISTYPE, sal_True, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_ALLOW_DATEAXIS, TRUE, &pPoolItem) == SFX_ITEM_SET)
+        m_bAllowDateAxis = (bool) ((const SfxBoolItem*)pPoolItem)->GetValue();
+    m_nAxisType=chart2::AxisType::REALNUMBER;
+    if (rInAttrs.GetItemState(SCHATTR_AXISTYPE, TRUE, &pPoolItem) == SFX_ITEM_SET)
+        m_nAxisType = (int) ((const SfxInt32Item*)pPoolItem)->GetValue();
+    if( m_nAxisType==chart2::AxisType::DATE && !m_bAllowDateAxis )
+        m_nAxisType=chart2::AxisType::CATEGORY;
+    if( m_bAllowDateAxis )
     {
-        nAxisType = (int) ((const SfxInt32Item*)pPoolItem)->GetValue();
-        EnableControls();
+        bool bAutoDateAxis = false;
+        if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_DATEAXIS, TRUE, &pPoolItem) == SFX_ITEM_SET)
+            bAutoDateAxis = (bool) ((const SfxBoolItem*)pPoolItem)->GetValue();
+
+        sal_uInt16 nPos = 0;
+        if( m_nAxisType==chart2::AxisType::DATE )
+            nPos=TYPE_DATE;
+        else if( bAutoDateAxis )
+            nPos=TYPE_AUTO;
+        else
+            nPos=TYPE_TEXT;
+        m_aLB_AxisType.SelectEntryPos( nPos );
     }
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MIN,sal_True,&pPoolItem) == SFX_ITEM_SET)
+    if( m_bAllowDateAxis )
+        aCbxReverse.SetHelpId("chart2:CheckBox:TP_SCALE:CBX_REVERSE:MayBeDateAxis");
+    else if( m_nAxisType==chart2::AxisType::CATEGORY || m_nAxisType==chart2::AxisType::SERIES )
+        aCbxReverse.SetHelpId("chart2:CheckBox:TP_SCALE:CBX_REVERSE:Category");
+
+    PlaceIntervalControlsAccordingToAxisType();
+
+    aCbxAutoMin.Check( true );
+    aCbxAutoMax.Check( true );
+    aCbxAutoStepMain.Check( true );
+    aCbxAutoStepHelp.Check( true );
+    aCbxAutoOrigin.Check( true );
+    m_aCbx_AutoTimeResolution.Check( true );
+
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MIN,TRUE,&pPoolItem) == SFX_ITEM_SET)
         aCbxAutoMin.Check(((const SfxBoolItem*)pPoolItem)->GetValue());
 
     if (rInAttrs.GetItemState(SCHATTR_AXIS_MIN,sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         fMin = ((const SvxDoubleItem*)pPoolItem)->GetValue();
-        aFmtFldMin.SetValue( fMin );
+        lcl_setValue( aFmtFldMin, fMin );
     }
 
     if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MAX,sal_True, &pPoolItem) == SFX_ITEM_SET)
@@ -302,7 +510,7 @@ void ScaleTabPage::Reset(const SfxItemSet& rInAttrs)
     if (rInAttrs.GetItemState(SCHATTR_AXIS_MAX,sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         fMax = ((const SvxDoubleItem*)pPoolItem)->GetValue();
-        aFmtFldMax.SetValue( fMax );
+        lcl_setValue( aFmtFldMax, fMax );
     }
 
     if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_STEP_MAIN,sal_True, &pPoolItem) == SFX_ITEM_SET)
@@ -311,7 +519,8 @@ void ScaleTabPage::Reset(const SfxItemSet& rInAttrs)
     if (rInAttrs.GetItemState(SCHATTR_AXIS_STEP_MAIN,sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         fStepMain = ((const SvxDoubleItem*)pPoolItem)->GetValue();
-        aFmtFldStepMain.SetValue( fStepMain );
+        lcl_setValue( aFmtFldStepMain, fStepMain );
+        m_aMt_MainDateStep.SetValue( static_cast<sal_Int32>(fStepMain) );
     }
     if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_STEP_HELP,sal_True, &pPoolItem) == SFX_ITEM_SET)
         aCbxAutoStepHelp.Check(((const SfxBoolItem*)pPoolItem)->GetValue());
@@ -329,14 +538,30 @@ void ScaleTabPage::Reset(const SfxItemSet& rInAttrs)
     if (rInAttrs.GetItemState(SCHATTR_AXIS_ORIGIN,sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         fOrigin = ((const SvxDoubleItem*)pPoolItem)->GetValue();
-        aFmtFldOrigin.SetValue( fOrigin );
+        lcl_setValue( aFmtFldOrigin, fOrigin );
     }
 
-    EnableValueHdl(&aCbxAutoMin);
-    EnableValueHdl(&aCbxAutoMax);
-    EnableValueHdl(&aCbxAutoStepMain);
-    EnableValueHdl(&aCbxAutoStepHelp);
-    EnableValueHdl(&aCbxAutoOrigin);
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,TRUE, &pPoolItem) == SFX_ITEM_SET)
+        m_aCbx_AutoTimeResolution.Check(((const SfxBoolItem*)pPoolItem)->GetValue());
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_TIME_RESOLUTION,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    {
+        m_nTimeResolution = ((const SfxInt32Item*)pPoolItem)->GetValue();
+        m_aLB_TimeResolution.SelectEntryPos( m_nTimeResolution );
+    }
+
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_MAIN_TIME_UNIT,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    {
+        m_nMainTimeUnit = ((const SfxInt32Item*)pPoolItem)->GetValue();
+        m_aLB_MainTimeUnit.SelectEntryPos( m_nMainTimeUnit );
+    }
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_HELP_TIME_UNIT,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    {
+        m_nHelpTimeUnit = ((const SfxInt32Item*)pPoolItem)->GetValue();
+        m_aLB_HelpTimeUnit.SelectEntryPos( m_nHelpTimeUnit );
+    }
+
+    EnableControls();
+    SetNumFormat();
 }
 
 int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
@@ -347,6 +572,8 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
         return LEAVE_PAGE;
     }
 
+    bool bDateAxis = chart2::AxisType::DATE == m_nAxisType;
+
     sal_uInt32 nIndex = pNumFormatter->GetStandardIndex(LANGUAGE_SYSTEM);
     const SfxPoolItem *pPoolItem = NULL;
     if( GetItemSet().GetItemState( SID_ATTR_NUMBERFORMAT_VALUE, sal_True, &pPoolItem ) == SFX_ITEM_SET )
@@ -356,75 +583,105 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
         OSL_ENSURE( false, "Using Standard Language" );
     }
 
-    Edit* pEdit = NULL;
+    Control* pControl = NULL;
     sal_uInt16 nErrStrId = 0;
     double fDummy;
 
     fMax = aFmtFldMax.GetValue();
     fMin = aFmtFldMin.GetValue();
     fOrigin = aFmtFldOrigin.GetValue();
-    fStepMain = aFmtFldStepMain.GetValue();
+    fStepMain = bDateAxis ? m_aMt_MainDateStep.GetValue() : aFmtFldStepMain.GetValue();
     nStepHelp = static_cast< sal_Int32 >( aMtStepHelp.GetValue());
+    m_nTimeResolution = m_aLB_TimeResolution.GetSelectEntryPos();
+    m_nMainTimeUnit = m_aLB_MainTimeUnit.GetSelectEntryPos();
+    m_nHelpTimeUnit = m_aLB_HelpTimeUnit.GetSelectEntryPos();
+
+    if( chart2::AxisType::REALNUMBER != m_nAxisType )
+        aCbxLogarithm.Show( false );
+
+    //check wich entries need user action
 
-    //do some reasonable automatic correction of user input if necessary
-    if (!aCbxAutoMax.IsChecked() && !aCbxAutoMin.IsChecked() &&
-             fMin >= fMax)
-    {
-        pEdit = &aFmtFldMin;
-        nErrStrId = STR_MIN_GREATER_MAX;
-    }
-    // check for entries in invalid ranges
     if ( aCbxLogarithm.IsChecked() &&
             ( ( !aCbxAutoMin.IsChecked() && fMin <= 0.0 )
              || ( !aCbxAutoMax.IsChecked() && fMax <= 0.0 ) ) )
     {
-        pEdit = &aFmtFldMin;
+        pControl = &aFmtFldMin;
         nErrStrId = STR_BAD_LOGARITHM;
     }
-    if (!aCbxAutoStepMain.IsChecked() && fStepMain <= 0)
+    else if (!aCbxAutoMax.IsChecked() && !aCbxAutoMin.IsChecked() &&
+             fMin >= fMax)
+    {
+        pControl = &aFmtFldMin;
+        nErrStrId = STR_MIN_GREATER_MAX;
+    }
+    else if (!aCbxAutoStepMain.IsChecked() && fStepMain <= 0)
     {
-        pEdit = &aFmtFldStepMain;
+        pControl = &aFmtFldStepMain;
         nErrStrId = STR_STEP_GT_ZERO;
     }
-
-    //check wich entries need user action
-
     // check for entries that cannot be parsed for the current number format
-    if ( aFmtFldMin.IsModified()
+    else if ( aFmtFldMin.IsModified()
         && !aCbxAutoMin.IsChecked()
         && !pNumFormatter->IsNumberFormat(aFmtFldMin.GetText(), nIndex, fDummy))
     {
-        pEdit = &aFmtFldMin;
+        pControl = &aFmtFldMin;
         nErrStrId = STR_INVALID_NUMBER;
     }
     else if (aFmtFldMax.IsModified() && !aCbxAutoMax.IsChecked() &&
              !pNumFormatter->IsNumberFormat(aFmtFldMax.GetText(),
                                             nIndex, fDummy))
     {
-        pEdit = &aFmtFldMax;
+        pControl = &aFmtFldMax;
         nErrStrId = STR_INVALID_NUMBER;
     }
-    else if (aFmtFldStepMain.IsModified() && !aCbxAutoStepMain.IsChecked() &&
+    else if ( !bDateAxis && aFmtFldStepMain.IsModified() && !aCbxAutoStepMain.IsChecked() &&
              !pNumFormatter->IsNumberFormat(aFmtFldStepMain.GetText(),
                                             nIndex, fDummy))
     {
-        pEdit = &aFmtFldStepMain;
+        pControl = &aFmtFldStepMain;
         nErrStrId = STR_STEP_GT_ZERO;
     }
     else if (aFmtFldOrigin.IsModified() && !aCbxAutoOrigin.IsChecked() &&
              !pNumFormatter->IsNumberFormat(aFmtFldOrigin.GetText(),
                                             nIndex, fDummy))
     {
-        pEdit = &aFmtFldOrigin;
+        pControl = &aFmtFldOrigin;
         nErrStrId = STR_INVALID_NUMBER;
     }
     else if (!aCbxAutoStepMain.IsChecked() && fStepMain <= 0.0)
     {
-        pEdit = &aFmtFldStepMain;
+        pControl = &aFmtFldStepMain;
         nErrStrId = STR_STEP_GT_ZERO;
     }
+    else if( bDateAxis )
+    {
+        if( !aCbxAutoStepMain.IsChecked() && !aCbxAutoStepHelp.IsChecked() )
+        {
+            if( m_nHelpTimeUnit > m_nMainTimeUnit )
+            {
+                pControl = &m_aLB_MainTimeUnit;
+                nErrStrId = STR_INVALID_INTERVALS;
+            }
+            else if( m_nHelpTimeUnit == m_nMainTimeUnit && nStepHelp > fStepMain )
+            {
+                pControl = &m_aLB_MainTimeUnit;
+                nErrStrId = STR_INVALID_INTERVALS;
+            }
+        }
+        if( !nErrStrId && !m_aCbx_AutoTimeResolution.IsChecked() )
+        {
+            if( (!aCbxAutoStepMain.IsChecked() && m_nTimeResolution > m_nMainTimeUnit )
+                ||
+                (!aCbxAutoStepHelp.IsChecked() && m_nTimeResolution > m_nHelpTimeUnit )
+                )
+            {
+                pControl = &m_aLB_TimeResolution;
+                nErrStrId = STR_INVALID_TIME_UNIT;
+            }
+        }
+    }
 
-    if( ShowWarning( nErrStrId, pEdit ) )
+    if( ShowWarning( nErrStrId, pControl ) )
         return KEEP_PAGE;
 
     if( pItemSet )
@@ -486,6 +743,19 @@ void ScaleTabPage::SetNumFormat()
                 else
                     nFmt = pNumFormatter->GetStandardFormat( NUMBERFORMAT_TIME );
             }
+
+            if( chart2::AxisType::DATE == m_nAxisType && ( eType != NUMBERFORMAT_DATE && eType != NUMBERFORMAT_DATETIME) )
+            {
+                const SvNumberformat* pFormat = pNumFormatter->GetEntry( nFmt );
+                if( pFormat )
+                    nFmt = pNumFormatter->GetStandardFormat( NUMBERFORMAT_DATE, pFormat->GetLanguage() );
+                else
+                    nFmt = pNumFormatter->GetStandardFormat( NUMBERFORMAT_DATE );
+
+                aFmtFldMax.SetFormatKey( nFmt );
+                aFmtFldMin.SetFormatKey( nFmt );
+                aFmtFldOrigin.SetFormatKey( nFmt );
+            }
         }
 
         aFmtFldStepMain.SetFormatKey( nFmt );
@@ -499,7 +769,7 @@ void ScaleTabPage::ShowAxisOrigin( bool bShowOrigin )
         m_bShowAxisOrigin = true;
 }
 
-bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Edit * pControl /* = NULL */ )
+bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Control* pControl /* = NULL */ )
 {
     if( nResIdMessage == 0 )
         return false;
@@ -508,7 +778,9 @@ bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Edit * pControl /* = N
     if( pControl )
     {
         pControl->GrabFocus();
-        pControl->SetSelection( Selection( 0, SELECTION_MAX ));
+        Edit* pEdit = dynamic_cast<Edit*>(pControl);
+        if(pEdit)
+            pEdit->SetSelection( Selection( 0, SELECTION_MAX ));
     }
     return true;
 }
diff --git a/chart2/source/controller/dialogs/tp_Scale.hrc b/chart2/source/controller/dialogs/tp_Scale.hrc
new file mode 100644
index 000000000000..bde6c21c7924
--- /dev/null
+++ b/chart2/source/controller/dialogs/tp_Scale.hrc
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "ResourceIds.hrc"
+
+#define FL_SCALE            1
+
+#define TXT_MIN             1
+#define TXT_MAX             2
+#define TXT_STEP_MAIN       3
+#define TXT_STEP_HELP_COUNT 4
+#define TXT_ORIGIN          5
+#define TXT_TIME_RESOLUTION 6
+#define TXT_AXIS_TYPE       7
+#define TXT_STEP_HELP       8
+
+#define CBX_AUTO_MIN        1
+#define CBX_AUTO_MAX        2
+#define CBX_AUTO_STEP_MAIN  3
+#define CBX_AUTO_STEP_HELP  4
+#define CBX_AUTO_ORIGIN     5
+#define CBX_LOGARITHM       6
+#define CBX_REVERSE         7
+#define CBX_AUTO_TIME_RESOLUTION 8
+
+#define EDT_STEP_MAIN       1
+#define EDT_MAX             2
+#define EDT_MIN             3
+#define EDT_ORIGIN          4
+
+#define MT_STEPHELP         10
+#define MT_MAIN_DATE_STEP   11
+
+#define LB_AXIS_TYPE        1
+#define LB_MAIN_TIME_UNIT   2
+#define LB_HELP_TIME_UNIT   3
+#define LB_TIME_RESOLUTION  4
+
+#define STR_LIST_TIME_UNIT  1
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index 2ae2d8290f86..a6892656ad7b 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -37,6 +37,8 @@
 #include <vcl/button.hxx>
 // header for MetricField
 #include <vcl/field.hxx>
+// header for class ListBox
+#include <vcl/lstbox.hxx>
 
 //.............................................................................
 namespace chart
@@ -64,6 +66,13 @@ public:
 private:
     FixedLine           aFlScale;
 
+    CheckBox            aCbxReverse;
+
+    CheckBox            aCbxLogarithm;
+
+    FixedText           m_aTxt_AxisType;
+    ListBox             m_aLB_AxisType;
+
     FixedText           aTxtMin;
     FormattedField      aFmtFldMin;
     CheckBox            aCbxAutoMin;
@@ -72,35 +81,47 @@ private:
     FormattedField      aFmtFldMax;
     CheckBox            aCbxAutoMax;
 
+    FixedText           m_aTxt_TimeResolution;
+    ListBox             m_aLB_TimeResolution;
+    CheckBox            m_aCbx_AutoTimeResolution;
+
     FixedText           aTxtMain;
     FormattedField      aFmtFldStepMain;
+    MetricField         m_aMt_MainDateStep;
+    ListBox             m_aLB_MainTimeUnit;
     CheckBox            aCbxAutoStepMain;
 
+    FixedText           aTxtHelpCount;
     FixedText           aTxtHelp;
     MetricField         aMtStepHelp;
+    ListBox             m_aLB_HelpTimeUnit;
     CheckBox            aCbxAutoStepHelp;
 
     FixedText           aTxtOrigin;
     FormattedField      aFmtFldOrigin;
     CheckBox            aCbxAutoOrigin;
 
-    CheckBox            aCbxLogarithm;
-    CheckBox            aCbxReverse;
-
     double              fMin;
     double              fMax;
     double              fStepMain;
     sal_Int32           nStepHelp;
     double              fOrigin;
-    int                 nAxisType;
+    sal_Int32           m_nTimeResolution;
+    sal_Int32           m_nMainTimeUnit;
+    sal_Int32           m_nHelpTimeUnit;
+    int                 m_nAxisType;
+    bool                m_bAllowDateAxis;
     SvNumberFormatter*  pNumFormatter;
 
     bool                m_bShowAxisOrigin;
 
     void AdjustControlPositions();
     void EnableControls();
+    void PlaceIntervalControlsAccordingToAxisType();
 
+    DECL_LINK( SelectAxisTypeHdl, void* );
     DECL_LINK( EnableValueHdl, CheckBox* );
+    DECL_LINK( FmtFieldModifiedHdl, FormattedField* );
 
     /** shows a warning window due to an invalid input.
 
@@ -115,7 +136,7 @@ private:
 
         @return false, if nResIdMessage was 0, true otherwise
      */
-    bool ShowWarning( sal_uInt16 nResIdMessage, Edit * pControl = NULL );
+    bool ShowWarning( sal_uInt16 nResIdMessage, Control* pControl = NULL );
 };
 
 //.............................................................................
diff --git a/chart2/source/controller/dialogs/tp_Scale.src b/chart2/source/controller/dialogs/tp_Scale.src
index 9e92e70f6f43..0b0e7efcdb9c 100644..100755
--- a/chart2/source/controller/dialogs/tp_Scale.src
+++ b/chart2/source/controller/dialogs/tp_Scale.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 #include "HelpIds.hrc"
-#include "TabPages.hrc"
+#include "tp_Scale.hrc"
 
 #define YLine1 3
 #define Y1 (YLine1+13)
@@ -33,16 +33,26 @@
 #define Y3 (Y2+16)
 #define Y4 (Y3+16)
 #define Y5 (Y4+16)
-#define Y6 (Y5+17)
-#define Y7 (Y6+15)
+#define Y6 (Y5+16)
+#define Y7 (Y6+16)
+#define Y8 (Y7+16)
 
 #define LABELWIDTH 88
-#define AUTOCHECKWIDTH 88
+#define AUTOCHECKWIDTH 41
 #define EDITWIDTH 50
 #define X1 6
 #define X2 11
 #define X3 (X2+LABELWIDTH+4)
 #define X4 (X3+EDITWIDTH+5)
+#define X5 (X4+AUTOCHECKWIDTH+5)
+
+#define STR_LIST_TIME_UNIT  \
+    StringList [ en-US ] = \
+    { \
+        "Days" ; \
+        "Months" ; \
+        "Years" ; \
+    };
 
 TabPage TP_SCALE
 {
@@ -57,86 +67,201 @@ TabPage TP_SCALE
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Scale" ;
     };
-    FixedText TXT_MIN
+    //---------------------------
+    CheckBox CBX_REVERSE
     {
+        HelpID = "chart2:CheckBox:TP_SCALE:CBX_REVERSE:ValueAxis";
         Pos = MAP_APPFONT ( X2 , Y1  ) ;
+        Size = MAP_APPFONT ( 244 , 10 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "~Reverse direction" ;
+    };
+    //---------------------------
+    CheckBox CBX_LOGARITHM
+    {
+        HelpID = "chart2:CheckBox:TP_SCALE:CBX_LOGARITHM";
+        Pos = MAP_APPFONT ( X2 , Y2  ) ;
+        Size = MAP_APPFONT ( 244 , 10 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "~Logarithmic scale" ;
+    };
+    //---------------------------
+    FixedText TXT_AXIS_TYPE
+    {
+        Pos = MAP_APPFONT ( X2 , Y2  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
-        Text [ en-US ] = "~Minimum:" ;
+        Text [ en-US ] = "T~ype" ;
+    };
+    ListBox LB_AXIS_TYPE
+    {
+        HelpID = "chart2:ListBox:TP_SCALE:LB_AXIS_TYPE";
+        Border = TRUE ;
+        AutoHScroll = TRUE ;
+        Pos = MAP_APPFONT ( X3 , Y2-2  ) ;
+        Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
+        TabStop = TRUE ;
+        Group = TRUE ;
+        DropDown=TRUE;
+        DDExtraWidth = TRUE ;
+
+        StringList [ en-US ] =
+        {
+            "Automatic" ;
+            "Text" ;
+            "Date" ;
+        };
+    };
+    //---------------------------
+    FixedText TXT_MIN
+    {
+        Pos = MAP_APPFONT ( X2 , Y3  ) ;
+        Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
+        Text [ en-US ] = "~Minimum" ;
     };
     SpinField EDT_MIN
     {
         HelpID = "chart2:SpinField:TP_SCALE:EDT_MIN";
         Border = TRUE ;
         SVLook = TRUE ;
-        Pos = MAP_APPFONT ( X3 , Y1-2 ) ;
+        Pos = MAP_APPFONT ( X3 , Y3-2 ) ;
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
     };
     CheckBox CBX_AUTO_MIN
     {
         HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_MIN";
-        Pos = MAP_APPFONT ( X4 , Y1-1  ) ;
+        Pos = MAP_APPFONT ( X4 , Y3+1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "~Automatic" ;
     };
-
+    //---------------------------
     FixedText TXT_MAX
     {
-        Pos = MAP_APPFONT ( X2 , Y2  ) ;
+        Pos = MAP_APPFONT ( X2 , Y4  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
-        Text [ en-US ] = "Ma~ximum:" ;
+        Text [ en-US ] = "Ma~ximum" ;
     };
     SpinField EDT_MAX
     {
         HelpID = "chart2:SpinField:TP_SCALE:EDT_MAX";
         Border = TRUE ;
         SVLook = TRUE ;
-        Pos = MAP_APPFONT ( X3 , Y2-2  ) ;
+        Pos = MAP_APPFONT ( X3 , Y4-2  ) ;
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
     };
     CheckBox CBX_AUTO_MAX
     {
         HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_MAX";
-        Pos = MAP_APPFONT ( X4 , Y2-1  ) ;
+        Pos = MAP_APPFONT ( X4 , Y4+1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "A~utomatic" ;
     };
+    //---------------------------
+    FixedText TXT_TIME_RESOLUTION
+    {
+        Pos = MAP_APPFONT ( X2 , Y5  ) ;
+        Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
+        Text [ en-US ] = "R~esolution" ;
+    };
+    ListBox LB_TIME_RESOLUTION
+    {
+        HelpID = "chart2:ListBox:TP_SCALE:LB_TIME_RESOLUTION";
+        Border = TRUE ;
+        AutoHScroll = TRUE ;
+        Pos = MAP_APPFONT ( X3 , Y5-2  ) ;
+        Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
+        TabStop = TRUE ;
+        Group = TRUE ;
+        DropDown=TRUE;
+        DDExtraWidth = TRUE ;
+
+        STR_LIST_TIME_UNIT
+    };
+    CheckBox CBX_AUTO_TIME_RESOLUTION
+    {
+        HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_TIME_RESOLUTION";
+        Pos = MAP_APPFONT ( X4 , Y5+1  ) ;
+        Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "Automat~ic" ;
+    };
+    //---------------------------
     FixedText TXT_STEP_MAIN
     {
-        Pos = MAP_APPFONT ( X2 , Y3  ) ;
+        Pos = MAP_APPFONT ( X2 , Y5  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
-        Text [ en-US ] = "Ma~jor interval:" ;
+        Text [ en-US ] = "Ma~jor interval" ;
     };
     SpinField EDT_STEP_MAIN
     {
         HelpID = "chart2:SpinField:TP_SCALE:EDT_STEP_MAIN";
         Border = TRUE ;
-        Pos = MAP_APPFONT ( X3 , Y3-2  ) ;
+        Pos = MAP_APPFONT ( X3 , Y5-2  ) ;
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
     };
+    MetricField MT_MAIN_DATE_STEP
+    {
+        HelpID = "chart2:MetricField:TP_SCALE:MT_MAIN_DATE_STEP";
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( X3 , Y6-2  ) ;
+        Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
+        TabStop = TRUE ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Minimum = 1 ;
+        Maximum = 100000 ;
+        StrictFormat = TRUE ;
+        Unit = FUNIT_CUSTOM ;
+        First = 1 ;
+        Last = 100000 ;
+        SpinSize = 1 ;
+    };
+
+    ListBox LB_MAIN_TIME_UNIT
+    {
+        HelpID = "chart2:ListBox:TP_SCALE:LB_MAIN_TIME_UNIT";
+        Border = TRUE ;
+        AutoHScroll = TRUE ;
+        Pos = MAP_APPFONT ( X5 , Y6-2  ) ;
+        Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
+        TabStop = TRUE ;
+        Group = TRUE ;
+        DropDown=TRUE;
+        DDExtraWidth = TRUE ;
+
+        STR_LIST_TIME_UNIT
+    };
+
     CheckBox CBX_AUTO_STEP_MAIN
     {
         HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_MAIN";
-        Pos = MAP_APPFONT ( X4 , Y3-1  ) ;
+        Pos = MAP_APPFONT ( X4 , Y5+1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Au~tomatic" ;
     };
+    //---------------------------
+    FixedText TXT_STEP_HELP_COUNT
+    {
+        Pos = MAP_APPFONT ( X2 , Y6  ) ;
+        Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
+        Text [ en-US ] = "Minor inter~val count" ;
+    };
     FixedText TXT_STEP_HELP
     {
-        Pos = MAP_APPFONT ( X2 , Y4  ) ;
+        Pos = MAP_APPFONT ( X2 , Y7  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
-        Text [ en-US ] = "Minor interval ~count:" ;
+        Text [ en-US ] = "Minor inter~val" ;
     };
     MetricField MT_STEPHELP
     {
         HelpID = "chart2:MetricField:TP_SCALE:MT_STEPHELP";
         Border = TRUE ;
-        Pos = MAP_APPFONT ( X3 , Y4-2  ) ;
+        Pos = MAP_APPFONT ( X3 , Y6-2  ) ;
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
@@ -149,55 +274,51 @@ TabPage TP_SCALE
         Last = 100 ;
         SpinSize = 1 ;
     };
+    ListBox LB_HELP_TIME_UNIT
+    {
+        HelpID = "chart2:ListBox:TP_SCALE:LB_HELP_TIME_UNIT";
+        Border = TRUE ;
+        AutoHScroll = TRUE ;
+        Pos = MAP_APPFONT ( X5 , Y7-2  ) ;
+        Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
+        TabStop = TRUE ;
+        Group = TRUE ;
+        DropDown=TRUE;
+        DDExtraWidth = TRUE ;
+
+        STR_LIST_TIME_UNIT
+    };
     CheckBox CBX_AUTO_STEP_HELP
     {
         HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_HELP";
-        Pos = MAP_APPFONT ( X4 , Y4-1  ) ;
+        Pos = MAP_APPFONT ( X4 , Y6+1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Aut~omatic" ;
     };
-
+    //---------------------------
     FixedText TXT_ORIGIN
     {
-        Pos = MAP_APPFONT ( X2 , Y5  ) ;
+        Pos = MAP_APPFONT ( X2 , Y7  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
-        Text [ en-US ] = "Reference ~value:" ;
+        Text [ en-US ] = "Re~ference value" ;
     };
     SpinField EDT_ORIGIN
     {
         HelpID = "chart2:SpinField:TP_SCALE:EDT_ORIGIN";
         Border = TRUE ;
         SVLook = TRUE ;
-        Pos = MAP_APPFONT ( X3 , Y5-2  ) ;
+        Pos = MAP_APPFONT ( X3 , Y7-2  ) ;
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
     };
     CheckBox CBX_AUTO_ORIGIN
     {
         HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN";
-        Pos = MAP_APPFONT ( X4 , Y5-1  ) ;
+        Pos = MAP_APPFONT ( X4 , Y7+1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Automat~ic" ;
     };
-
-    CheckBox CBX_LOGARITHM
-    {
-        HelpID = "chart2:CheckBox:TP_SCALE:CBX_LOGARITHM";
-        Pos = MAP_APPFONT ( X2 , Y6  ) ;
-        Size = MAP_APPFONT ( 244 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Logarithmic scale" ;
-    };
-
-    CheckBox CBX_REVERSE
-    {
-        HelpID = "chart2:CheckBox:TP_SCALE:CBX_REVERSE";
-        Pos = MAP_APPFONT ( X2 , Y7  ) ;
-        Size = MAP_APPFONT ( 244 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Reverse direction" ;
-    };
-
+    //---------------------------
 };