INTEGRATION: CWS dba03 (1.32.2.5.12); FILE MERGED

2003/03/14 10:25:47 thb 1.32.2.5.12.2: #108212# Ensuring dispose state before notifying exactly that
2003/03/05 13:59:59 thb 1.32.2.5.12.1: #107948# Implemented proxy edit source for shapes with empty text

1 files changed, 16 insertions, 11 deletions

diff --git a/svx/source/accessibility/AccessibleEditableTextPara.cxx b/svx/source/accessibility/AccessibleEditableTextPara.cxx
index 389b41e47c63..edc0966ba915 100644
--- a/svx/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/svx/source/accessibility/AccessibleEditableTextPara.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleEditableTextPara.cxx,v $
  *
- *  $Revision: 1.33 $
+ *  $Revision: 1.34 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-27 15:00:24 $
+ *  last change: $Author: vg $ $Date: 2003-04-01 13:46:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -373,27 +373,28 @@ namespace accessibility
     {
         DBG_CHKTHIS( AccessibleEditableTextPara, 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( "Disposed ID: %d\n", mnNotifierClientId );
+                OSL_TRACE( "Disposed ID: %d\n", nClientId );
 #endif
             }
             catch( const uno::Exception& ) {}
         }
-
-        // drop all references
-        mxParent = NULL;
-        mnNotifierClientId = -1;
-        mpEditSource = NULL;
     }
 
     void AccessibleEditableTextPara::SetEditSource( SvxEditSourceAdapter* pEditSource )
@@ -1729,6 +1730,7 @@ namespace accessibility
         try
         {
             // #102710# Request edit view when doing changes
+            // AccessibleEmptyEditSource relies on this behaviour
             SvxEditViewForwarder& rCacheVF = GetEditViewForwarder( sal_True );
             SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder();    // MUST be after GetEditViewForwarder(), see method docs
 
@@ -1761,6 +1763,7 @@ namespace accessibility
         try
         {
             // #102710# Request edit view when doing changes
+            // AccessibleEmptyEditSource relies on this behaviour
             SvxEditViewForwarder& rCacheVF = GetEditViewForwarder( sal_True );
             SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder();    // MUST be after GetEditViewForwarder(), see method docs
 
@@ -1795,6 +1798,7 @@ namespace accessibility
         try
         {
             // #102710# Request edit view when doing changes
+            // AccessibleEmptyEditSource relies on this behaviour
             SvxEditViewForwarder& rCacheVF = GetEditViewForwarder( sal_True );
             SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder();    // MUST be after GetEditViewForwarder(), see method docs
 
@@ -1829,6 +1833,7 @@ namespace accessibility
         try
         {
             // #102710# Request edit view when doing changes
+            // AccessibleEmptyEditSource relies on this behaviour
             SvxEditViewForwarder& rCacheVF = GetEditViewForwarder( sal_True );
             SvxAccessibleTextAdapter& rCacheTF = GetTextForwarder();    // MUST be after GetEditViewForwarder(), see method docs
             USHORT nPara = static_cast< USHORT >( GetParagraphIndex() );