diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-09-04 06:35:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-09-04 06:35:42 +0000 |
| commit | e37b1938b0d04f05f3fa66d9c09ddffa7ce4b05c (patch) | |
| tree | cfbb56cbfff90fbcde5698ff9a5924f2df34a6c3 /dbaccess | |
| parent | d316fb9de99e9e0e65f6d1ea37ec5fd5979653f8 (diff) | |
INTEGRATION: CWS dbadoccloselock (1.47.44); FILE MERGED
2008/09/02 11:08:08 fs 1.47.44.1: #i93381#
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/dataaccess/databasedocument.cxx | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 0f0851ad4bab..0094a4a496c3 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: databasedocument.cxx,v $ - * $Revision: 1.47 $ + * $Revision: 1.48 $ * * This file is part of OpenOffice.org. * @@ -857,7 +857,7 @@ Reference< XNameAccess > ODatabaseDocument::impl_getDocumentContainer_throw( ODa } // ----------------------------------------------------------------------------- -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 ODatabaseDocument::impl_disposeControllerFrames_nothrow() // ----------------------------------------------------------------------------- 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 ); + m_aCloseListener.forEach< XCloseListener >( + boost::bind( &XCloseListener::queryClosing, _1, boost::cref( aEvent ), boost::cref( _bDeliverOwnership ) ) ); - aGuard.clear(); + impl_closeControllerFrames_nolck_throw( _bDeliverOwnership ); m_aCloseListener.notifyEach( &XCloseListener::notifyClosing, (const lang::EventObject&)aEvent ); |