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

[Muthu Subramanian]

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

New commits:
commit 976a85dc20b0f274d0f51e9eb83e08b4763bdd2a
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()

diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index bf4b4f8..bade987 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -305,9 +305,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.indexOf('%') >= 0)
+            {
                 mrModel.maNumberFormat.mbSourceLinked = false;
-            getFormatter().convertNumberFormat( aAxisProp, mrModel.maNumberFormat );
+                bPercent = true;
+            }
+            getFormatter().convertNumberFormat( aAxisProp, mrModel.maNumberFormat, bPercent );
         }
 
         // position of crossing axis ------------------------------------------