diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-09 10:47:25 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-09 12:38:36 +0200 |
commit | e4d7136a07419a18e0add48f97212931939e3fee (patch) | |
tree | 72d8111c4b7147b18de4b3e569e899a7fcbeff6f | |
parent | fdo#77140 embeddedobj: avoid unneeded conversion in ConvertBufferToFormat() (diff) | |
download | core-e4d7136a07419a18e0add48f97212931939e3fee.tar.gz core-e4d7136a07419a18e0add48f97212931939e3fee.zip |
fdo#77229 EMF+ rendering: improve EmfPlusSetClipPath's CombineModeExclude case
This is still not perfect, but at least we now don't do the opposite of
what was asked.
Change-Id: I5e144c5ec2987902e65b2eb472259d9c39bbbd11
(cherry picked from commit c2af50eb6df396c957890a6b912b8f3185893551)
-rw-r--r-- | cppcanvas/source/mtfrenderer/emfplus.cxx | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 56fe1dc9d320..49bc337af10b 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -115,6 +115,16 @@ const sal_uInt32 EmfPlusLineJoinTypeBevel = 0x00000001; const sal_uInt32 EmfPlusLineJoinTypeRound = 0x00000002; const sal_uInt32 EmfPlusLineJoinTypeMiterClipped = 0x00000003; +enum EmfPlusCombineMode +{ + EmfPlusCombineModeReplace = 0x00000000, + EmfPlusCombineModeIntersect = 0x00000001, + EmfPlusCombineModeUnion = 0x00000002, + EmfPlusCombineModeXOR = 0x00000003, + EmfPlusCombineModeExclude = 0x00000004, + EmfPlusCombineModeComplement = 0x00000005 +}; + using namespace ::com::sun::star; using namespace ::basegfx; @@ -2180,7 +2190,19 @@ namespace cppcanvas ::basegfx::B2DPolyPolygon& clipPoly (path.GetPolygon (*this)); clipPoly.transform (rState.mapModeTransform); - updateClipping (clipPoly, rFactoryParms, combineMode == 1); + switch (combineMode) + { + case EmfPlusCombineModeReplace: + case EmfPlusCombineModeIntersect: + case EmfPlusCombineModeUnion: // Is this, EmfPlusCombineModeXOR and EmfPlusCombineModeComplement correct? + case EmfPlusCombineModeXOR: + case EmfPlusCombineModeComplement: + updateClipping (clipPoly, rFactoryParms, combineMode == 1); + break; + case EmfPlusCombineModeExclude: + // Not doing anything is better then including exactly what we wanted to exclude. + break; + } break; } |