diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-06-13 14:30:06 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-06-13 15:54:31 +0200 |
| commit | f882db81d1261383fd980b6a0790ae4fd94ecd9d (patch) | |
| tree | c15d8928ad12f184835702495b631deef67e6a6a | |
| parent | 4fa15ad7d6d0da49210fdea44622aee28dd066e2 (diff) | |
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.
| -rw-r--r-- | oox/source/drawingml/customshapegeometry.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 55cf13200ef3..dada58140b4d 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 |