diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-06-16 10:35:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-06-16 10:35:50 +0000 |
| commit | c4b3000d6c4766f7bd699ee0f47b870cee2e11a1 (patch) | |
| tree | 48fc07c13d51dd97aabfa1d8194f22f82d01475a /toolkit/source/controls/unocontrol.cxx | |
| parent | a3d187bfde40bb048767d162b849b3f723ffbd69 (diff) | |
INTEGRATION: CWS rcregression01 (1.25.4); FILE MERGED
2003/06/12 10:34:09 cd 1.25.4.1: #110209# VclListenerLock must not crash if a null pointer is provided
Diffstat (limited to 'toolkit/source/controls/unocontrol.cxx')
| -rw-r--r-- | toolkit/source/controls/unocontrol.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index a15553cf9850..7cd8040c94ee 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unocontrol.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: vg $ $Date: 2003-06-06 10:55:13 $ + * last change: $Author: hr $ $Date: 2003-06-16 11:35:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -203,12 +203,14 @@ public: inline VclListenerLock( VCLXWindow* _pLockWindow ) :m_pLockWindow( _pLockWindow ) { - DBG_ASSERT( m_pLockWindow, "VclListenerLock::VclListenerLock: invalid window!" ); - m_pLockWindow->suspendVclEventListening( ); +// DBG_ASSERT( m_pLockWindow, "VclListenerLock::VclListenerLock: invalid window!" ); + if ( m_pLockWindow ) + m_pLockWindow->suspendVclEventListening( ); } inline ~VclListenerLock( ) { - m_pLockWindow->resumeVclEventListening( ); + if ( m_pLockWindow ) + m_pLockWindow->resumeVclEventListening( ); } private: |