diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-10-23 11:20:34 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2017-10-23 16:27:02 +0200 |
| commit | f68c1a0f03b974839b02cbff400f1a2785489c87 (patch) | |
| tree | 91d940bcb720e0fb001937283f2e651e954cf9fc | |
| parent | 9794d194eddf004cc6c27eb25bd889193ada79ad (diff) | |
tdf#113263 Revert "PPTX export: correct position for shape in group"
This reverts commit fd3383556881d6a9d73e1a3027c079cf9bfddecb.
Change-Id: Ia9befead3b45975d91215cea584b32afadb5bd52
Reviewed-on: https://gerrit.libreoffice.org/43711
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
| -rw-r--r-- | oox/source/export/drawingml.cxx | 9 | ||||
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml2.cxx | 4 |
2 files changed, 0 insertions, 13 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 953c16467596..e17553e1e18f 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1300,15 +1300,6 @@ void DrawingML::WriteShapeTransformation( const Reference< XShape >& rXShape, sa aPos.X -= aParentPos.X; 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 ) aSize.Width = 1000; diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index e430e37b4c4a..89e3c5c2c8fd 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -1251,10 +1251,6 @@ void SdOOXMLExportTest2::testSmartartRotation2() 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: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() |