summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-01-17 15:17:55 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-01-17 15:01:11 +0000
commit9c569b326c9d2d71132e722a1783e7e201c1bf3c (patch)
tree0891bb73f1715d0e7f7fab8d044d84b976f3e3ae
parentca1b5e35ba4f0b476cebc99cc0cbf562271171e7 (diff)
fdo#72530: drawinglayer: fix PDF export of lossless picture
Don't pass empty Rectangle to PDFExtOutDevData::EndGroup(), it will result in early return from PDFWriterImpl::drawJPGBitmap() and no picture in the PDF. Passing in the same Rectangle for the 3rd and 4th parameter will avoid cropping in PDFExtOutDevData. (regression from 677df250becd5cde71c6310f647e78ac3763347e) Change-Id: Icf110fe3e635319419fcacc7bc684c792a34d6ad (cherry picked from commit c8e9038b13c64df430fb4e3fecac65a3c507e3e8) Reviewed-on: https://gerrit.libreoffice.org/7502 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index f6aad734bbbf..94fc97259f02 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -824,7 +824,8 @@ namespace drawinglayer
sal_Int32(floor(aCurrentRange.getMinX())), sal_Int32(floor(aCurrentRange.getMinY())),
sal_Int32(ceil(aCurrentRange.getMaxX())), sal_Int32(ceil(aCurrentRange.getMaxY())));
const GraphicAttr& rAttr = rGraphicPrimitive.getGraphicAttr();
- Rectangle aCropRect;
+ // fdo#72530 don't pass empty Rectangle to EndGroup
+ Rectangle aCropRect(aCurrentRect);
if(rAttr.IsCropped())
{