diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-13 07:32:21 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-13 07:32:21 +0000 |
| commit | 2363d845d8b9019c423d7976fb8a9bd3026d168c (patch) | |
| tree | 11470ebde66e3c6ba674476c8ede48a3632a43b4 /vcl | |
| parent | INTEGRATION: CWS vcl65 (1.37.20); FILE MERGED (diff) | |
| download | core-2363d845d8b9019c423d7976fb8a9bd3026d168c.tar.gz core-2363d845d8b9019c423d7976fb8a9bd3026d168c.zip | |
INTEGRATION: CWS vcl65 (1.6.36); FILE MERGED
2006/09/06 12:57:53 pl 1.6.36.1: #i68369# don't use mutex after destruction
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/helper/xconnection.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx index ea5b5f09e8eb..7e3caf04e035 100644 --- a/vcl/source/helper/xconnection.cxx +++ b/vcl/source/helper/xconnection.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xconnection.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2006-09-17 12:14:44 $ + * last change: $Author: obo $ $Date: 2006-10-13 08:32:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,7 +52,6 @@ using namespace com::sun::star::awt; DisplayConnection::DisplayConnection() { ImplSVData* pSVData = ImplGetSVData(); - pSVData->mpDisplayConnection = this; pSVData->mpDefInst->SetEventCallback( this, dispatchEvent ); pSVData->mpDefInst->SetErrorEventCallback( this, dispatchErrorEvent ); @@ -73,9 +72,12 @@ DisplayConnection::DisplayConnection() DisplayConnection::~DisplayConnection() { ImplSVData* pSVData = ImplGetSVData(); - pSVData->mpDisplayConnection = NULL; - pSVData->mpDefInst->SetEventCallback( NULL, NULL ); - pSVData->mpDefInst->SetErrorEventCallback( NULL, NULL ); + + if( pSVData ) + { + pSVData->mpDefInst->SetEventCallback( NULL, NULL ); + pSVData->mpDefInst->SetErrorEventCallback( NULL, NULL ); + } } |