diff options
author | Armin Le Grand <alg@apache.org> | 2013-09-20 14:09:31 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2013-09-20 14:09:31 +0000 |
commit | b756639c139f043a613df6ca16c18f426fca1f29 (patch) | |
tree | 072d0b2f335d187320ff07f7b7a3c2ff527a3c7e /drawinglayer | |
parent | 59f1fc72a3b32899c8378a6d10a6f875c8636101 (diff) |
i123295 corrected object and clip rect in PDFExtOutDevData::EndGroup call in VclMetafileProcessor2D
Notes
Notes:
merged as: 677df250becd5cde71c6310f647e78ac3763347e
Diffstat (limited to 'drawinglayer')
-rw-r--r-- | drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 81a0b303baa8..2d980e7b043a 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -834,10 +834,13 @@ namespace drawinglayer sal_Int32(ceil(aCropRange.getMaxX())), sal_Int32(ceil(aCropRange.getMaxY()))); } + // #123295# 3rd param is uncropped rect, 4th is cropped. The primitive has the cropped + // object transformation, thus aCurrentRect *is* the clip region while aCropRect is the expanded, + // uncropped region. Thus, correct order is aCropRect, aCurrentRect mpPDFExtOutDevData->EndGroup(rGraphicPrimitive.getGraphicObject().GetGraphic(), rAttr.GetTransparency(), - aCurrentRect, - aCropRect); + aCropRect, + aCurrentRect); } break; |