diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-01 12:47:15 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-01 12:47:15 +0000 |
| commit | 8c0de78b25d8e8d2f867fff38b10bda38531cd9e (patch) | |
| tree | b64b5f685d019c2d538eda3002c1af1d1211c916 /svx | |
| parent | 8ad95a13d00f53dad907153ea6c0224dcf692138 (diff) | |
INTEGRATION: CWS dba03 (1.13.2.4.60); FILE MERGED
2003/03/14 10:25:47 thb 1.13.2.4.60.1: #108212# Ensuring dispose state before notifying exactly that
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/accessibility/AccessibleImageBullet.cxx | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/svx/source/accessibility/AccessibleImageBullet.cxx b/svx/source/accessibility/AccessibleImageBullet.cxx index 0999db537d9e..24005598c50a 100644 --- a/svx/source/accessibility/AccessibleImageBullet.cxx +++ b/svx/source/accessibility/AccessibleImageBullet.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleImageBullet.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: hr $ $Date: 2003-03-27 15:00:24 $ + * last change: $Author: vg $ $Date: 2003-04-01 13:47:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -540,27 +540,28 @@ namespace accessibility { DBG_CHKTHIS( AccessibleImageBullet, NULL ); + int nClientId( getNotifierClientId() ); + + // #108212# drop all references before notifying dispose + mxParent = NULL; + mnNotifierClientId = -1; + mpEditSource = NULL; + // notify listeners - if( getNotifierClientId() != -1 ) + if( nClientId != -1 ) { try { uno::Reference < XAccessibleContext > xThis = getAccessibleContext(); // #106234# Delegate to EventNotifier - ::comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( getNotifierClientId(), - xThis ); + ::comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nClientId, xThis ); #ifdef DBG_UTIL - OSL_TRACE( "AccessibleImageBullet disposed ID: %d", mnNotifierClientId ); + OSL_TRACE( "AccessibleImageBullet disposed ID: %d", nClientId ); #endif } catch( const uno::Exception& ) {} } - - // drop all references - mxParent = NULL; - mnNotifierClientId = -1; - mpEditSource = NULL; } void AccessibleImageBullet::SetEditSource( SvxEditSource* pEditSource ) |