Kaydet (Commit) f68c1a0f authored tarafından Szymon Kłos's avatar Szymon Kłos

tdf#113263 Revert "PPTX export: correct position for shape in group"

This reverts commit fd338355.

Change-Id: Ia9befead3b45975d91215cea584b32afadb5bd52
Reviewed-on: https://gerrit.libreoffice.org/43711Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarSzymon Kłos <szymon.klos@collabora.com>
üst 9794d194
...@@ -1300,15 +1300,6 @@ void DrawingML::WriteShapeTransformation( const Reference< XShape >& rXShape, sa ...@@ -1300,15 +1300,6 @@ void DrawingML::WriteShapeTransformation( const Reference< XShape >& rXShape, sa
aPos.X -= aParentPos.X; aPos.X -= aParentPos.X;
aPos.Y -= aParentPos.Y; aPos.Y -= aParentPos.Y;
} }
else if (m_xParent.is())
{
SdrObject* pShape = GetSdrObjectFromXShape(rXShape);
if (pShape)
{
aPos.X = pShape->GetRelativePos().getX();
aPos.Y = pShape->GetRelativePos().getY();
}
}
if ( aSize.Width < 0 ) if ( aSize.Width < 0 )
aSize.Width = 1000; aSize.Width = 1000;
......
...@@ -1251,10 +1251,6 @@ void SdOOXMLExportTest2::testSmartartRotation2() ...@@ -1251,10 +1251,6 @@ void SdOOXMLExportTest2::testSmartartRotation2()
xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[3]/p:txBody/a:bodyPr", "rot", "10800000"); assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[3]/p:txBody/a:bodyPr", "rot", "10800000");
assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[3]/p:spPr/a:xfrm/a:off", "x", "2276280");
assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[3]/p:spPr/a:xfrm/a:off", "y", "3158280");
assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[1]/p:spPr/a:xfrm/a:off", "x", "2031840");
assertXPath(pXmlDocContent, "/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[1]/p:spPr/a:xfrm/a:off", "y", "719640");
} }
void SdOOXMLExportTest2::testAccentColor() void SdOOXMLExportTest2::testAccentColor()
......
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