oox/source/drawingml/customshapegeometry.cxx | 5 ++--- sd/qa/unit/import-tests.cxx | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit 8473b3b3b1768230b6604c5da2c28b804554392a Author: Jan Holesovsky <[email protected]> Date: Thu Jun 13 16:16:58 2013 +0200 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 diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 20458f0..3155b89 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 diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 8babd50d..cd2f5ff 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -65,7 +65,7 @@ void SdFiltersTest::testDocumentLayout() { "pptx/fdo47434-all.pptx", "pptx/xml/fdo47434_page" }, { "n758621.ppt", "xml/n758621_" }, { "fdo64586.ppt", "xml/fdo64586_" }, - { "n819614.pptx", "xml/n819614_" }, + // FIXME re-enable again when a better fix is found { "n819614.pptx", "xml/n819614_" }, { "n820786.pptx", "xml/n820786_" }, }; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
