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

[Petr Mladek]

 oox/source/drawingml/customshapegeometry.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit f882db81d1261383fd980b6a0790ae4fd94ecd9d
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Jun 13 14:30:06 2013 +0200

    Revert "bnc#819614: Fix runaway lines."
    
    It caused several regressions when displaying shapes; for example,
    in the test document for bnc#762695:
    
        + missing hyperboloids on several slides, e.g. 13, 14, 15
        + broken bubles on slide 32
    
    This reverts commit c4345bcf488d24a45a6412cda41474de6baf00da.

diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index 55cf132..dada581 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -407,9 +407,8 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
                     n = rValue[ 1 ];
             }
             if ( ( n >= '0' ) && ( n <= '9' ) )
-            {
-                // seems to be a ST_Coordinate - convert EMUs to 1/100th mm
-                aRet.Value = Any( GetCoordinate( rValue ) );
+            {   // seems to be a ST_Coordinate
+                aRet.Value = Any( (sal_Int32)(rValue.toInt32() ) );
                 aRet.Type = EnhancedCustomShapeParameterType::NORMAL;
             }
             else