Tag: cws_dev300_dbadoccloselock User: fs Date: 2008-09-02 11:08:11+0000 Modified: dba/dbaccess/source/core/dataaccess/databasedocument.cxx dba/dbaccess/source/core/dataaccess/databasedocument.hxx
Log: #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.47.44.1 Delta lines: +6 -14 -------------------- --- databasedocument.cxx 2008-06-25 12:31:38+0000 1.47 +++ databasedocument.cxx 2008-09-02 11:08:08+0000 1.47.44.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: databasedocument.cxx,v $ - * $Revision: 1.47 $ + * $Revision: 1.47.44.1 $ * * This file is part of OpenOffice.org. * @@ -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 ); File [changed]: databasedocument.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.hxx?r1=1.21&r2=1.21.58.1 Delta lines: +3 -3 ------------------- --- databasedocument.hxx 2008-06-06 14:02:39+0000 1.21 +++ databasedocument.hxx 2008-09-02 11:08:08+0000 1.21.58.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: databasedocument.hxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.21.58.1 $ * * This file is part of OpenOffice.org. * @@ -366,7 +366,7 @@ @raises ::com::sun::star::util::CloseVetoException if the closing was vetoed by any instance */ - void impl_closeControllerFrames( sal_Bool _bDeliverOwnership ); + void impl_closeControllerFrames_nolck_throw( sal_Bool _bDeliverOwnership ); /** disposes the frames of all controllers which are still left in m_aControllers. */ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
