summaryrefslogtreecommitdiff
path: root/drawinglayer/source/tools/emfppen.cxx
diff options
context:
space:
mode:
authorBartosz Kosiorek <gang65@poczta.onet.pl>2019-01-06 01:17:33 +0100
committerBartosz Kosiorek <gang65@poczta.onet.pl>2019-01-07 23:17:57 +0100
commit7809ec859d5bdb5dedb259a362a15324088b334c (patch)
treec864cfc9f04c34f9a07134d48fff5f7a4d8cb25a /drawinglayer/source/tools/emfppen.cxx
parenta6572f5f014ed159e340ed31b6e5a08527c09088 (diff)
tdf#122498 EMF+ Fix rotation of Ellipse, Arc and Pie
To draw any shape with EMF+ the shape needs to be created and next the transformation matrix needs to be applied. Unfortunately for Ellipse, Arc and Pie only position and ratio was transformed. The rotation was not handled correctly. With this patch the transformation matrix is applied after creation of the shape. Change-Id: I63a797e7cddfd304f94e7e5c8e2ce15063dc55e5 Reviewed-on: https://gerrit.libreoffice.org/65898 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'drawinglayer/source/tools/emfppen.cxx')
-rw-r--r--drawinglayer/source/tools/emfppen.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/drawinglayer/source/tools/emfppen.cxx b/drawinglayer/source/tools/emfppen.cxx
index 637c0e2d2011..eb0f593f9867 100644
--- a/drawinglayer/source/tools/emfppen.cxx
+++ b/drawinglayer/source/tools/emfppen.cxx
@@ -173,6 +173,7 @@ namespace emfplushelper
if (penDataFlags & PenDataTransform)
{
EmfPlusHelperData::readXForm(s, pen_transformation);
+ SAL_WARN("drawinglayer", "EMF+\t\t TODO PenDataTransform: " << pen_transformation);
}
if (penDataFlags & PenDataStartCap)
@@ -198,6 +199,7 @@ namespace emfplushelper
if (penDataFlags & PenDataJoin)
{
s.ReadInt32(lineJoin);
+ SAL_WARN("drawinglayer", "EMF+\t\t TODO PenDataJoin: 0x" << std::hex << lineJoin);
}
else
{
@@ -207,6 +209,7 @@ namespace emfplushelper
if (penDataFlags & PenDataMiterLimit)
{
s.ReadFloat(mitterLimit);
+ SAL_WARN("drawinglayer", "EMF+\t\t TODO PenDataMiterLimit: 0x" << std::hex << mitterLimit);
}
else
{
@@ -226,6 +229,7 @@ namespace emfplushelper
if (penDataFlags & PenDataDashedLineCap)
{
s.ReadInt32(dashCap);
+ SAL_WARN("drawinglayer", "EMF+\t\t TODO PenDataDashedLineCap: 0x" << std::hex << dashCap);
}
else
{
@@ -235,6 +239,7 @@ namespace emfplushelper
if (penDataFlags & PenDataDashedLineOffset)
{
s.ReadFloat(dashOffset);
+ SAL_WARN("drawinglayer", "EMF+\t\t TODO PenDataDashedLineOffset: 0x" << std::hex << dashOffset);
}
else
{
@@ -266,6 +271,7 @@ namespace emfplushelper
if (penDataFlags & PenDataNonCenter)
{
s.ReadInt32(alignment);
+ SAL_WARN("drawinglayer", "EMF+\t\t TODO PenDataNonCenter: 0x" << std::hex << alignment);
}
else
{
@@ -288,6 +294,7 @@ namespace emfplushelper
{
s.ReadFloat(compoundArray[i]);
}
+ SAL_WARN("drawinglayer", "EMF+\t\t TODO PenDataCompoundLine: 0x");
}
if (penDataFlags & PenDataCustomStartCap)