diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-11 07:22:27 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-11 07:22:27 +0000 |
| commit | 91d4ec50a0c959ef509552c60a44f0bed29cec50 (patch) | |
| tree | 38511fe14a664b64acf65af843681e36e4d93aa1 /vcl/unx | |
| parent | ac0b354a490d0ae688a5eafc9703bffb9d83aacd (diff) | |
INTEGRATION: CWS vcl66 (1.27.24); FILE MERGED
2006/09/20 15:08:12 pl 1.27.24.3: RESYNC: (1.27-1.28); FILE MERGED
2006/09/08 15:25:30 pl 1.27.24.2: #i68979# remove debug fprintf
2006/09/08 14:58:24 pl 1.27.24.1: #i68979# remove list handling from DtIntegrator, do not leak DtIntegrator
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/source/gdi/dtint.cxx | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/vcl/unx/source/gdi/dtint.cxx b/vcl/unx/source/gdi/dtint.cxx index bec5d935585a..e577e71e5677 100644 --- a/vcl/unx/source/gdi/dtint.cxx +++ b/vcl/unx/source/gdi/dtint.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dtint.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: obo $ $Date: 2006-09-17 12:37:22 $ + * last change: $Author: obo $ $Date: 2006-10-11 08:22:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -77,19 +77,14 @@ using namespace rtl; using namespace vcl_sal; -BOOL bSymbolLoadFailed = FALSE; - -DtIntegratorList DtIntegrator::aIntegratorList; String DtIntegrator::aHomeDir; DtIntegrator::DtIntegrator() : meType( DtGeneric ), - mnRefCount( 0 ), mnSystemLookCommandProcess( -1 ) { mpSalDisplay = GetX11SalData()->GetDisplay(); mpDisplay = mpSalDisplay->GetDisplay(); - aIntegratorList.Insert( this, LIST_APPEND ); OUString aDir; oslSecurity aCur = osl_getCurrentSecurity(); if( aCur ) @@ -108,15 +103,6 @@ DtIntegrator::~DtIntegrator() DtIntegrator* DtIntegrator::CreateDtIntegrator() { - SalDisplay* pSalDisplay = GetX11SalData()->GetDisplay(); - Display* pDisplay = pSalDisplay->GetDisplay(); - - for( unsigned int i = 0; i < aIntegratorList.Count(); i++ ) - { - DtIntegrator* pIntegrator = aIntegratorList.GetObject( i ); - if( pIntegrator->mpDisplay == pDisplay ) - return pIntegrator; - } #ifdef MACOSX return new MACOSXIntegrator(); #endif @@ -144,6 +130,8 @@ DtIntegrator* DtIntegrator::CreateDtIntegrator() // check dt type // CDE + SalDisplay* pSalDisplay = GetX11SalData()->GetDisplay(); + Display* pDisplay = pSalDisplay->GetDisplay(); Atom nDtAtom = XInternAtom( pDisplay, "_DT_WM_READY", True ); if( nDtAtom && ( pLibrary = dlopen( "/usr/dt/lib/libDtSvc.so", DLOPEN_MODE ) ) ) { |