Author: alg
Date: Fri Sep 20 14:09:31 2013
New Revision: 1525015
URL: http://svn.apache.org/r1525015
Log:
i123295 corrected object and clip rect in PDFExtOutDevData::EndGroup call in
VclMetafileProcessor2D
Modified:
openoffice/trunk/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
Modified:
openoffice/trunk/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx?rev=1525015&r1=1525014&r2=1525015&view=diff
==============================================================================
---
openoffice/trunk/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
(original)
+++
openoffice/trunk/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
Fri Sep 20 14:09:31 2013
@@ -834,11 +834,14 @@ namespace drawinglayer
sal_Int32(ceil(aCropRange.getMaxX())), sal_Int32(ceil(aCropRange.getMaxY())));
}
-
mpPDFExtOutDevData->EndGroup(rGraphicPrimitive.getGraphicObject().GetGraphic(),
- rAttr.GetTransparency(),
- aCurrentRect,
- aCropRect);
- }
+ // #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(),
+ aCropRect,
+ aCurrentRect);
+ }
break;
}
