[Libreoffice-commits] core.git: drawinglayer/source
Armin Le Grand
alg at apache.org
Fri Sep 20 12:22:13 PDT 2013
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 677df250becd5cde71c6310f647e78ac3763347e
Author: Armin Le Grand <alg at apache.org>
Date: Fri Sep 20 14:09:31 2013 +0000
Resolves: #i123295# corrected object and clip rect...
in PDFExtOutDevData::EndGroup call in VclMetafileProcessor2D
(cherry picked from commit b756639c139f043a613df6ca16c18f426fca1f29)
Change-Id: I75faf2c8d925ec210cd74d8c29b90f5f9bf61ec8
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 85cb987..6858066 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;
More information about the Libreoffice-commits
mailing list