diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 06:52:08 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 06:52:08 +0000 |
| commit | 73ad650705456ae838da4e87cb8fa4ec8e215a87 (patch) | |
| tree | b4b7231741ddf9e852c9f4ae6734b5e0c608ca42 /vcl/source/gdi/pdfextoutdevdata.cxx | |
| parent | 2430a4e3dbb5a38d37db24901541d9b5c2aaad03 (diff) | |
INTEGRATION: CWS thbpp3 (1.5.198); FILE MERGED
2006/03/01 16:19:11 thb 1.5.198.1: #131187# Guarding against NULL data ptr on the gfxlink (the referred stack trace crashed on such an occasion); Fixing up GfxLink to a) assert when someone passes in a NULL data ptr, and b) maintaining invariants when swapping out fails
Diffstat (limited to 'vcl/source/gdi/pdfextoutdevdata.cxx')
| -rw-r--r-- | vcl/source/gdi/pdfextoutdevdata.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index f720ac61fde0..658e2020d887 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -4,9 +4,9 @@ * * $RCSfile: pdfextoutdevdata.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-09 12:08:02 $ + * last change: $Author: rt $ $Date: 2006-05-04 07:52:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -434,8 +434,12 @@ sal_Bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIM SvMemoryStream aTmp; const sal_uInt8* pData = aGfxLink.GetData(); sal_uInt32 nBytes = aGfxLink.GetDataSize(); - aTmp.Write( pData, nBytes ); - rWriter.DrawJPGBitmap( aTmp, aGraphic.GetBitmap().GetBitCount() > 8, aGraphic.GetSizePixel(), aOutputRect, aMask ); + if( pData && nBytes ) + { + aTmp.Write( pData, nBytes ); + rWriter.DrawJPGBitmap( aTmp, aGraphic.GetBitmap().GetBitCount() > 8, aGraphic.GetSizePixel(), aOutputRect, aMask ); + } + if ( bClippingNeeded ) rWriter.Pop(); } |