diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-13 07:30:41 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-13 07:30:41 +0000 |
| commit | 4881ad505c55648995b28fd1faa69900ab7e43ee (patch) | |
| tree | c77f6e6f5e2a4b0197b7605278da8779ab3644d1 /vcl | |
| parent | INTEGRATION: CWS vcl65 (1.36.24); FILE MERGED (diff) | |
| download | core-4881ad505c55648995b28fd1faa69900ab7e43ee.tar.gz core-4881ad505c55648995b28fd1faa69900ab7e43ee.zip | |
INTEGRATION: CWS vcl65 (1.69.20); FILE MERGED
2006/09/06 12:57:53 pl 1.69.20.1: #i68369# don't use mutex after destruction
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 8eddc9d41506..4e869a784563 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svapp.cxx,v $ * - * $Revision: 1.71 $ + * $Revision: 1.72 $ * - * last change: $Author: kz $ $Date: 2006-10-06 09:58:12 $ + * last change: $Author: obo $ $Date: 2006-10-13 08:30:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1683,7 +1683,11 @@ void Application::SetUnoWrapper( UnoWrapperBase* pWrapper ) ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayConnection > Application::GetDisplayConnection() { ImplSVData* pSVData = ImplGetSVData(); - return pSVData->mpDisplayConnection ? pSVData->mpDisplayConnection : new ::vcl::DisplayConnection; + + if( !pSVData->mxDisplayConnection.is() ) + pSVData->mxDisplayConnection.set( new ::vcl::DisplayConnection ); + + return pSVData->mxDisplayConnection; } // ----------------------------------------------------------------------- |