use SolarMutexGuard to guard the SolarMutex

7 files changed, 56 insertions, 56 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 8c29c5377ef5..1e2461cfd6b2 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -101,7 +101,7 @@ namespace dp_gui {
 struct StrAllFiles : public rtl::StaticWithInit< const OUString, StrAllFiles >
 {
     const OUString operator () () {
-        const ::vos::OGuard guard( Application::GetSolarMutex() );
+        const SolarMutexGuard guard;
         ::std::auto_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr( "fps_office" ) );
         OSL_ASSERT( resmgr.get() != 0 );
         String ret( ResId( STR_FILTERNAME_ALL, *resmgr.get() ) );
@@ -414,7 +414,7 @@ void ExtBoxWithBtns_Impl::MouseButtonDown( const MouseEvent& rMEvt )
     }
     else if ( rMEvt.IsLeft() )
     {
-        const vos::OGuard aGuard( Application::GetSolarMutex() );
+        const SolarMutexGuard aGuard;
         if ( rMEvt.IsMod1() && HasActive() )
             selectEntry( EXTENSION_LISTBOX_ENTRY_NOTFOUND );   // Selecting an not existing entry will deselect the current one
         else
@@ -560,7 +560,7 @@ DialogHelper::~DialogHelper()
 //------------------------------------------------------------------------------
 ResId DialogHelper::getResId( USHORT nId )
 {
-    const ::vos::OGuard guard( Application::GetSolarMutex() );
+    const SolarMutexGuard guard;
     return ResId( nId, *DeploymentGuiResMgr::get() );
 }
 
@@ -569,7 +569,7 @@ String DialogHelper::getResourceString( USHORT id )
 {
     // init with non-acquired solar mutex:
     BrandName::get();
-    const ::vos::OGuard guard( Application::GetSolarMutex() );
+    const SolarMutexGuard guard;
     String ret( ResId( id, *DeploymentGuiResMgr::get() ) );
     if (ret.SearchAscii( "%PRODUCTNAME" ) != STRING_NOTFOUND) {
         ret.SearchAndReplaceAllAscii( "%PRODUCTNAME", BrandName::get() );
@@ -594,7 +594,7 @@ bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::
 {
     if ( !bHadWarning && IsSharedPkgMgr( xPackage ) )
     {
-        const ::vos::OGuard guard( Application::GetSolarMutex() );
+        const SolarMutexGuard guard;
         WarningBox aInfoBox( pParent, getResId( nResID ) );
         String aMsgText = aInfoBox.GetMessText();
         aMsgText.SearchAndReplaceAllAscii( "%PRODUCTNAME", BrandName::get() );
@@ -628,7 +628,7 @@ void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle
     {
         uno::Any exc( ::cppu::getCaughtException() );
         OUString msg( ::comphelper::anyToString( exc ) );
-        const ::vos::OGuard guard( Application::GetSolarMutex() );
+        const SolarMutexGuard guard;
         ErrorBox aErrorBox( NULL, WB_OK, msg );
         aErrorBox.SetText( sTitle );
         aErrorBox.Execute();
@@ -638,7 +638,7 @@ void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle
 //------------------------------------------------------------------------------
 bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const
 {
-    const ::vos::OGuard guard( Application::GetSolarMutex() );
+    const SolarMutexGuard guard;
     WarningBox aInfo( m_pVCLWindow, getResId( RID_WARNINGBOX_INSTALL_EXTENSION ) );
 
     String sText( aInfo.GetMessText() );
@@ -651,7 +651,7 @@ bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const
 //------------------------------------------------------------------------------
 bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const
 {
-    const ::vos::OGuard guard( Application::GetSolarMutex() );
+    const SolarMutexGuard guard;
     QueryBox aQuery( m_pVCLWindow, getResId( RID_QUERYBOX_INSTALL_FOR_ALL ) );
 
     String sMsgText = aQuery.GetMessText();
@@ -768,7 +768,7 @@ void ExtMgrDialog::setGetExtensionsURL( const ::rtl::OUString &rURL )
 long ExtMgrDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage,
                                      bool bLicenseMissing )
 {
-    const vos::OGuard aGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aGuard;
     m_aUpdateBtn.Enable( true );
     return m_pExtensionBox->addEntry( xPackage, bLicenseMissing );
 }
@@ -782,14 +782,14 @@ void ExtMgrDialog::prepareChecking()
 //------------------------------------------------------------------------------
 void ExtMgrDialog::checkEntries()
 {
-    const ::vos::OGuard guard( Application::GetSolarMutex() );
+    const SolarMutexGuard guard;
     m_pExtensionBox->checkEntries();
 }
 
 //------------------------------------------------------------------------------
 bool ExtMgrDialog::removeExtensionWarn( const OUString &rExtensionName ) const
 {
-    const ::vos::OGuard guard( Application::GetSolarMutex() );
+    const SolarMutexGuard guard;
     WarningBox aInfo( const_cast< ExtMgrDialog* >(this), getResId( RID_WARNINGBOX_REMOVE_EXTENSION ) );
 
     String sText( aInfo.GetMessText() );
@@ -1040,7 +1040,7 @@ void ExtMgrDialog::updateProgress( const OUString &rText,
 //------------------------------------------------------------------------------
 void ExtMgrDialog::updatePackageInfo( const uno::Reference< deployment::XPackage > &xPackage )
 {
-    const vos::OGuard aGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aGuard;
     m_pExtensionBox->updateEntry( xPackage );
 }
 
@@ -1326,7 +1326,7 @@ long UpdateRequiredDialog::addPackageToList( const uno::Reference< deployment::X
     if ( !bLicenseMissing && !checkDependencies( xPackage ) )
     {
         m_bHasLockedEntries |= m_pManager->isReadOnly( xPackage );
-        const vos::OGuard aGuard( Application::GetSolarMutex() );
+        const SolarMutexGuard aGuard;
         m_aUpdateBtn.Enable( true );
         return m_pExtensionBox->addEntry( xPackage );
     }
@@ -1342,7 +1342,7 @@ void UpdateRequiredDialog::prepareChecking()
 //------------------------------------------------------------------------------
 void UpdateRequiredDialog::checkEntries()
 {
-    const ::vos::OGuard guard( Application::GetSolarMutex() );
+    const SolarMutexGuard guard;
     m_pExtensionBox->checkEntries();
 
     if ( ! hasActiveEntries() )
@@ -1455,7 +1455,7 @@ void UpdateRequiredDialog::updatePackageInfo( const uno::Reference< deployment::
     // We will remove all updated packages with satisfied dependencies, but
     // we will show all disabled entries so the user sees the result
     // of the 'disable all' button
-    const vos::OGuard aGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aGuard;
     if ( isEnabled( xPackage ) && checkDependencies( xPackage ) )
         m_pExtensionBox->removeEntry( xPackage );
     else
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index ba28dff9b54c..6b904dd65b34 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -430,7 +430,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
                 dp_misc::Dependencies::getErrorText( depExc.UnsatisfiedDependencies[i]) );
         }
         {
-            vos::OGuard guard(Application::GetSolarMutex());
+            SolarMutexGuard guard;
             short n = DependencyDialog( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, deps ).Execute();
             // Distinguish between closing the dialog and programatically
             // canceling the dialog (headless VCL):
@@ -474,7 +474,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
         bool bEqualNames = verExc.NewDisplayName.equals(
             verExc.Deployed->getDisplayName());
         {
-            vos::OGuard guard(Application::GetSolarMutex());
+            SolarMutexGuard guard;
             WarningBox box( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, ResId(id, *DeploymentGuiResMgr::get()));
             String s;
             if (bEqualNames)
@@ -515,7 +515,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
         {
             if ( m_pDialogHelper )
             {
-                vos::OGuard guard(Application::GetSolarMutex());
+                SolarMutexGuard guard;
 
                 approve = m_pDialogHelper->installExtensionWarn( instExc.displayName );
             }
@@ -526,7 +526,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
     }
     else if (request >>= platExc)
     {
-        vos::OGuard guard( Application::GetSolarMutex() );
+        SolarMutexGuard guard;
         String sMsg( ResId( RID_STR_UNSUPPORTED_PLATFORM, *DeploymentGuiResMgr::get() ) );
         sMsg.SearchAndReplaceAllAscii( "%Name", platExc.package->getDisplayName() );
         ErrorBox box( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, WB_OK, sMsg );
@@ -600,7 +600,7 @@ void ProgressCmdEnv::update_( uno::Any const & rStatus )
         if ( text.getLength() == 0 )
             text = ::comphelper::anyToString( rStatus ); // fallback
 
-        const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        const SolarMutexGuard aGuard;
         const ::std::auto_ptr< ErrorBox > aBox( new ErrorBox( m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, WB_OK, text ) );
         aBox->Execute();
     }
@@ -891,7 +891,7 @@ void ExtensionCmdQueue::Thread::execute()
                 if (msg.getLength() == 0) // fallback for debugging purposes
                     msg = ::comphelper::anyToString(exc);
 
-                const ::vos::OGuard guard( Application::GetSolarMutex() );
+                const SolarMutexGuard guard;
                 ::std::auto_ptr<ErrorBox> box(
                     new ErrorBox( currentCmdEnv->activeDialog(), WB_OK, msg ) );
                 if ( m_pDialogHelper )
@@ -1005,7 +1005,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates(
     UpdateDialog* pUpdateDialog;
     std::vector< UpdateData > vData;
 
-    const ::vos::OGuard guard( Application::GetSolarMutex() );
+    const SolarMutexGuard guard;
 
     pUpdateDialog = new UpdateDialog( m_xContext, m_pDialogHelper? m_pDialogHelper->getWindow() : NULL, vExtensionList, &vData );
 
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 8f31db58b9ba..94323f6c49d8 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -207,7 +207,7 @@ void ServiceImpl::setDialogTitle( OUString const & title )
 {
     if ( dp_gui::TheExtensionManager::s_ExtMgr.is() )
     {
-        const ::vos::OGuard guard( Application::GetSolarMutex() );
+        const SolarMutexGuard guard;
         ::rtl::Reference< ::dp_gui::TheExtensionManager > dialog(
             ::dp_gui::TheExtensionManager::get( m_xComponentContext,
                                                 m_parent ? *m_parent : Reference<awt::XWindow>(),
@@ -235,7 +235,7 @@ void ServiceImpl::startExecuteModal(
         }
         catch (Exception & exc) {
             if (bAppUp) {
-                const vos::OGuard guard( Application::GetSolarMutex() );
+                const SolarMutexGuard guard;
                 std::auto_ptr<ErrorBox> box(
                     new ErrorBox( Application::GetActiveTopWindow(),
                                   WB_OK, exc.Message ) );
@@ -279,7 +279,7 @@ void ServiceImpl::startExecuteModal(
     }
 
     {
-        const ::vos::OGuard guard( Application::GetSolarMutex() );
+        const SolarMutexGuard guard;
         ::rtl::Reference< ::dp_gui::TheExtensionManager > myExtMgr(
             ::dp_gui::TheExtensionManager::get(
                 m_xComponentContext,
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index c198501ee7db..a7e6faec3b00 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -127,7 +127,7 @@ TheExtensionManager::~TheExtensionManager()
 //------------------------------------------------------------------------------
 void TheExtensionManager::createDialog( const bool bCreateUpdDlg )
 {
-    const ::vos::OGuard guard( Application::GetSolarMutex() );
+    const SolarMutexGuard guard;
 
     if ( bCreateUpdDlg )
     {
@@ -152,7 +152,7 @@ void TheExtensionManager::createDialog( const bool bCreateUpdDlg )
 //------------------------------------------------------------------------------
 void TheExtensionManager::Show()
 {
-    const ::vos::OGuard guard( Application::GetSolarMutex() );
+    const SolarMutexGuard guard;
 
     getDialog()->Show();
 }
@@ -160,7 +160,7 @@ void TheExtensionManager::Show()
 //------------------------------------------------------------------------------
 void TheExtensionManager::SetText( const ::rtl::OUString &rTitle )
 {
-    const ::vos::OGuard guard( Application::GetSolarMutex() );
+    const SolarMutexGuard guard;
 
     getDialog()->SetText( rTitle );
 }
@@ -168,7 +168,7 @@ void TheExtensionManager::SetText( const ::rtl::OUString &rTitle )
 //------------------------------------------------------------------------------
 void TheExtensionManager::ToTop( USHORT nFlags )
 {
-    const ::vos::OGuard guard( Application::GetSolarMutex() );
+    const SolarMutexGuard guard;
 
     getDialog()->ToTop( nFlags );
 }
@@ -279,7 +279,7 @@ void TheExtensionManager::terminateDialog()
 {
     if ( ! dp_misc::office_is_running() )
     {
-        const ::vos::OGuard guard( Application::GetSolarMutex() );
+        const SolarMutexGuard guard;
         delete m_pExtMgrDialog;
         m_pExtMgrDialog = NULL;
         delete m_pUpdReqDialog;
@@ -446,7 +446,7 @@ void TheExtensionManager::disposing( lang::EventObject const & rEvt )
     {
         if ( dp_misc::office_is_running() )
         {
-            const ::vos::OGuard guard( Application::GetSolarMutex() );
+            const SolarMutexGuard guard;
             delete m_pExtMgrDialog;
             m_pExtMgrDialog = NULL;
             delete m_pUpdReqDialog;
@@ -515,7 +515,7 @@ void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ )
 
     ::rtl::Reference<TheExtensionManager> that( new TheExtensionManager( pParent, xContext ) );
 
-    const ::vos::OGuard guard( Application::GetSolarMutex() );
+    const SolarMutexGuard guard;
     if ( ! s_ExtMgr.is() )
     {
         OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index d83d8cef1b02..e45cf7f3292f 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -328,7 +328,7 @@ UpdateDialog::Thread::Thread(
 void UpdateDialog::Thread::stop() {
     css::uno::Reference< css::task::XAbortChannel > abort;
     {
-        vos::OGuard g(Application::GetSolarMutex());
+        SolarMutexGuard g;
         abort = m_abort;
         m_stop = true;
     }
@@ -358,7 +358,7 @@ UpdateDialog::Thread::~Thread()
 void UpdateDialog::Thread::execute()
 {
     {
-        vos::OGuard g( Application::GetSolarMutex() );
+        SolarMutexGuard g;
         if ( m_stop ) {
             return;
         }
@@ -445,7 +445,7 @@ void UpdateDialog::Thread::execute()
     }
 
 
-    vos::OGuard g(Application::GetSolarMutex());
+    SolarMutexGuard g;
     if (!m_stop) {
         m_dialog.checkingDone();
     }
@@ -463,7 +463,7 @@ void UpdateDialog::Thread::handleSpecificError(
     if (exception >>= e) {
         data.message = e.Message;
     }
-    vos::OGuard g(Application::GetSolarMutex());
+    SolarMutexGuard g;
     if (!m_stop) {
         m_dialog.addSpecificError(data);
     }
@@ -476,7 +476,7 @@ void UpdateDialog::Thread::handleSpecificError(
     rtl::OUStringBuffer b(data.aInstalledPackage->getDisplayName());
     b.append(static_cast< sal_Unicode >(' '));
     {
-        vos::OGuard g( Application::GetSolarMutex() );
+        SolarMutexGuard g;
         if(!m_stop)
             b.append(m_dialog.m_version);
     }
@@ -490,7 +490,7 @@ void UpdateDialog::Thread::handleSpecificError(
     {
         b.append(static_cast< sal_Unicode >(' '));
         {
-            vos::OGuard g( Application::GetSolarMutex() );
+            SolarMutexGuard g;
             if(!m_stop)
                 b.append(m_dialog.m_browserbased);
         }
@@ -538,13 +538,13 @@ bool UpdateDialog::Thread::update(
     bool ret = false;
     if (du.unsatisfiedDependencies.getLength() == 0)
     {
-        vos::OGuard g(Application::GetSolarMutex());
+        SolarMutexGuard g;
         if (!m_stop) {
             m_dialog.addEnabledUpdate(getUpdateDisplayString(data), data);
         }
         ret = !m_stop;
     } else {
-        vos::OGuard g(Application::GetSolarMutex());
+        SolarMutexGuard g;
         if (!m_stop) {
                 m_dialog.addDisabledUpdate(du);
         }
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 47d191be5aa3..88d80966478a 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -188,7 +188,7 @@ UpdateInstallDialog::Thread::Thread(
 void UpdateInstallDialog::Thread::stop() {
     cssu::Reference< css::task::XAbortChannel > abort;
     {
-        vos::OGuard g(Application::GetSolarMutex());
+        SolarMutexGuard g;
         abort = m_abort;
         m_stop = true;
     }
@@ -217,7 +217,7 @@ void UpdateInstallDialog::Thread::execute()
 
     {
         //make sure m_dialog is still alive
-        ::vos::OGuard g(Application::GetSolarMutex());
+        SolarMutexGuard g;
         if (! m_stop)
              m_dialog.updateDone();
     }
@@ -389,7 +389,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
 
             //update the name of the extension which is to be downloaded
             {
-                ::vos::OGuard g(Application::GetSolarMutex());
+                SolarMutexGuard g;
                 if (m_stop) {
                     return;
                 }
@@ -423,7 +423,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
             }
             //update the progress and display download error
             {
-                ::vos::OGuard g(Application::GetSolarMutex());
+                SolarMutexGuard g;
                 if (m_stop) {
                     return;
                 }
@@ -450,7 +450,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
     }
     catch (cssu::Exception & e)
     {
-        ::vos::OGuard g(Application::GetSolarMutex());
+        SolarMutexGuard g;
         if (m_stop) {
             return;
         }
@@ -461,7 +461,7 @@ void UpdateInstallDialog::Thread::installExtensions()
 {
     //Update the fix text in the dialog to "Installing extensions..."
     {
-        vos::OGuard g(Application::GetSolarMutex());
+        SolarMutexGuard g;
         if (m_stop) {
             return;
         }
@@ -475,7 +475,7 @@ void UpdateInstallDialog::Thread::installExtensions()
     {
         //update the name of the extension which is to be installed
         {
-            ::vos::OGuard g(Application::GetSolarMutex());
+            SolarMutexGuard g;
             if (m_stop) {
                 return;
             }
@@ -499,7 +499,7 @@ void UpdateInstallDialog::Thread::installExtensions()
             cssu::Reference< css::task::XAbortChannel > xAbortChannel(
                 curData.aInstalledPackage->createAbortChannel() );
             {
-                vos::OGuard g(Application::GetSolarMutex());
+                SolarMutexGuard g;
                 if (m_stop) {
                     return;
                 }
@@ -555,7 +555,7 @@ void UpdateInstallDialog::Thread::installExtensions()
 
         if (bLicenseDeclined)
         {
-            ::vos::OGuard g(Application::GetSolarMutex());
+            SolarMutexGuard g;
             if (m_stop) {
                 return;
             }
@@ -564,7 +564,7 @@ void UpdateInstallDialog::Thread::installExtensions()
         }
         else if (!xExtension.is() || bError)
         {
-            ::vos::OGuard g(Application::GetSolarMutex());
+            SolarMutexGuard g;
             if (m_stop) {
                 return;
             }
@@ -573,7 +573,7 @@ void UpdateInstallDialog::Thread::installExtensions()
         }
     }
     {
-        vos::OGuard g(Application::GetSolarMutex());
+        SolarMutexGuard g;
         if (m_stop) {
             return;
         }
@@ -600,7 +600,7 @@ void UpdateInstallDialog::Thread::removeTempDownloads()
 void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, UpdateData & aUpdateData)
 {
     {
-        ::vos::OGuard g(Application::GetSolarMutex());
+        SolarMutexGuard g;
         if (m_stop) {
             return;
         }
@@ -635,7 +635,7 @@ void UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update
     {
         //the user may have cancelled the dialog because downloading took to long
         {
-            ::vos::OGuard g(Application::GetSolarMutex());
+            SolarMutexGuard g;
             if (m_stop) {
                 return;
             }
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 2303aada9185..dd7359a42c2a 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -101,7 +101,7 @@ void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange)
     _iMax = nRange;
     if (_bVisible) {
         _bProgressEnd = sal_False;
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         if ( _eBitmapMode == BM_FULLSCREEN )
             ShowFullScreenMode( TRUE );
         Show();
@@ -139,7 +139,7 @@ void SAL_CALL SplashScreen::reset()
 void SAL_CALL SplashScreen::setText(const OUString& rText)
     throw (RuntimeException)
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
     if ( _sProgressText != rText )
     {
         _sProgressText = rText;
@@ -160,7 +160,7 @@ void SAL_CALL SplashScreen::setValue(sal_Int32 nValue)
     RTL_LOGFILE_CONTEXT( aLog, "::SplashScreen::setValue (lo119109)" );
     RTL_LOGFILE_CONTEXT_TRACE1( aLog, "value=%d", nValue );
 
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
     if (_bVisible && !_bProgressEnd) {
         if ( _eBitmapMode == BM_FULLSCREEN )
             ShowFullScreenMode( TRUE );