summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2013-06-13 16:16:58 +0200
committerJan Holesovsky <kendy@suse.cz>2013-06-13 16:24:19 +0200
commit8473b3b3b1768230b6604c5da2c28b804554392a (patch)
treeecafe9ebd879d5310f444596a1f969dab9866c80 /oox
parentc0ec2caf1b35c5bc296f0ce86082eb0a6e2b19b2 (diff)
Revert "bnc#819614: Fix runaway lines."
This reverts commit 5fe65c0c5e5a8d815d9d15ef192e7652726662e6. Unfortunately this causes a regression elsewhere. This also disables the unit test for this bug - will re-enable when I find a fix that both fixes this, and does not regress other stuff :-) Change-Id: Iad334e3c59c928edb78f25c0f36a33a26a7e6125
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/customshapegeometry.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index 20458f0f3591..3155b893c198 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -406,9 +406,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