User: rt Date: 2008-09-04 07:35:45+0000 Modified: dba/dbaccess/source/core/dataaccess/databasedocument.cxx
Log: INTEGRATION: CWS dbadoccloselock (1.47.44); FILE MERGED 2008/09/02 11:08:08 fs 1.47.44.1: #i93381# 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.47&r2=1.48 Delta lines: +4 -12 -------------------- --- databasedocument.cxx 2008-06-25 12:31:38+0000 1.47 +++ databasedocument.cxx 2008-09-04 07:35:42+0000 1.48 @@ -857,7 +857,7 @@ } // ----------------------------------------------------------------------------- -void ODatabaseDocument::impl_closeControllerFrames( sal_Bool _bDeliverOwnership ) +void ODatabaseDocument::impl_closeControllerFrames_nolck_throw( sal_Bool _bDeliverOwnership ) { Controllers aCopy = m_aControllers; @@ -911,20 +911,12 @@ // ----------------------------------------------------------------------------- void SAL_CALL ODatabaseDocument::close( sal_Bool _bDeliverOwnership ) throw (::com::sun::star::util::CloseVetoException, RuntimeException) { - ModelMethodGuard aGuard( *this ); - document::EventObject aEvent( *this, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnUnload" ) ) ); - { - aGuard.clear(); m_aCloseListener.forEach< XCloseListener >( boost::bind( &XCloseListener::queryClosing, _1, boost::cref( aEvent ), boost::cref( _bDeliverOwnership ) ) ); - aGuard.reset(); - } - - impl_closeControllerFrames( _bDeliverOwnership ); - aGuard.clear(); + impl_closeControllerFrames_nolck_throw( _bDeliverOwnership ); m_aCloseListener.notifyEach( &XCloseListener::notifyClosing, (const lang::EventObject&)aEvent ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
