Tag: cws_src680_oj17 User: oj Date: 06/03/16 02:37:02 Modified: /dba/dbaccess/source/core/dataaccess/ databasedocument.cxx, databasedocument.hxx
Log: #i63113# clear weak reference as well File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasedocument.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.25.22.1&r2=1.25.22.2 Delta lines: +15 -18 --------------------- --- databasedocument.cxx 9 Mar 2006 06:24:15 -0000 1.25.22.1 +++ databasedocument.cxx 16 Mar 2006 10:36:56 -0000 1.25.22.2 @@ -4,9 +4,9 @@ * * $RCSfile: databasedocument.cxx,v $ * - * $Revision: 1.25.22.1 $ + * $Revision: 1.25.22.2 $ * - * last change: $Author: oj $ $Date: 2006/03/09 06:24:15 $ + * last change: $Author: oj $ $Date: 2006/03/16 10:36:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -240,10 +240,10 @@ if ( m_pImpl->m_bOwnStorage ) ::comphelper::disposeComponent(m_pImpl->m_xStorage); - impl_clearObjectContainer( m_xForms ); - impl_clearObjectContainer( m_xReports ); - impl_clearObjectContainer( m_pImpl->m_xTableDefinitions ); - impl_clearObjectContainer( m_pImpl->m_xCommandDefinitions ); + impl_clearObjectContainer( m_xForms); + impl_clearObjectContainer( m_xReports); + impl_clearObjectContainer( m_pImpl->m_xTableDefinitions); + impl_clearObjectContainer( m_pImpl->m_xCommandDefinitions); m_pImpl->m_aContainer.clear(); m_pImpl->lateInit(); @@ -667,18 +667,15 @@ xChild->setParent( *this ); } // ----------------------------------------------------------------------------- -void ODatabaseDocument::impl_clearObjectContainer( WeakReference< XNameAccess >& _rxContainer, bool _bResetAndRelease ) +void ODatabaseDocument::impl_clearObjectContainer( WeakReference< XNameAccess >& _rxContainer) { Reference< XNameAccess > xContainer = _rxContainer; ::comphelper::disposeComponent( xContainer ); - if ( _bResetAndRelease ) - { Reference< XChild > xChild( _rxContainer.get(),UNO_QUERY ); if ( xChild.is() ) xChild->setParent( NULL ); _rxContainer = Reference< XNameAccess >(); - } } // ----------------------------------------------------------------------------- Reference< XNameAccess > ODatabaseDocument::impl_getDocumentContainer_throw( ODatabaseModelImpl::ObjectType _eType ) @@ -1059,10 +1056,10 @@ m_xUIConfigurationManager = NULL; - impl_clearObjectContainer( m_xForms, true ); - impl_clearObjectContainer( m_xReports, true ); - impl_clearObjectContainer( m_pImpl->m_xTableDefinitions, true ); - impl_clearObjectContainer( m_pImpl->m_xCommandDefinitions, true ); + impl_clearObjectContainer( m_xForms); + impl_clearObjectContainer( m_xReports); + impl_clearObjectContainer( m_pImpl->m_xTableDefinitions); + impl_clearObjectContainer( m_pImpl->m_xCommandDefinitions); m_pImpl->modelIsDisposing( ODatabaseModelImpl::ResetModelAccess() ); } File [changed]: databasedocument.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.hxx?r1=1.8.22.1&r2=1.8.22.2 Delta lines: +3 -6 ------------------- --- databasedocument.hxx 9 Mar 2006 06:24:16 -0000 1.8.22.1 +++ databasedocument.hxx 16 Mar 2006 10:36:57 -0000 1.8.22.2 @@ -4,9 +4,9 @@ * * $RCSfile: databasedocument.hxx,v $ * - * $Revision: 1.8.22.1 $ + * $Revision: 1.8.22.2 $ * - * last change: $Author: oj $ $Date: 2006/03/09 06:24:16 $ + * last change: $Author: oj $ $Date: 2006/03/16 10:36:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -331,12 +331,9 @@ @param _rxContainer the container to clear - @param _bResetAndRelease - <TRUE/> if and only if the given container should also be reset and release. */ void impl_clearObjectContainer( - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess >& _rxContainer, - bool _bResetAndRelease = false ); + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess >& _rxContainer); /** retrieves the forms or reports contained, creates and initializes it, if necessary --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
