oox/source/export/shapes.cxx | 18 ++++++++++++++----
sw/qa/extras/ooxmlexport/data/flip_and_rotate.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 19 +++++++++++++++++++
3 files changed, 33 insertions(+), 4 deletions(-)
New commits:
commit c756fb14769373b700fd41d4f64e8e902480645b
Author: Andras Timar <andras.ti...@collabora.com>
Date: Fri Jan 29 16:42:31 2016 +0100
tdf#92077 Improve DrawingML export of rotated/flipped customshapes
When we export the customshape as polypolygon, we need to
take into account, that the polypolygon of the shape already
has flipped coordinates, but coordinates has to be relative
to the rotated bounding rectangle.
Reviewed-on: https://gerrit.libreoffice.org/21905
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
(cherry picked from commit bd36889b2caa4a74d647e18fc52e455f83529be9)
Change-Id: I4f3b015e439d3d6041adc67eddd460f5bd4dfca1
Reviewed-on: https://gerrit.libreoffice.org/22103
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index c3b8b8e..c20d69d 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -713,9 +713,7 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference<
XShape > xShape )
pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
// moon is flipped in MSO, and mso-spt89 (right up arrow) is mapped to
leftUpArrow
if ( sShapeType == "moon" || sShapeType == "mso-spt89" )
- WriteShapeTransformation( xShape, XML_a, !bFlipH, bFlipV );
- else
- WriteShapeTransformation( xShape, XML_a, bFlipH, bFlipV );
+ bFlipH = !bFlipH;
// we export non-primitive shapes to custom geometry
// we also export non-ooxml shapes which have handles/equations to custom
geometry, because
@@ -736,14 +734,26 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference<
XShape > xShape )
if (bHasHandles && bCustGeom && pShape)
{
- WritePolyPolygon( tools::PolyPolygon( pShape->GetLineGeometry(true) )
);
+ WriteShapeTransformation( xShape, XML_a ); // do not flip, polypolygon
coordinates are flipped already
+ tools::PolyPolygon aPolyPolygon( pShape->GetLineGeometry(true) );
+ sal_Int32 nRotation = 0;
+ // The RotateAngle property's value is independent from any flipping,
and that's exactly what we need here.
+ uno::Reference<beans::XPropertySet> xPropertySet(xShape,
uno::UNO_QUERY);
+ uno::Reference<beans::XPropertySetInfo> xPropertySetInfo =
xPropertySet->getPropertySetInfo();
+ if (xPropertySetInfo->hasPropertyByName("RotateAngle"))
+ xPropertySet->getPropertyValue("RotateAngle") >>= nRotation;
+ if (nRotation != 0)
+ aPolyPolygon.Rotate(Point(0,0),
static_cast<sal_uInt16>(3600-nRotation/10));
+ WritePolyPolygon( aPolyPolygon );
}
else if (bCustGeom)
{
+ WriteShapeTransformation( xShape, XML_a, bFlipH, bFlipV );
WriteCustomGeometry( xShape );
}
else // preset geometry
{
+ WriteShapeTransformation( xShape, XML_a, bFlipH, bFlipV );
if( nAdjustmentValuesIndex != -1 )
{
sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0;
diff --git a/sw/qa/extras/ooxmlexport/data/flip_and_rotate.odt
b/sw/qa/extras/ooxmlexport/data/flip_and_rotate.odt
new file mode 100644
index 0000000..4805bfa
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/flip_and_rotate.odt
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index cfa1ddb..6463c80 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -1103,6 +1103,25 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675,
"no-numlevel-but-indented.odt")
assertXPath(pXmlDoc, "//w:ind", "start", "1418");
}
+DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
+{
+ xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+ if (!pXmlDoc)
+ return;
+ // there should be no flipH and flipV attributes in this case
+ assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
+ assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
+ // check rotation angle
+ assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
+ // check the first few coordinates of the polygon
+ assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x",
"2351");
+ assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y",
"3171");
+ assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x",
"1695");
+ assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y",
"3171");
+ assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x",
"1695");
+ assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y",
"1701");
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
