diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 09:27:10 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 09:27:10 +0000 |
| commit | 23d9e9d577a6de14171e07e438921e55c5123c7c (patch) | |
| tree | af117b641b1d5056642e2a760afabc91c24de331 | |
| parent | 3f30749a7ab6cdd328f0e2e29fa0d241099cb3ca (diff) | |
INTEGRATION: CWS mav31 (1.137.38); FILE MERGED
2008/04/09 10:19:47 mav 1.137.38.1: #i87197# fix the crash/deadlock
| -rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index ce7749432106..26a727c07dc8 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sfxbasemodel.cxx,v $ - * $Revision: 1.139 $ + * $Revision: 1.140 $ * * This file is part of OpenOffice.org. * @@ -145,7 +145,6 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument { // counter for SfxBaseModel instances created. static sal_Int64 g_nInstanceCounter ; - ::osl::Mutex& m_rMutex ; SfxObjectShellRef m_pObjectShell ; ::rtl::OUString m_sURL ; ::rtl::OUString m_sRuntimeUID ; @@ -173,10 +172,9 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument css::uno::Reference< css::frame::XTitle > m_xTitleHelper; css::uno::Reference< css::frame::XUntitledNumbers > m_xNumberedControllers; - IMPL_SfxBaseModel_DataContainer( ::osl::Mutex& aMutex, SfxObjectShell* pObjectShell ) - : m_rMutex ( aMutex ) - , m_pObjectShell ( pObjectShell ) - , m_aInterfaceContainer ( aMutex ) + IMPL_SfxBaseModel_DataContainer( ::osl::Mutex& rMutex, SfxObjectShell* pObjectShell ) + : m_pObjectShell ( pObjectShell ) + , m_aInterfaceContainer ( rMutex ) , m_nControllerLockCount ( 0 ) , m_bClosed ( sal_False ) , m_bClosing ( sal_False ) @@ -2833,7 +2831,7 @@ void SfxBaseModel::ListenForStorage_Impl( const uno::Reference< embed::XStorage { if ( !m_pData->m_pStorageModifyListen.is() ) { - m_pData->m_pStorageModifyListen = new ::sfx2::DocumentStorageModifyListener( m_pData->m_rMutex, *m_pData ); + m_pData->m_pStorageModifyListen = new ::sfx2::DocumentStorageModifyListener( *m_pData ); } // no need to deregister the listening for old storage since it should be disposed automatically |