summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2013-09-20 14:09:31 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-09-20 20:21:13 +0100
commit677df250becd5cde71c6310f647e78ac3763347e (patch)
tree287b92e7885422309797850b7603a35fb99e1747
parent3e4604b4642f6495d6e3f6a1317b1ab52eb4b569 (diff)
Resolves: #i123295# corrected object and clip rect...
in PDFExtOutDevData::EndGroup call in VclMetafileProcessor2D (cherry picked from commit b756639c139f043a613df6ca16c18f426fca1f29) Change-Id: I75faf2c8d925ec210cd74d8c29b90f5f9bf61ec8
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 85cb9871c574..6858066f7753 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -862,10 +862,13 @@ namespace drawinglayer
sal_Int32(ceil(aCropRange.getMaxX())), sal_Int32(ceil(aCropRange.getMaxY())));
}
+ // #i123295# 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;