diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-11 07:21:45 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-11 07:21:45 +0000 |
| commit | 7dc41d0ace05a58e3011d70c120136a9545fb67d (patch) | |
| tree | 1c7ad747e3c712e494df829ce93eb85ac5263a67 /vcl | |
| parent | INTEGRATION: CWS vcl66 (1.17.22); FILE MERGED (diff) | |
| download | core-7dc41d0ace05a58e3011d70c120136a9545fb67d.tar.gz core-7dc41d0ace05a58e3011d70c120136a9545fb67d.zip | |
INTEGRATION: CWS vcl66 (1.80.22); FILE MERGED
2006/09/20 15:06:24 pl 1.80.22.2: RESYNC: (1.80-1.81); FILE MERGED
2006/09/08 14:58:23 pl 1.80.22.1: #i68979# remove list handling from DtIntegrator, do not leak DtIntegrator
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/app/saldisp.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index 9ffdffa056ff..f9ae621c74a5 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: saldisp.cxx,v $ * - * $Revision: 1.82 $ + * $Revision: 1.83 $ * - * last change: $Author: kz $ $Date: 2006-10-06 10:04:24 $ + * last change: $Author: obo $ $Date: 2006-10-11 08:21:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -590,6 +590,7 @@ SalDisplay::SalDisplay( Display *display ) : mpFallbackFactory ( NULL ), pDisp_( display ), m_pWMAdaptor( NULL ), + m_pDtIntegrator( NULL ), m_pSnDisplay( NULL ), m_pSnLauncheeContext( NULL ) { @@ -627,6 +628,9 @@ void SalDisplay::doDestruct() X11SalData *pSalData = GetX11SalData(); delete m_pWMAdaptor; + m_pWMAdaptor = NULL; + delete m_pDtIntegrator; + m_pDtIntegrator = NULL; X11SalBitmap::ImplDestroyCache(); X11SalGraphics::releaseGlyphPeer(); DestroyFontCache(); @@ -1100,8 +1104,7 @@ bHandleStartupNotification InitXinerama(); // initialize system settings update - DtIntegrator* pIntegrator = DtIntegrator::CreateDtIntegrator(); - pIntegrator->Acquire(); + m_pDtIntegrator = DtIntegrator::CreateDtIntegrator(); #ifdef HAVE_LIBSN if ( bHandleStartupNotification ) |