diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-13 02:47:36 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:33 -0500 |
| commit | 64bf274cc9d5d73e2a86861f585257f76105ce3e (patch) | |
| tree | d0f315dda8deb7b5b82a749f9644ba1191aadafb /basic | |
| parent | e00037f4dd92a03bd3544291e5cf1f5a4c9bccc8 (diff) | |
use SolarMutexGuard to guard the SolarMutex
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sb.cxx | 6 | ||||
| -rw-r--r-- | basic/source/classes/sbxmod.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/iosys.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 1fb7db56f0..bb6f901220 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1460,7 +1460,7 @@ BOOL runsInSetup( void ) void StarBASIC::MakeErrorText( SbError nId, const String& aMsg ) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; if( bStaticSuppressSfxResource ) { @@ -1504,7 +1504,7 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg ) BOOL StarBASIC::CError ( SbError code, const String& rMsg, USHORT l, USHORT c1, USHORT c2 ) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; // compiler error during runtime -> stop programm if( IsRunning() ) @@ -1546,7 +1546,7 @@ BOOL StarBASIC::RTError BOOL StarBASIC::RTError( SbError code, const String& rMsg, USHORT l, USHORT c1, USHORT c2 ) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; SbError c = code; if( (c & ERRCODE_CLASS_MASK) == ERRCODE_CLASS_COMPILER ) diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index caa41ba043..638c08f756 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -1248,7 +1248,7 @@ USHORT SbModule::Run( SbMethod* pMeth ) delete pINST, pINST = NULL, bDelInst = FALSE; // #i30690 - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; SendHint( GetParent(), SBX_HINT_BASICSTOP, pMeth ); GlobalRunDeInit(); diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 218de76367..b5259e4f14 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -1036,7 +1036,7 @@ void SbiIoSystem::WriteCon( const ByteString& rText ) aOut.Erase( 0, 1 ); String aStr( s, gsl_getSystemTextEncoding() ); { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; if( !MessBox( GetpApp()->GetDefDialogParent(), WinBits( WB_OK_CANCEL | WB_DEF_OK ), String(), aStr ).Execute() ) |