diff options
| author | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2010-12-09 18:32:46 +0100 |
|---|---|---|
| committer | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2010-12-09 18:32:46 +0100 |
| commit | 78ba4fee2a17e4195553f54dc183899fc12388f0 (patch) | |
| tree | 9200c132801d54c24c7ab0e92ae72ab7f72724c1 /chart2/source | |
| parent | c6d4bf0e169d75da33d9da33079b4ad9b07bce32 (diff) | |
chart46: #i25706# implement date axis - remove explicit scaling in case of auto
Diffstat (limited to 'chart2/source')
| -rw-r--r-- | chart2/source/controller/dialogs/tp_Scale.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/tools/AxisHelper.cxx | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 3ff3dfe73..bf53ae340 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -421,7 +421,7 @@ 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())); diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 965eede6e..7bf5be91c 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -137,7 +137,10 @@ chart2::ScaleData AxisHelper::getDateCheckedScale( const Reference< chart2::XAxi void AxisHelper::checkDateAxis( chart2::ScaleData& rScale, ExplicitCategoriesProvider* pExplicitCategoriesProvider, bool bChartTypeAllowsDateAxis ) { if( rScale.AutoDateAxis && rScale.AxisType == AxisType::CATEGORY && bChartTypeAllowsDateAxis ) + { rScale.AxisType = AxisType::DATE; + removeExplicitScaling( rScale ); + } if( rScale.AxisType == AxisType::DATE && (!pExplicitCategoriesProvider || !pExplicitCategoriesProvider->isDateAxis()) ) { rScale.AxisType = AxisType::CATEGORY; |