INTEGRATION: CWS beta2vcl (1.21.4); FILE MERGED

2003/04/16 17:54:52 hdu 1.21.4.1: #108992# make sure screen font list gets only deleted once
This commit is contained in:
Rüdiger Timm 2003-04-24 09:27:08 +00:00
parent bff1e02081
commit 0d62eb4937

View file

@ -2,9 +2,9 @@
*
* $RCSfile: outdev.cxx,v $
*
* $Revision: 1.22 $
* $Revision: 1.23 $
*
* last change: $Author: rt $ $Date: 2003-04-17 15:17:38 $
* last change: $Author: rt $ $Date: 2003-04-24 10:27:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -516,7 +516,9 @@ OutputDevice::~OutputDevice()
if ( mpGetDevSizeList )
delete mpGetDevSizeList;
if( mpFontList && mpFontList != ImplGetSVData()->maGDIData.mpScreenFontList )
if( mpFontList
&& (mpFontList != ImplGetSVData()->maGDIData.mpScreenFontList)
&& (ImplGetSVData()->maGDIData.mpScreenFontList != NULL) )
{
mpFontList->Clear();
delete mpFontList;