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

[Muthu Subramanian]

 oox/source/drawingml/chart/datasourcecontext.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2b11059578b624e76745a20eaa53e848abd0a194
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Thu Mar 28 20:12:54 2013 +0530

    n#810508: Fixes import of Scatternet and Bubble charts.
    
    xVal needs to be imported as double and not as strings.

diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx
index 087e6fd..9be8b0a 100644
--- a/oox/source/drawingml/chart/datasourcecontext.cxx
+++ b/oox/source/drawingml/chart/datasourcecontext.cxx
@@ -106,10 +106,10 @@ void DoubleSequenceContext::onCharacters( const OUString& rChars )
             {
                 /* Import categories as String even though it could
                  * be values.
+                 * n#810508: xVal needs to be imported as double
                  * TODO: NumberFormat conversion, remove the check then.
                  */
-                if( isParentElement( C_TOKEN( cat ), 4 ) ||
-                    isParentElement( C_TOKEN( xVal ), 4 ) )
+                if( isParentElement( C_TOKEN( cat ), 4 ) )
                     mrModel.maData[ mnPtIndex ] <<= rChars;
                 else
                     mrModel.maData[ mnPtIndex ] <<= rChars.toDouble();