diff options
author | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 06:50:34 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 06:50:34 +0000 |
commit | 7d85fe5d9bdd931b1b80613e5b45de87c6a7cd59 (patch) | |
tree | fb5245fc25440b19a6f093b35a2b8702e11af8f2 /svx/source/gallery2 | |
parent | ba7b2730f2ad017293f3f2ce4c8acd6c0ca59815 (diff) |
INTEGRATION: CWS thbpp3 (1.37.18); FILE MERGED
2006/04/26 12:20:22 thb 1.37.18.2: RESYNC: (1.37-1.39); FILE MERGED
2006/03/01 16:15:55 thb 1.37.18.1: #131187# Guarding against NULL data ptr on the gfxlink (the referred stack trace crashed on such an occasion)
Diffstat (limited to 'svx/source/gallery2')
-rw-r--r-- | svx/source/gallery2/galtheme.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index e43d838531e9..bc0f15e90e25 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -4,9 +4,9 @@ * * $RCSfile: galtheme.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: vg $ $Date: 2006-04-07 08:17:47 $ + * last change: $Author: rt $ $Date: 2006-05-04 07:50:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -947,7 +947,7 @@ BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos ) } else { - if( aGfxLink.GetDataSize() ) + if( aGfxLink.GetDataSize() && aGfxLink.GetData() ) { pOStm->Write( aGfxLink.GetData(), aGfxLink.GetDataSize() ); bRet = ( pOStm->GetError() == ERRCODE_NONE ); |