[Libreoffice-commits] core.git: Branch 'aoo/trunk' - drawinglayer/source

[Armin Le Grand]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit b756639c139f043a613df6ca16c18f426fca1f29
Author: Armin Le Grand <alg at apache.org>
Date:   Fri Sep 20 14:09:31 2013 +0000

    i123295 corrected object and clip rect in PDFExtOutDevData::EndGroup call in VclMetafileProcessor2D

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 81a0b30..2d980e7 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;