diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 06:51:55 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 06:51:55 +0000 |
| commit | 2430a4e3dbb5a38d37db24901541d9b5c2aaad03 (patch) | |
| tree | 059a3f99ed47a1144a515510b5bc6d75627b5723 /vcl/source | |
| parent | 6fe52a5a3e74155a638143fc4372ee8d4ce308e8 (diff) | |
INTEGRATION: CWS thbpp3 (1.14.200); FILE MERGED
2006/03/01 16:19:11 thb 1.14.200.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')
| -rw-r--r-- | vcl/source/gdi/outdev6.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index 400022d071ab..75fa17c2d3c9 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -4,9 +4,9 @@ * * $RCSfile: outdev6.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2005-09-09 12:07:13 $ + * last change: $Author: rt $ $Date: 2006-05-04 07:51:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -965,8 +965,9 @@ void OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize, if( mbInitClipRegion ) ImplInitClipRegion(); - bDrawn = mpGraphics->DrawEPS( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), - (BYTE*) rGfxLink.GetData(), rGfxLink.GetDataSize(), this ); + if( rGfxLink.GetData() && rGfxLink.GetDataSize() ) + bDrawn = mpGraphics->DrawEPS( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), + (BYTE*) rGfxLink.GetData(), rGfxLink.GetDataSize(), this ); } if( !bDrawn && pSubst ) |