*** orig/chart2/source/view/axes/ScaleAutomatism.cxx Fri Jun 6 17:17:48 2008 --- new/chart2/source/view/axes/ScaleAutomatism.cxx Mon Jul 28 09:32:24 2008 *************** *** 707,712 **** --- 707,718 ---- } } + void ScaleAutomatism::getMinimumAndMaximiumValues( double& rfMinimum, double& rfMaximum ) const + { + rfMinimum = m_fValueMinimum; + rfMaximum = m_fValueMaximum; + } + //............................................................................. } //namespace chart //............................................................................. *** orig/chart2/source/view/inc/ScaleAutomatism.hxx Fri Apr 11 06:42:46 2008 --- new/chart2/source/view/inc/ScaleAutomatism.hxx Mon Jul 28 09:30:04 2008 *************** *** 83,88 **** --- 83,90 ---- ::com::sun::star::chart2::ExplicitScaleData& rExplicitScale, ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement ) const; + void getMinimumAndMaximiumValues( double& rfMinimum, double& rfMaximum ) const; + private: /** Fills the passed scale data and increment data for category scaling. */ void calculateExplicitIncrementAndScaleForCategory( *** orig/chart2/source/view/main/ChartView.cxx Fri Jun 6 17:19:10 2008 --- new/chart2/source/view/main/ChartView.cxx Tue Jul 29 11:05:02 2008 *************** *** 929,936 **** --- 929,943 ---- continue; for( nC=0; nC < aVCooSysList_Y.size(); nC++) + { aVCooSysList_Y[nC]->prepareScaleAutomatismForDimensionAndIndex(rAxisUsage.aScaleAutomatism,1,nAxisIndex); + double fMinimum, fMaximum; + rAxisUsage.aScaleAutomatism.getMinimumAndMaximiumValues( fMinimum, fMaximum ); + if( ::rtl::math::isNan( fMinimum ) && ::rtl::math::isNan( fMaximum ) ) + aVCooSysList_Y[nC]->prepareScaleAutomatismForDimensionAndIndex(rAxisUsage.aScaleAutomatism,1,m_nMaxAxisIndex-nAxisIndex ); + } + ExplicitScaleData aExplicitScale; ExplicitIncrementData aExplicitIncrement; rAxisUsage.aScaleAutomatism.calculateExplicitScaleAndIncrement( aExplicitScale, aExplicitIncrement );