From 0b45b92ea37c32e4eb509af59fb9cbe33a80b3a5 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Wed, 17 Nov 2004 14:02:35 +0000 Subject: [PATCH] INTEGRATION: CWS dba18 (1.7.86); FILE MERGED 2004/10/22 06:50:13 oj 1.7.86.1: #i27071# delete static images when last ref is gone --- svtools/source/contnr/svlbitm.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index a1727eb5fe77..c49f06ed80c9 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svlbitm.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2004-08-02 14:35:56 $ + * last change: $Author: obo $ $Date: 2004-11-17 15:02:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -552,10 +552,8 @@ Image& SvLBoxContextBmp::implGetImageStore( sal_Bool _bFirst, BmpColorMode _eMod DBG_ERROR( "SvLBoxContextBmp::implGetImageStore: unexpected mode!"); } - // #i27063# never access VCL after DeInitVCL - also no destructors - // FIXME: static images are currently leaked letting the OS clean up - static Image* pDummy = new Image(); - return *pDummy; + // OJ: #i27071# wrong mode so we just return the normal images + return _bFirst ? m_pImpl->m_aImage1 : m_pImpl->m_aImage2; } void SvLBoxContextBmp::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry,