Tag: cws_src680_dba24d
User: fs      
Date: 2007-11-14 10:30:28+0000
Modified:
   dba/dbaccess/source/ui/uno/copytablewizard.cxx

Log:
 #i81658# some dtor safety

File Changes:

Directory: /dba/dbaccess/source/ui/uno/
=======================================

File [changed]: copytablewizard.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/copytablewizard.cxx?r1=1.1.2.5&r2=1.1.2.6
Delta lines:  +15 -2
--------------------
--- copytablewizard.cxx 2007-11-14 10:21:07+0000        1.1.2.5
+++ copytablewizard.cxx 2007-11-14 10:30:25+0000        1.1.2.6
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: copytablewizard.cxx,v $
  *
- *  $Revision: 1.1.2.5 $
+ *  $Revision: 1.1.2.6 $
  *
- *  last change: $Author: fs $ $Date: 2007/11/14 10:21:07 $
+ *  last change: $Author: fs $ $Date: 2007/11/14 10:30:25 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -378,6 +378,19 @@
     //-------------------------------------------------------------------------
     CopyTableWizard::~CopyTableWizard()
     {
+        aqcuire();
+
+        // protect some members whose dtor might potentially throw
+        try { m_xSourceConnection.reset();  }
+        catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); }
+        try { m_xDestConnection.reset();  }
+        catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); }
+
+        // TODO: shouldn't we have explicit disposal support? If a listener is 
registered
+        // at our instance, and perhaps holds this our instance by a hard ref, 
then we'll never
+        // destroyed.
+        // However, adding XComponent support to the GenericUNODialog probably 
requires
+        // some thinking - would it break existing clients which do not call a 
dispose, then?
     }
 
     //-------------------------------------------------------------------------




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to