diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-14 22:09:00 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:33 -0500 |
| commit | 19c2b8c10b9c2a7e231ac39c4b9d7985acaf539f (patch) | |
| tree | ee5ef218fc0eda7c11845939c9bb6f9e981d1059 /sfx2 | |
| parent | 0e31314d93662fe0f6173a4010f140cfcc34b25f (diff) | |
convert OClearableGuard(SolarMutex) to SolarMutex(Clearable)Guard.
Most OClearableGuard of the Solar Mutex could be converted
to a simple SolarMutexGuard.
a couple of site were converted to a SolarMutexClearableGuard,
were converting to a SolarMutexGuard would have made the code more
convoluted.
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objmisc.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 47fe44a0e6..0d1f60b0ed 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -471,7 +471,7 @@ void SfxDocTplService_Impl::init_Impl() if ( bNeedsUpdate ) { aGuard.clear(); - ::vos::OClearableGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexClearableGuard aSolarGuard; WaitWindow_Impl* pWin = new WaitWindow_Impl(); diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index a5d66f7f05..d37c8a0171 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1812,7 +1812,7 @@ ErrCode SfxObjectShell::CallStarBasicScript( const String& _rMacroName, const St const void* _pArguments, void* _pReturn ) { OSL_TRACE("in CallSBS"); - ::vos::OClearableGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; // the arguments for the call SbxArrayRef xMacroArguments = lcl_translateUno2Basic( _pArguments ); @@ -1848,7 +1848,7 @@ ErrCode SfxObjectShell::CallScript( void *pRet ) { - ::vos::OClearableGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ErrCode nErr = ERRCODE_NONE; if( rScriptType.EqualsAscii( "StarBasic" ) ) { |