[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - oox/source

[Muthu Subramanian]

 oox/source/drawingml/chart/axisconverter.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit af6299687ef968a3731cbfa24c3820f5006b2823
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Thu Apr 25 17:37:32 2013 +0530

    n#813291: [PPTX] Axis Labels with percentage.
    
    Added the check only in the Axis Labels import.
    Maybe this check can be moved to convertNumberFormat()
    
    Conflicts:
    
    	oox/source/drawingml/chart/axisconverter.cxx
    
    Change-Id: I40adfa5e79292b45e97f617dbe2b9880af71be07

diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index d07d28c..887df65 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -316,9 +316,13 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
 
         if( (aScaleData.AxisType == cssc2::AxisType::REALNUMBER) || (aScaleData.AxisType == cssc2::AxisType::PERCENT) )
         {
+            bool bPercent = false;
             if( mrModel.maNumberFormat.maFormatCode.indexOfAsciiL("%",1) >= 0)
+            {
                 mrModel.maNumberFormat.mbSourceLinked = false;
-            getFormatter().convertNumberFormat( aAxisProp, mrModel.maNumberFormat );
+                bPercent = true;
+            }
+            getFormatter().convertNumberFormat( aAxisProp, mrModel.maNumberFormat, bPercent );
         }
 
         // position of crossing axis ------------------------------------------