Kaydet (Commit) 1a1024a0 authored tarafından Caolán McNamara's avatar Caolán McNamara

remove double mutex

üst 8719f4dd
...@@ -138,7 +138,6 @@ class SfxObjectShellLock; ...@@ -138,7 +138,6 @@ class SfxObjectShellLock;
class SFX2_DLLPUBLIC SfxApplication: public SfxShell class SFX2_DLLPUBLIC SfxApplication: public SfxShell
{ {
SAL_DLLPRIVATE static ::osl::Mutex gMutex;
SAL_DLLPRIVATE static SfxApplication* pApp; SAL_DLLPRIVATE static SfxApplication* pApp;
SfxAppData_Impl* pAppData_Impl; SfxAppData_Impl* pAppData_Impl;
......
...@@ -260,6 +260,9 @@ namespace ...@@ -260,6 +260,9 @@ namespace
class thePropertyHandler class thePropertyHandler
: public rtl::Static<SfxPropertyHandler, thePropertyHandler> {}; : public rtl::Static<SfxPropertyHandler, thePropertyHandler> {};
class theApplicationMutex
: public rtl::Static<osl::Mutex, theApplicationMutex> {};
} }
#include <framework/imageproducer.hxx> #include <framework/imageproducer.hxx>
...@@ -268,23 +271,15 @@ namespace ...@@ -268,23 +271,15 @@ namespace
#include "sfx2/imagemgr.hxx" #include "sfx2/imagemgr.hxx"
#include "fwkhelper.hxx" #include "fwkhelper.hxx"
::osl::Mutex SfxApplication::gMutex;
SfxApplication* SfxApplication::GetOrCreate() SfxApplication* SfxApplication::GetOrCreate()
{ {
// SFX on demand // SFX on demand
::osl::MutexGuard aGuard(SfxApplication::gMutex); ::osl::MutexGuard aGuard(theApplicationMutex::get());
if ( !pApp ) if (!pApp)
{ {
SfxApplication *pNew = new SfxApplication;
//TODO/CLEANUP
// Is the Mutex-Handling OK?
static ::osl::Mutex aProtector;
::osl::MutexGuard aGuard2( aProtector );
RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::SetApp" ); RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::SetApp" );
pApp = pNew;
pApp = new SfxApplication;
// at the moment a bug may occur when Initialize_Impl returns FALSE, // at the moment a bug may occur when Initialize_Impl returns FALSE,
// but this is only temporary because all code that may cause such // but this is only temporary because all code that may cause such
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment