Tag: cws_src680_dba24 User: oj Date: 05/02/24 22:27:15 Modified: /dba/dbaccess/source/ui/app/ AppController.cxx
Log: #i42460# set model in disposing(...) null File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.12.4.6&r2=1.12.4.7 Delta lines: +15 -3 -------------------- --- AppController.cxx 23 Feb 2005 10:17:48 -0000 1.12.4.6 +++ AppController.cxx 25 Feb 2005 06:27:13 -0000 1.12.4.7 @@ -2,9 +2,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.12.4.6 $ + * $Revision: 1.12.4.7 $ * - * last change: $Author: oj $ $Date: 2005/02/23 10:17:48 $ + * last change: $Author: oj $ $Date: 2005/02/25 06:27:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -423,8 +423,12 @@ attachFrame( xFrame ); if ( m_xDataSource.is() ) + { m_xDataSource->removePropertyChangeListener(::rtl::OUString(), this); + // otherwise we may delete our datasource twice + Reference<XPropertySet> xProp = m_xDataSource; m_xDataSource = NULL; + } Reference< XModifyBroadcaster > xBroadcaster(m_xModel, UNO_QUERY); if ( xBroadcaster.is() ) @@ -535,6 +539,14 @@ } } } + } + else if ( _rSource.Source == m_xModel ) + { + m_xModel = NULL; + } + else if ( _rSource.Source == m_xDataSource ) + { + m_xDataSource = NULL; } else { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
