[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - oox/source

[Muthu Subramanian]

 oox/source/drawingml/chart/axisconverter.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit f0e7e96f4f65af8dd0f74e43a092171391bcbeb5
Author: Muthu Subramanian <sumuthu at collabora.com>
Date:   Wed Sep 11 21:41:43 2013 +0530

    n#834720: Labels wrongly interpreted as dates.
    
    If the numFormat is available we should probably use that.

diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index dfc08b8..da1a732 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -310,10 +310,8 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
         {
             bool bPercent = false;
             if( mrModel.maNumberFormat.maFormatCode.indexOf('%') >= 0)
-            {
-                mrModel.maNumberFormat.mbSourceLinked = false;
                 bPercent = true;
-            }
+            mrModel.maNumberFormat.mbSourceLinked = false;
             getFormatter().convertNumberFormat( aAxisProp, mrModel.maNumberFormat, bPercent );
         }
 
commit da7ab1cf6183194eee55a012a2113f9c09c61158
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Mon Sep 9 21:05:42 2013 +0530

    n#834722: Chart shown flipped.
    
    Auto and manual axis positioning seems to cause a problem.
    Needs to be tested with more charts.

diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index 1f725d6..dfc08b8 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -327,7 +327,8 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
             case XML_max:       eAxisPos = cssc::ChartAxisPosition_END;     break;
             case XML_autoZero:  eAxisPos = cssc::ChartAxisPosition_VALUE;   break;
         }
-        aAxisProp.setProperty( PROP_CrossoverPosition, eAxisPos );
+        if( !mrModel.mbAuto )
+            aAxisProp.setProperty( PROP_CrossoverPosition, eAxisPos );
 
         // calculate automatic origin depending on scaling mode of crossing axis
         bool bCrossingLogScale = pCrossingAxis && lclIsLogarithmicScale( *pCrossingAxis );