ooo-build r14450 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Oct 31 18:33:34 2008
New Revision: 14450
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14450&view=rev

Log:
2008-10-31  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/chart-maximum-minimum-typo.diff: fixed a typo that 
	causes incorrect scaling of axes under certain conditions (i#95714).

	* patches/dev300/apply: apply this new patch.


Added:
   trunk/patches/dev300/chart-maximum-minimum-typo.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Oct 31 18:33:34 2008
@@ -820,6 +820,9 @@
 # Don't insert drill-down sheet in read-only mode.
 calc-dp-no-drilldown-when-readonly.diff, i#90402, kohei
 
+# Fix a typo in chart2 that causes incorrect scaling under certain conditions.
+chart-maximum-minimum-typo.diff, i#95714, kohei
+
 [ CalcFixes < ooo300-m3 ]
 # Fix a regression on filtering by page field.
 calc-fix-datapilot-date-filter.diff, i#90022, kohei

Added: trunk/patches/dev300/chart-maximum-minimum-typo.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/chart-maximum-minimum-typo.diff	Fri Oct 31 18:33:34 2008
@@ -0,0 +1,22 @@
+diff --git chart2/source/view/axes/ScaleAutomatism.cxx chart2/source/view/axes/ScaleAutomatism.cxx
+index 3525843..711a911 100644
+--- chart2/source/view/axes/ScaleAutomatism.cxx
++++ chart2/source/view/axes/ScaleAutomatism.cxx
+@@ -134,7 +134,7 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
+         if( m_aSourceScale.AxisType==AxisType::PERCENT )
+             rExplicitScale.Minimum = 0.0;
+         else if( ::rtl::math::isNan( m_fValueMinimum ) )
+-            rExplicitScale.Minimum = 0.0;   //@todo get Minimum from scsaling or from plotter????
++            rExplicitScale.Minimum = 0.0;   //@todo get Minimum from scaling or from plotter????
+         else
+             rExplicitScale.Minimum = m_fValueMinimum;
+     }
+@@ -143,7 +143,7 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
+     if( bAutoMaximum )
+     {
+         if( m_aSourceScale.AxisType==AxisType::PERCENT )
+-            rExplicitScale.Minimum = 1.0;
++            rExplicitScale.Maximum = 1.0;
+         else if( ::rtl::math::isNan( m_fValueMaximum ) )
+             rExplicitScale.Maximum = 10.0;  //@todo get Maximum from scaling or from plotter????
+         else