Kaydet (Commit) b0f10dd3 authored tarafından Jan Holesovsky's avatar Jan Holesovsky

Revert "bnc#819614: Fix runaway lines."

This reverts commit 5fe65c0c.

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
üst e0cce521
...@@ -406,9 +406,8 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu ...@@ -406,9 +406,8 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
n = rValue[ 1 ]; n = rValue[ 1 ];
} }
if ( ( n >= '0' ) && ( n <= '9' ) ) if ( ( n >= '0' ) && ( n <= '9' ) )
{ { // seems to be a ST_Coordinate
// seems to be a ST_Coordinate - convert EMUs to 1/100th mm aRet.Value = Any( (sal_Int32)(rValue.toInt32() ) );
aRet.Value = Any( GetCoordinate( rValue ) );
aRet.Type = EnhancedCustomShapeParameterType::NORMAL; aRet.Type = EnhancedCustomShapeParameterType::NORMAL;
} }
else else
......
...@@ -65,7 +65,7 @@ void SdFiltersTest::testDocumentLayout() ...@@ -65,7 +65,7 @@ void SdFiltersTest::testDocumentLayout()
{ "pptx/fdo47434-all.pptx", "pptx/xml/fdo47434_page" }, { "pptx/fdo47434-all.pptx", "pptx/xml/fdo47434_page" },
{ "n758621.ppt", "xml/n758621_" }, { "n758621.ppt", "xml/n758621_" },
{ "fdo64586.ppt", "xml/fdo64586_" }, { "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_" }, { "n820786.pptx", "xml/n820786_" },
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment