User: hr Date: 2007-09-26 14:39:54+0000 Modified: dba/dbaccess/source/core/dataaccess/databasedocument.cxx
Log: INTEGRATION: CWS dba24a (1.33.6); FILE MERGED 2007/08/29 13:21:39 oj 1.33.6.1: #i69084# lock and release mutex 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.33&r2=1.34 Delta lines: +14 -8 -------------------- --- databasedocument.cxx 2007-07-24 12:04:32+0000 1.33 +++ databasedocument.cxx 2007-09-26 14:39:51+0000 1.34 @@ -456,7 +456,7 @@ OSL_ENSURE(m_pImpl.is(),"Impl is NULL"); if ( m_pImpl->m_sFileURL == m_pImpl->m_sRealFileURL ) - store( m_pImpl->m_sFileURL, m_pImpl->m_aArgs ); + store( m_pImpl->m_sFileURL, m_pImpl->m_aArgs ,aGuard); else storeAsURL( m_pImpl->m_sRealFileURL, m_pImpl->m_aArgs ); @@ -464,7 +464,8 @@ } // ----------------------------------------------------------------------------- void ODatabaseDocument::store(const ::rtl::OUString& _rURL - ,const Sequence< PropertyValue >& _rArguments) + ,const Sequence< PropertyValue >& _rArguments + ,ModelMethodGuard& _rGuard) { OSL_ENSURE(m_pImpl.is(),"Impl is NULL"); if ( m_pImpl->m_bDocumentReadOnly ) @@ -485,7 +486,7 @@ m_pImpl->commitRootStorage(); - setModified(sal_False); + setModified( sal_False,_rGuard ); } // ----------------------------------------------------------------------------- void SAL_CALL ODatabaseDocument::storeAsURL( const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (IOException, RuntimeException) @@ -578,7 +579,7 @@ m_pImpl->m_sRealFileURL = m_pImpl->m_sFileURL = _rURL; } lcl_stripLoadArguments( aDescriptor, m_pImpl->m_aArgs ); - store(m_pImpl->m_sFileURL,_rArguments); + store(m_pImpl->m_sFileURL,_rArguments,aGuard); impl_notifyEvent( "OnSaveAsDone", aGuard ); } @@ -656,19 +657,24 @@ void SAL_CALL ODatabaseDocument::setModified( sal_Bool _bModified ) throw (PropertyVetoException, RuntimeException) { ModelMethodGuard aGuard( *this ); - + setModified( _bModified,aGuard ); +} +// ----------------------------------------------------------------------------- +void ODatabaseDocument::setModified( sal_Bool _bModified,ModelMethodGuard& _rGuard ) +{ if ( m_pImpl->m_bModified == _bModified ) return; m_pImpl->m_bModified = _bModified; lang::EventObject aEvt( *this ); - aGuard.clear(); + _rGuard.clear(); m_aModifyListeners.notifyEach( &XModifyListener::modified, aEvt ); - aGuard.reset(); - impl_notifyEvent( "OnModifyChanged", aGuard ); + _rGuard.reset(); + impl_notifyEvent( "OnModifyChanged", _rGuard ); } +// ----------------------------------------------------------------------------- // ::com::sun::star::document::XEventBroadcaster void SAL_CALL ODatabaseDocument::addEventListener(const css::uno::Reference< css::document::XEventListener >& _xListener ) throw (css::uno::RuntimeException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
