diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-19 16:23:35 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-19 16:23:35 +0000 |
| commit | d984d0318635dc0c778d5e4cd3e5550e0684803d (patch) | |
| tree | 8a9816c75778f057e06e9569512454a18bd4902d /vcl/source/gdi/image.cxx | |
| parent | 615fff84dbd7d4b14e66a4ba3bb51c602ca53257 (diff) | |
INTEGRATION: CWS fwk74 (1.33.68); FILE MERGED
2007/10/02 06:15:51 cd 1.33.68.1: #i73355# Exchange wrong implementation of ReplaceImage with name as key.
Diffstat (limited to 'vcl/source/gdi/image.cxx')
| -rw-r--r-- | vcl/source/gdi/image.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index 0c0164e708a3..4287fa420f44 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -4,9 +4,9 @@ * * $RCSfile: image.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: rt $ $Date: 2007-07-24 10:09:52 $ + * last change: $Author: ihi $ $Date: 2007-11-19 17:23:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -744,7 +744,13 @@ void ImageList::ReplaceImage( const ::rtl::OUString& rImageName, const Image& rI const USHORT nId = ImplGetImageId( rImageName ); if( nId ) - ReplaceImage( nId, rImage ); + { + RemoveImage( nId ); + + if( !mpImplData ) + ImplInit( 0, rImage.GetSizePixel() ); + mpImplData->AddImage( rImageName, nId, rImage.GetBitmapEx()); + } } // ----------------------------------------------------------------------- |