From ae18d21e6d2fcdac2d2c0d8987749fe03f4aab94 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Tue, 23 Jan 2007 06:31:22 +0000
Subject: INTEGRATION: CWS fwk59 (1.11.34); FILE MERGED 2007/01/12 08:34:18 cd
 1.11.34.1: #i73311# Destroy stream after png reader class is destroyed!

---
 framework/source/uiconfiguration/imagemanager.cxx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'framework/source')

diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 4fc250f2dc4b..16652b0cefde 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: imagemanager.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: vg $ $Date: 2006-11-21 17:20:22 $
+ *  last change: $Author: obo $ $Date: 2007-01-23 07:31:22 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -315,9 +315,13 @@ sal_Bool ImageManager::implts_loadUserImages(
 
                 if ( xBitmapStream.is() )
                 {
-                    SvStream* pSvStream = utl::UcbStreamHelper::CreateStream( xBitmapStream );
-                    vcl::PNGReader aPngReader( *pSvStream );
-                    BitmapEx aUserBitmap = aPngReader.Read();
+                    SvStream* pSvStream( 0 );
+            BitmapEx aUserBitmap;
+            {
+                pSvStream = utl::UcbStreamHelper::CreateStream( xBitmapStream );
+                vcl::PNGReader aPngReader( *pSvStream );
+                aUserBitmap = aPngReader.Read();
+            }
                     delete pSvStream;
 
                     // Delete old image list and create a new one from the read bitmap
-- 
cgit