use SolarMutexGuard to guard the SolarMutex

26 files changed, 166 insertions, 166 deletions

diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index d93d6d4b0028..851573252671 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -364,7 +364,7 @@ sal_Bool ColorConfig_Impl::RemoveScheme(const rtl::OUString& rScheme)
  ---------------------------------------------------------------------------*/
 void ColorConfig_Impl::SettingsChanged()
 {
-    vos::OGuard aVclGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aVclGuard;
 
     ImplUpdateApplicationSettings();
 
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index b1751d50526f..59759652b2f4 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -433,7 +433,7 @@ void    ExtendedColorConfig_Impl::Notify( const uno::Sequence<OUString>& /*rProp
     //loading via notification always uses the default setting
     Load(::rtl::OUString());
 
-    vos::OGuard aVclGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aVclGuard;
 
     if(m_bLockBroadcast)
     {
@@ -565,7 +565,7 @@ sal_Bool ExtendedColorConfig_Impl::RemoveScheme(const rtl::OUString& rScheme)
  ---------------------------------------------------------------------------*/
 void ExtendedColorConfig_Impl::SettingsChanged()
 {
-    vos::OGuard aVclGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aVclGuard;
 
     Broadcast( SfxSimpleHint( SFX_HINT_COLORS_CHANGED ) );
 }
@@ -677,7 +677,7 @@ ExtendedColorConfigValue ExtendedColorConfig::GetComponentColorConfigValue(const
  ---------------------------------------------------------------------------*/
 void ExtendedColorConfig::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
-    vos::OGuard aVclGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aVclGuard;
 
     Broadcast( rHint );
 }
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index e77b0a168247..fe06ee97b2c2 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -312,7 +312,7 @@ namespace svt
 
                             if ( pData->mbIsFolder )
                             {
-                                ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                                SolarMutexGuard aGuard;
                                 ::svtools::VolumeInfo aVolInfo( pData->mbIsVolume, pData->mbIsRemote,
                                                                 pData->mbIsRemoveable, pData->mbIsFloppy,
                                                                 pData->mbIsCompactDisc );
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 56ab67980296..346b02632784 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -2234,7 +2234,7 @@ void SvtFileView_Impl::CancelRunningAsyncAction()
 //-----------------------------------------------------------------------
 void SvtFileView_Impl::onTimeout( CallbackTimer* )
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( maMutex );
     if ( !m_bRunningAsyncAction )
         // there might have been a race condition while we waited for the mutex
@@ -2252,7 +2252,7 @@ void SvtFileView_Impl::onTimeout( CallbackTimer* )
 //-----------------------------------------------------------------------
 void SvtFileView_Impl::enumerationDone( ::svt::EnumerationResult _eResult )
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( maMutex );
 
     m_pContentEnumerator = NULL;
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index 7eedf238a81d..f3baa7107caa 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -172,7 +172,7 @@ Reference< XAccessibleContext > SAL_CALL ToolbarMenuAcc::getAccessibleContext()
 
 sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() throw (RuntimeException)
 {
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
 
     return mpParent->getAccessibleChildCount();
@@ -182,7 +182,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() throw (RuntimeExcep
 
 Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
 
     return mpParent->getAccessibleChild(i);
@@ -193,7 +193,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32
 Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
 
     Reference< XAccessible > xRet;
 
@@ -208,7 +208,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (R
 
 sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeException)
 {
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
 
     Window* pParent = mpParent->mrMenu.GetParent();
@@ -245,7 +245,7 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() throw (RuntimeExcep
 OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     OUString aRet;
 
     if( mpParent )
@@ -294,7 +294,7 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet(
 Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     const ::rtl::OUString aEmptyStr;
     Reference< XAccessible > xParent( getAccessibleParent() );
     Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr );
@@ -376,7 +376,7 @@ sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint ) thro
 
 Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
 {
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
 
     Reference< XAccessible > xRet;
@@ -409,7 +409,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const aw
 awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() throw (RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     const Point         aOutPos( mpParent->mrMenu.GetPosPixel() );
     const Size          aOutSize( mpParent->mrMenu.GetOutputSizePixel() );
     awt::Rectangle      aRet;
@@ -427,7 +427,7 @@ awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() throw (RuntimeException)
 awt::Point SAL_CALL ToolbarMenuAcc::getLocation() throw (RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     const Point aOutPos( mpParent->mrMenu.GetPosPixel() );
     return awt::Point( aOutPos.X(), aOutPos.Y() );
 }
@@ -437,7 +437,7 @@ awt::Point SAL_CALL ToolbarMenuAcc::getLocation() throw (RuntimeException)
 awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen()  throw (RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     const Point aScreenPos( mpParent->mrMenu.OutputToAbsoluteScreenPixel( Point() ) );
     return awt::Point( aScreenPos.X(), aScreenPos.Y() );
 }
@@ -447,7 +447,7 @@ awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen()  throw (RuntimeExcepti
 awt::Size SAL_CALL ToolbarMenuAcc::getSize() throw (RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     const Size aOutSize( mpParent->mrMenu.GetOutputSizePixel() );
     return awt::Size( aOutSize.Width(), aOutSize.Height() );
 }
@@ -457,7 +457,7 @@ awt::Size SAL_CALL ToolbarMenuAcc::getSize() throw (RuntimeException)
 void SAL_CALL ToolbarMenuAcc::grabFocus() throw (RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     mpParent->mrMenu.GrabFocus();
 }
 
@@ -491,7 +491,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getBackground() throw (RuntimeException)
 
 void SAL_CALL ToolbarMenuAcc::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
 
     mpParent->selectAccessibleChild( nChildIndex );
@@ -501,7 +501,7 @@ void SAL_CALL ToolbarMenuAcc::selectAccessibleChild( sal_Int32 nChildIndex ) thr
 
 sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
     return mpParent->isAccessibleChildSelected( nChildIndex );
 }
@@ -510,7 +510,7 @@ sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildInd
 
 void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection() throw (RuntimeException)
 {
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
     mpParent->clearAccessibleSelection();
 }
@@ -527,7 +527,7 @@ void SAL_CALL ToolbarMenuAcc::selectAllAccessibleChildren() throw (RuntimeExcept
 
 sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() throw (RuntimeException)
 {
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
 
     return mpParent->mnHighlightedEntry != -1 ? 1 : 0;
@@ -538,7 +538,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() throw (Runt
 Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
 
     if( (mpParent->mnHighlightedEntry != -1) && (nSelectedChildIndex == 0) )
     {
@@ -563,7 +563,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sa
 void SAL_CALL ToolbarMenuAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     // Because of the single selection we can reset the whole selection when
     // the specified child is currently selected.
     if (isAccessibleChildSelected(nChildIndex))
@@ -578,7 +578,7 @@ void SAL_CALL ToolbarMenuAcc::disposing (void)
 
     {
         // Make a copy of the list and clear the original.
-        const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        const SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard (m_aMutex);
         aListenerListCopy = mxEventListeners;
         mxEventListeners.clear();
@@ -662,7 +662,7 @@ void SAL_CALL ToolbarMenuEntryAcc::disposing (void)
 
     {
         // Make a copy of the list and clear the original.
-        const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        const SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard (m_aMutex);
         aListenerListCopy = mxEventListeners;
         mxEventListeners.clear();
@@ -714,7 +714,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleChild( sal_I
 
 Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() throw (RuntimeException)
 {
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     Reference< XAccessible > xRet;
 
     if( mpParent )
@@ -727,7 +727,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() thr
 
 sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent() throw (RuntimeException)
 {
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     // The index defaults to -1 to indicate the child does not belong to its
     // parent.
     sal_Int32 nIndexInParent = -1;
@@ -773,7 +773,7 @@ sal_Int16 SAL_CALL ToolbarMenuEntryAcc::getAccessibleRole() throw (RuntimeExcept
 
 ::rtl::OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeException)
 {
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     String              aRet;
 
     if( mpParent )
@@ -801,7 +801,7 @@ Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleR
 
 Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStateSet() throw (RuntimeException)
 {
-    const vos::OGuard                   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     ::utl::AccessibleStateSetHelper*    pStateSet = new ::utl::AccessibleStateSetHelper;
 
     if( mpParent )
@@ -914,7 +914,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleAtPoint( con
 
 awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds() throw (RuntimeException)
 {
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     awt::Rectangle      aRet;
 
     if( mpParent )
@@ -946,7 +946,7 @@ awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocation() throw (RuntimeException)
 
 awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen() throw (RuntimeException)
 {
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     awt::Point aRet;
 
     if( mpParent )
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 3c8a9eac33d9..c6e5f32fc7ac 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -209,7 +209,7 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAcc
 sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount()
     throw (uno::RuntimeException)
 {
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
 
     sal_Int32 nCount = mpParent->ImplGetVisibleItemCount();
@@ -224,7 +224,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard                               aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     uno::Reference< accessibility::XAccessible >    xRet;
     ValueSetItem* pItem = getItem (sal::static_int_cast< USHORT >(i));
 
@@ -242,7 +242,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
     throw (uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard                               aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     Window*                                         pParent = mpParent->GetParent();
     uno::Reference< accessibility::XAccessible >    xRet;
 
@@ -258,7 +258,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent()
     throw (uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard       aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     Window*                 pParent = mpParent->GetParent();
     sal_Int32               nRet = 0;
 
@@ -298,7 +298,7 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole()
     throw (uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     String              aRet( RTL_CONSTASCII_USTRINGPARAM( "ValueSet" ) );
 
     return aRet;
@@ -310,7 +310,7 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole()
     throw (uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     String              aRet;
 
     if ( mpParent )
@@ -363,7 +363,7 @@ lang::Locale SAL_CALL ValueSetAcc::getLocale()
     throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard                               aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     const ::rtl::OUString                           aEmptyStr;
     uno::Reference< accessibility::XAccessible >    xParent( getAccessibleParent() );
     lang::Locale                                    aRet( aEmptyStr, aEmptyStr, aEmptyStr );
@@ -450,7 +450,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
     throw (uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard                               aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     const USHORT                                    nItemId = mpParent->GetItemId( Point( aPoint.X, aPoint.Y ) );
     uno::Reference< accessibility::XAccessible >    xRet;
 
@@ -476,7 +476,7 @@ awt::Rectangle SAL_CALL ValueSetAcc::getBounds()
     throw (uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     const Point         aOutPos( mpParent->GetPosPixel() );
     const Size          aOutSize( mpParent->GetOutputSizePixel() );
     awt::Rectangle      aRet;
@@ -510,7 +510,7 @@ awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen()
     throw (uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     const Point         aScreenPos( mpParent->OutputToAbsoluteScreenPixel( Point() ) );
     awt::Point          aRet;
 
@@ -541,7 +541,7 @@ void SAL_CALL ValueSetAcc::grabFocus()
     throw (uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     mpParent->GrabFocus();
 }
 
@@ -580,7 +580,7 @@ void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     ValueSetItem* pItem = getItem (sal::static_int_cast< USHORT >(nChildIndex));
 
     if(pItem != NULL)
@@ -598,7 +598,7 @@ sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     ValueSetItem* pItem = getItem (sal::static_int_cast< USHORT >(nChildIndex));
     sal_Bool            bRet = sal_False;
 
@@ -616,7 +616,7 @@ void SAL_CALL ValueSetAcc::clearAccessibleSelection()
     throw (uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     mpParent->SetNoSelection();
 }
 
@@ -635,7 +635,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount()
     throw (uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     sal_Int32           nRet = 0;
 
     for( USHORT i = 0, nCount = getItemCount(); i < nCount; i++ )
@@ -655,7 +655,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAc
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard                               aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     uno::Reference< accessibility::XAccessible >    xRet;
 
     for( USHORT i = 0, nCount = getItemCount(), nSel = 0; ( i < nCount ) && !xRet.is(); i++ )
@@ -675,7 +675,7 @@ void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
     ThrowIfDisposed();
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     // Because of the single selection we can reset the whole selection when
     // the specified child is currently selected.
     if (isAccessibleChildSelected(nChildIndex))
@@ -705,7 +705,7 @@ void SAL_CALL ValueSetAcc::disposing (void)
 
     {
         // Make a copy of the list and clear the original.
-        const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+        const SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard (m_aMutex);
         aListenerListCopy = mxEventListeners;
         mxEventListeners.clear();
@@ -913,7 +913,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleParent()
     throw (uno::RuntimeException)
 {
-    const vos::OGuard                               aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     uno::Reference< accessibility::XAccessible >    xRet;
 
     if( mpParent )
@@ -927,7 +927,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl
 sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent()
     throw (uno::RuntimeException)
 {
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     // The index defaults to -1 to indicate the child does not belong to its
     // parent.
     sal_Int32 nIndexInParent = -1;
@@ -985,7 +985,7 @@ sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole()
 ::rtl::OUString SAL_CALL ValueItemAcc::getAccessibleName()
     throw (uno::RuntimeException)
 {
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     String              aRet;
 
     if( mpParent )
@@ -1015,7 +1015,7 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueItemAcc::g
 uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getAccessibleStateSet()
     throw (uno::RuntimeException)
 {
-    const vos::OGuard                   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     ::utl::AccessibleStateSetHelper*    pStateSet = new ::utl::AccessibleStateSetHelper;
 
     if( mpParent )
@@ -1047,7 +1047,7 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getA
 lang::Locale SAL_CALL ValueItemAcc::getLocale()
     throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException)
 {
-    const vos::OGuard                               aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     const ::rtl::OUString                           aEmptyStr;
     uno::Reference< accessibility::XAccessible >    xParent( getAccessibleParent() );
     lang::Locale                                    aRet( aEmptyStr, aEmptyStr, aEmptyStr );
@@ -1139,7 +1139,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl
 awt::Rectangle SAL_CALL ValueItemAcc::getBounds()
     throw (uno::RuntimeException)
 {
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     awt::Rectangle      aRet;
 
     if( mpParent )
@@ -1178,7 +1178,7 @@ awt::Point SAL_CALL ValueItemAcc::getLocation()
 awt::Point SAL_CALL ValueItemAcc::getLocationOnScreen()
     throw (uno::RuntimeException)
 {
-    const vos::OGuard   aSolarGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aSolarGuard;
     awt::Point          aRet;
 
     if( mpParent )
diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
index a50300d08182..ce5991e8ae27 100644
--- a/svtools/source/edit/textview.cxx
+++ b/svtools/source/edit/textview.cxx
@@ -2089,7 +2089,7 @@ void TextView::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd:
 {
     if ( mpImpl->mbClickedInSelection )
     {
-        vos::OGuard aVclGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aVclGuard;
 
         DBG_ASSERT( mpImpl->maSelection.HasRange(), "TextView::dragGestureRecognized: mpImpl->mbClickedInSelection, but no selection?" );
 
@@ -2142,7 +2142,7 @@ void TextView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourc
 
 void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException)
 {
-    vos::OGuard aVclGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aVclGuard;
 
     BOOL bChanges = FALSE;
     if ( !mpImpl->mbReadOnly && mpImpl->mpDDInfo )
@@ -2258,13 +2258,13 @@ void TextView::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetD
 
 void TextView::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& ) throw (::com::sun::star::uno::RuntimeException)
 {
-    vos::OGuard aVclGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aVclGuard;
     ImpHideDDCursor();
 }
 
 void TextView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException)
 {
-    vos::OGuard aVclGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aVclGuard;
 
     if ( !mpImpl->mpDDInfo )
         mpImpl->mpDDInfo = new TextDDInfo;
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 2342aa4a744e..637df34c395f 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -309,7 +309,7 @@ uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes()
 uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId()
     throw( uno::RuntimeException )
 {
-    vos::OGuard                         aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     static uno::Sequence< sal_Int8 >    aId;
 
     if( aId.getLength() == 0 )
@@ -325,7 +325,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId()
 
 ::comphelper::PropertySetInfo* GraphicDescriptor::createPropertySetInfo()
 {
-    vos::OGuard                     aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     ::comphelper::PropertySetInfo*  pRet = new ::comphelper::PropertySetInfo();
 
     static ::comphelper::PropertyMapEntry aEntries[] =
@@ -364,7 +364,7 @@ void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry**
 void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues )
     throw( beans::UnknownPropertyException, lang::WrappedTargetException )
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     while( *ppEntries )
     {
diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx
index 92aebbeeda53..34fade3fe7ad 100644
--- a/svtools/source/graphic/graphic.cxx
+++ b/svtools/source/graphic/graphic.cxx
@@ -117,7 +117,7 @@ void SAL_CALL Graphic::release() throw()
 uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId_Static()
     throw(uno::RuntimeException)
 {
-    vos::OGuard                         aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     static uno::Sequence< sal_Int8 >    aId;
 
     if( aId.getLength() == 0 )
@@ -236,7 +236,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId()
 
 awt::Size SAL_CALL Graphic::getSize(  ) throw (uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     ::Size aVclSize;
     if( mpGraphic && ( mpGraphic->GetType() != GRAPHIC_NONE ) )
@@ -249,7 +249,7 @@ awt::Size SAL_CALL Graphic::getSize(  ) throw (uno::RuntimeException)
 
 uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getDIB(  ) throw (uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpGraphic && ( mpGraphic->GetType() != GRAPHIC_NONE ) )
     {
@@ -267,7 +267,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getDIB(  ) throw (uno::RuntimeExce
 
 uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getMaskDIB(  ) throw (uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpGraphic && ( mpGraphic->GetType() != GRAPHIC_NONE ) )
     {
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index e81ab38f6d64..5043fe303c5b 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -148,7 +148,7 @@ uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes()
 uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId()
     throw(uno::RuntimeException)
 {
-    vos::OGuard                         aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     static uno::Sequence< sal_Int8 >    aId;
 
     if( aId.getLength() == 0 )
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index 7d6af8c2694a..809b50fc2c2d 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -197,7 +197,7 @@ uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes()
 uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId()
     throw( uno::RuntimeException )
 {
-    vos::OGuard                         aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     static uno::Sequence< sal_Int8 >    aId;
 
     if( aId.getLength() == 0 )
@@ -213,7 +213,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId()
 
 ::comphelper::PropertySetInfo* GraphicRendererVCL::createPropertySetInfo()
 {
-    vos::OGuard                     aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     ::comphelper::PropertySetInfo*  pRet = new ::comphelper::PropertySetInfo();
 
     static ::comphelper::PropertyMapEntry aEntries[] =
@@ -239,7 +239,7 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry*
            lang::IllegalArgumentException,
               lang::WrappedTargetException )
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     while( *ppEntries )
     {
@@ -291,7 +291,7 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry*
 void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues )
     throw( beans::UnknownPropertyException, lang::WrappedTargetException )
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     while( *ppEntries )
     {
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index 6854ce23c9e6..f4eca8e0f2b0 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -90,7 +90,7 @@ IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserReq
         if ( pMTRequest->m_xFrame.is() )
         {
             // this is the main thread, the solar mutex must be locked
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
 
             try
             {
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index 92172c9c5bc5..d2ae5bae8b95 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -146,7 +146,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
         if( ! (m_bShowErrorsOnce && m_bJavaNotFound_Handled))
         {
            // No suitable JRE found
-            vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aSolarGuard;
             m_bJavaNotFound_Handled = true;
             //We first try to get the patch resource svp680xxx.res
             //If the resource is not found then svt680xxx.res is used
@@ -181,7 +181,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
         if( !(m_bShowErrorsOnce && m_bInvalidSettings_Handled))
         {
            // javavendors.xml was updated and Java has not been configured yet
-            vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aSolarGuard;
             m_bInvalidSettings_Handled = true;
             //We first try to get the patch resource svp680xxx.res
             //If the resource is not found then svt680xxx.res is used
@@ -214,7 +214,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
     {
         if( !(m_bShowErrorsOnce && m_bJavaDisabled_Handled))
         {
-            vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aSolarGuard;
             m_bJavaDisabled_Handled = true;
             // Java disabled. Give user a chance to enable Java inside Office.
             //We first try to get the patch resource svp680xxx.res
@@ -259,7 +259,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
         if( !(m_bShowErrorsOnce && m_bVMCreationFailure_Handled))
         {
             // Java not correctly installed, or damaged
-            vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aSolarGuard;
             m_bVMCreationFailure_Handled = true;
             //We first try to get the patch resource svp680xxx.res
             //If the resource is not found then svt680xxx.res is used
@@ -294,7 +294,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
         {
             // a new JRE was selected, but office needs to be restarted
             //before it can be used.
-            vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aSolarGuard;
             m_bRestartRequired_Handled = true;
             //We first try to get the patch resource svp680xxx.res
             //If the resource is not found then svt680xxx.res is used
diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx
index 41bdc1de79cb..7389b30bc142 100644
--- a/svtools/source/misc/cliplistener.cxx
+++ b/svtools/source/misc/cliplistener.cxx
@@ -62,7 +62,7 @@ void SAL_CALL TransferableClipboardListener::changedContents(
 {
     if ( aLink.IsSet() )
     {
-        const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        const SolarMutexGuard aGuard;
 
         TransferableDataHelper aDataHelper( rEventObject.Contents );
         aLink.Call( &aDataHelper );
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 59639f860e91..9ed80ae82971 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -133,7 +133,7 @@ void SAL_CALL EmbedEventListener_Impl::stateChanged( const lang::EventObject&,
                                                     ::sal_Int32 nNewState )
     throw ( uno::RuntimeException )
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     nState = nNewState;
     if ( !pObject )
         return;
@@ -169,7 +169,7 @@ void SAL_CALL EmbedEventListener_Impl::stateChanged( const lang::EventObject&,
 
 void SAL_CALL EmbedEventListener_Impl::modified( const lang::EventObject& ) throw (uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if ( pObject && pObject->GetViewAspect() != embed::Aspects::MSOLE_ICON )
     {
         if ( nState == embed::EmbedStates::RUNNING )
@@ -190,7 +190,7 @@ void SAL_CALL EmbedEventListener_Impl::modified( const lang::EventObject& ) thro
 
 void SAL_CALL EmbedEventListener_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException )
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     if ( pObject && aEvent.EventName.equalsAscii("OnVisAreaChanged") && pObject->GetViewAspect() != embed::Aspects::MSOLE_ICON && !pObject->IsChart() )
     {
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 109e6d111497..3d0b34e9fec7 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -495,7 +495,7 @@ static String GetDescriptionByFactory_Impl( const String& rFactory )
     String aRet;
     if ( nResId )
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         aRet = String( SvtResId( nResId ) );
     }
     return aRet;
@@ -773,7 +773,7 @@ String SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObje
             sDescription = sExtension;
             sDescription += '-';
         }
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         sDescription += String( SvtResId( nResId ) );
     }
 
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 91ac2f22f03f..f4ee42cfeebd 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -354,7 +354,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th
 {
     if( !maAny.hasValue() || !mpFormats->size() || ( maLastFormat != rFlavor.MimeType ) )
     {
-        const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        const SolarMutexGuard aGuard;
 
         maLastFormat = rFlavor.MimeType;
         maAny = Any();
@@ -471,7 +471,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th
 
 Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() throw( RuntimeException )
 {
-    const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aGuard;
 
     try
     {
@@ -498,7 +498,7 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr
 
 sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& rFlavor ) throw( RuntimeException )
 {
-    const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aGuard;
     sal_Bool            bRet = sal_False;
 
     try
@@ -530,7 +530,7 @@ sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& r
 
 void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) throw( RuntimeException )
 {
-    const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aGuard;
 
     try
     {
@@ -566,7 +566,7 @@ void SAL_CALL TransferableHelper::disposing( const EventObject& ) throw( Runtime
 
 void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE ) throw( RuntimeException )
 {
-    const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aGuard;
 
     try
     {
@@ -1287,7 +1287,7 @@ TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< X
 
 void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::ClipboardEvent& event ) throw (RuntimeException)
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
         // the SolarMutex here is necessary, since
         // - we cannot call mpListener without our own mutex locked
         // - Rebind respectively InitFormats (called by Rebind) will
@@ -1511,7 +1511,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
 
 void TransferableDataHelper::InitFormats()
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( mpImpl->maMutex );
 
     mpFormats->clear();
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 165fe9478bc4..adc955af754a 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -83,7 +83,7 @@ void SAL_CALL DragSourceHelper::DragGestureListener::disposing( const EventObjec
 
 void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( const DragGestureEvent& rDGE ) throw( RuntimeException )
 {
-    const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aGuard;
 
     const Point aPtPixel( rDGE.DragOriginX, rDGE.DragOriginY );
     mrParent.StartDrag( rDGE.DragAction, aPtPixel );
@@ -144,7 +144,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::disposing( const EventObject
 
 void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEvent& rDTDE ) throw( RuntimeException )
 {
-    const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aGuard;
 
     try
     {
@@ -195,7 +195,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEv
 
 void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetDragEnterEvent& rDTDEE ) throw( RuntimeException )
 {
-    const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aGuard;
 
     try
     {
@@ -212,7 +212,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetD
 
 void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDragEvent& rDTDE ) throw( RuntimeException )
 {
-    const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aGuard;
 
     try
     {
@@ -238,7 +238,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDr
 
 void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEvent& ) throw( RuntimeException )
 {
-    const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    const SolarMutexGuard aGuard;
 
     try
     {
diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index 562bdd0b414a..53a99ec64609 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.cxx
@@ -62,13 +62,13 @@ FrameStatusListener::~FrameStatusListener()
 
 Reference< XFrame > FrameStatusListener::getFrameInterface() const
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     return m_xFrame;
 }
 
 Reference< XMultiServiceFactory > FrameStatusListener::getServiceManager() const
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     return m_xServiceManager;
 }
 
@@ -106,7 +106,7 @@ throw (::com::sun::star::uno::RuntimeException)
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     if ( m_bDisposed )
         throw DisposedException();
 
@@ -156,7 +156,7 @@ throw ( RuntimeException )
 {
     Reference< XInterface > xSource( Source.Source );
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     URLToDispatchMap::iterator pIter = m_aListenerMap.begin();
     while ( pIter != m_aListenerMap.end() )
@@ -193,7 +193,7 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL )
     com::sun::star::util::URL    aTargetURL;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         URLToDispatchMap::iterator pIter = m_aListenerMap.find( aCommandURL );
 
         // Already in the list of status listener. Do nothing.
@@ -256,7 +256,7 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL )
 
 void FrameStatusListener::removeStatusListener( const rtl::OUString& aCommandURL )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     URLToDispatchMap::iterator pIter = m_aListenerMap.find( aCommandURL );
     if ( pIter != m_aListenerMap.end() )
@@ -289,7 +289,7 @@ void FrameStatusListener::bindListener()
     Reference< XStatusListener > xStatusListener;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( !m_bInitialized )
             return;
@@ -360,7 +360,7 @@ void FrameStatusListener::bindListener()
 
 void FrameStatusListener::unbindListener()
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( !m_bInitialized )
         return;
@@ -406,7 +406,7 @@ void FrameStatusListener::updateStatus( const rtl::OUString aCommandURL )
     com::sun::star::util::URL aTargetURL;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( !m_bInitialized )
             return;
diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx
index 80768e8dc2a5..8226fa6dd652 100644
--- a/svtools/source/uno/generictoolboxcontroller.cxx
+++ b/svtools/source/uno/generictoolboxcontroller.cxx
@@ -92,7 +92,7 @@ GenericToolboxController::~GenericToolboxController()
 void SAL_CALL GenericToolboxController::dispose()
 throw ( RuntimeException )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     svt::ToolboxController::dispose();
 
@@ -108,7 +108,7 @@ throw ( RuntimeException )
     ::rtl::OUString                     aCommandURL;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( m_bDisposed )
             throw DisposedException();
@@ -149,7 +149,7 @@ throw ( RuntimeException )
 void GenericToolboxController::statusChanged( const FeatureStateEvent& Event )
 throw ( RuntimeException )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( m_bDisposed )
         return;
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index c928b66275d5..5079120b3bad 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -95,7 +95,7 @@ OGenericUnoDialog::~OGenericUnoDialog()
 {
     if ( m_pDialog )
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( m_pDialog )
             destroyDialog();
@@ -242,7 +242,7 @@ bool OGenericUnoDialog::impl_ensureDialog_lck()
 sal_Int16 SAL_CALL OGenericUnoDialog::execute(  ) throw(RuntimeException)
 {
     // both creation and execution of the dialog must be guarded with the SolarMutex, so be generous here
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
 
     Dialog* pDialogToExecute = NULL;
     // create the dialog, if neccessary
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index 7156fe05c9d4..924543c0516b 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -112,7 +112,7 @@ void PopupMenuControllerBase::resetPopupMenu( com::sun::star::uno::Reference< co
          pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
          if ( pPopupMenu )
          {
-            vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aSolarMutexGuard;
 
             PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
             pVCLPopupMenu->Clear();
@@ -396,7 +396,7 @@ void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopu
     if ( m_xFrame.is() && !m_xPopupMenu.is() )
     {
         // Create popup menu on demand
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         m_xPopupMenu = xPopupMenu;
         m_xPopupMenu->addMenuListener( Reference< awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY ));
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index 55b6a7ddae6d..8547cd431edd 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -85,19 +85,19 @@ StatusbarController::~StatusbarController()
 
 Reference< XFrame > StatusbarController::getFrameInterface() const
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     return m_xFrame;
 }
 
 Reference< XMultiServiceFactory > StatusbarController::getServiceManager() const
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     return m_xServiceManager;
 }
 
 Reference< XLayoutManager > StatusbarController::getLayoutManager() const
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     Reference< XLayoutManager > xLayoutManager;
     Reference< XPropertySet > xPropSet( m_xFrame, UNO_QUERY );
     if ( xPropSet.is() )
@@ -118,7 +118,7 @@ Reference< XLayoutManager > StatusbarController::getLayoutManager() const
 
 Reference< XURLTransformer > StatusbarController::getURLTransformer() const
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     if ( !m_xURLTransformer.is() && m_xServiceManager.is() )
     {
         m_xURLTransformer = Reference< XURLTransformer >(
@@ -171,7 +171,7 @@ throw ( Exception, RuntimeException )
     bool bInitialized( true );
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( m_bDisposed )
             throw DisposedException();
@@ -181,7 +181,7 @@ throw ( Exception, RuntimeException )
 
     if ( !bInitialized )
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         m_bInitialized = sal_True;
 
         PropertyValue aPropValue;
@@ -211,7 +211,7 @@ void SAL_CALL StatusbarController::update()
 throw ( RuntimeException )
 {
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         if ( m_bDisposed )
             throw DisposedException();
     }
@@ -227,7 +227,7 @@ throw (::com::sun::star::uno::RuntimeException)
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         if ( m_bDisposed )
             throw DisposedException();
     }
@@ -235,7 +235,7 @@ throw (::com::sun::star::uno::RuntimeException)
     com::sun::star::lang::EventObject aEvent( xThis );
     m_aListenerContainer.disposeAndClear( aEvent );
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
     Reference< XURLTransformer > xURLTransformer = getURLTransformer();
     URLToDispatchMap::iterator pIter = m_aListenerMap.begin();
@@ -288,7 +288,7 @@ throw ( RuntimeException )
 {
     Reference< XInterface > xSource( Source.Source );
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( m_bDisposed )
         return;
@@ -312,7 +312,7 @@ throw ( RuntimeException )
 void SAL_CALL StatusbarController::statusChanged( const FeatureStateEvent& Event )
 throw ( RuntimeException )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( m_bDisposed )
         return;
@@ -377,7 +377,7 @@ throw (::com::sun::star::uno::RuntimeException)
 
 void SAL_CALL StatusbarController::doubleClick() throw (::com::sun::star::uno::RuntimeException)
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( m_bDisposed )
         return;
@@ -393,7 +393,7 @@ void StatusbarController::addStatusListener( const rtl::OUString& aCommandURL )
     com::sun::star::util::URL    aTargetURL;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         URLToDispatchMap::iterator pIter = m_aListenerMap.find( aCommandURL );
 
         // Already in the list of status listener. Do nothing.
@@ -454,7 +454,7 @@ void StatusbarController::addStatusListener( const rtl::OUString& aCommandURL )
 
 void StatusbarController::removeStatusListener( const rtl::OUString& aCommandURL )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     URLToDispatchMap::iterator pIter = m_aListenerMap.find( aCommandURL );
     if ( pIter != m_aListenerMap.end() )
@@ -485,7 +485,7 @@ void StatusbarController::bindListener()
     Reference< XStatusListener > xStatusListener;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( !m_bInitialized )
             return;
@@ -574,7 +574,7 @@ void StatusbarController::bindListener()
 
 void StatusbarController::unbindListener()
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( !m_bInitialized )
         return;
@@ -613,7 +613,7 @@ void StatusbarController::unbindListener()
 
 sal_Bool StatusbarController::isBound() const
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( !m_bInitialized )
         return sal_False;
@@ -637,7 +637,7 @@ void StatusbarController::updateStatus( const rtl::OUString aCommandURL )
     com::sun::star::util::URL aTargetURL;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( !m_bInitialized )
             return;
@@ -676,7 +676,7 @@ void StatusbarController::updateStatus( const rtl::OUString aCommandURL )
     ::Rectangle aRect;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( m_bDisposed )
             throw DisposedException();
@@ -699,7 +699,7 @@ void StatusbarController::execute( const ::com::sun::star::uno::Sequence< ::com:
     rtl::OUString                aCommandURL;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( m_bDisposed )
             throw DisposedException();
@@ -741,7 +741,7 @@ void StatusbarController::execute(
     com::sun::star::util::URL   aTargetURL;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( m_bDisposed )
             throw DisposedException();
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 7cf6b3c18013..111416dfd5fe 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -138,13 +138,13 @@ ToolboxController::~ToolboxController()
 
 Reference< XFrame > ToolboxController::getFrameInterface() const
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     return m_xFrame;
 }
 
 Reference< XMultiServiceFactory > ToolboxController::getServiceManager() const
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     return m_xServiceManager;
 }
 
@@ -153,7 +153,7 @@ Reference< XLayoutManager > ToolboxController::getLayoutManager() const
     Reference< XLayoutManager > xLayoutManager;
     Reference< XPropertySet > xPropSet;
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         xPropSet = Reference< XPropertySet >( m_xFrame, UNO_QUERY );
     }
 
@@ -211,7 +211,7 @@ throw ( Exception, RuntimeException )
     bool bInitialized( true );
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( m_bDisposed )
             throw DisposedException();
@@ -221,7 +221,7 @@ throw ( Exception, RuntimeException )
 
     if ( !bInitialized )
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         m_bInitialized = sal_True;
         //shizhoubo add
         m_bSupportVisiable = sal_False;
@@ -263,7 +263,7 @@ void SAL_CALL ToolboxController::update()
 throw ( RuntimeException )
 {
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         if ( m_bDisposed )
             throw DisposedException();
     }
@@ -279,7 +279,7 @@ throw (::com::sun::star::uno::RuntimeException)
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         if ( m_bDisposed )
             throw DisposedException();
     }
@@ -287,7 +287,7 @@ throw (::com::sun::star::uno::RuntimeException)
     com::sun::star::lang::EventObject aEvent( xThis );
     m_aListenerContainer.disposeAndClear( aEvent );
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
     URLToDispatchMap::iterator pIter = m_aListenerMap.begin();
     while ( pIter != m_aListenerMap.end() )
@@ -332,7 +332,7 @@ throw ( RuntimeException )
 {
     Reference< XInterface > xSource( Source.Source );
 
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( m_bDisposed )
         return;
@@ -367,7 +367,7 @@ throw (::com::sun::star::uno::RuntimeException)
     ::rtl::OUString                     aCommandURL;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( m_bDisposed )
             throw DisposedException();
@@ -436,7 +436,7 @@ void ToolboxController::addStatusListener( const rtl::OUString& aCommandURL )
     com::sun::star::util::URL    aTargetURL;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         URLToDispatchMap::iterator pIter = m_aListenerMap.find( aCommandURL );
 
         // Already in the list of status listener. Do nothing.
@@ -497,7 +497,7 @@ void ToolboxController::addStatusListener( const rtl::OUString& aCommandURL )
 
 void ToolboxController::removeStatusListener( const rtl::OUString& aCommandURL )
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     URLToDispatchMap::iterator pIter = m_aListenerMap.find( aCommandURL );
     if ( pIter != m_aListenerMap.end() )
@@ -528,7 +528,7 @@ void ToolboxController::bindListener()
     Reference< XStatusListener > xStatusListener;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( !m_bInitialized )
             return;
@@ -617,7 +617,7 @@ void ToolboxController::bindListener()
 
 void ToolboxController::unbindListener()
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( !m_bInitialized )
         return;
@@ -656,7 +656,7 @@ void ToolboxController::unbindListener()
 
 sal_Bool ToolboxController::isBound() const
 {
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
 
     if ( !m_bInitialized )
         return sal_False;
@@ -680,7 +680,7 @@ sal_Bool ToolboxController::isHighContrast() const
     Reference< XWindow > xWindow = m_pImpl->m_xParentWindow;
     if ( xWindow.is() )
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pWindow )
             bHighContrast = ( ((ToolBox *)pWindow)->GetSettings().GetStyleSettings().GetHighContrastMode() );
@@ -701,7 +701,7 @@ void ToolboxController::updateStatus( const rtl::OUString aCommandURL )
     com::sun::star::util::URL aTargetURL;
 
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarMutexGuard;
 
         if ( !m_bInitialized )
             return;
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 4377b040028d..7b8f62cf7e28 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -390,7 +390,7 @@ uno::Sequence< uno::Type > SAL_CALL SvUnoImageMapObject::getTypes()
 uno::Sequence< sal_Int8 > SAL_CALL SvUnoImageMapObject::getImplementationId()
     throw (uno::RuntimeException)
 {
-    vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     static uno::Sequence< sal_Int8 > aId;
     if( aId.getLength() == 0 )
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 8c1c0466a9b7..d3ef745b7bd5 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -274,7 +274,7 @@ namespace svt { namespace uno
     //------------------------------------------------------------------------------------------------------------------
     ::rtl::OUString SAL_CALL Wizard::getHelpURL() throw (RuntimeException)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
 
         if ( !m_pDialog )
@@ -287,7 +287,7 @@ namespace svt { namespace uno
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL Wizard::setHelpURL( const ::rtl::OUString& i_HelpURL ) throw (RuntimeException)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
 
         if ( !m_pDialog )
@@ -299,7 +299,7 @@ namespace svt { namespace uno
     //------------------------------------------------------------------------------------------------------------------
     Reference< XWindow > SAL_CALL Wizard::getDialogWindow() throw (RuntimeException)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
 
         ENSURE_OR_RETURN( m_pDialog, "Wizard::getDialogWindow: illegal call (execution did not start, yet)!", NULL );
@@ -309,7 +309,7 @@ namespace svt { namespace uno
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL Wizard::enableButton( ::sal_Int16 i_WizardButton, ::sal_Bool i_Enable ) throw (RuntimeException)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
 
         WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
@@ -321,7 +321,7 @@ namespace svt { namespace uno
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL Wizard::setDefaultButton( ::sal_Int16 i_WizardButton ) throw (RuntimeException)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
 
         WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
@@ -333,7 +333,7 @@ namespace svt { namespace uno
     //------------------------------------------------------------------------------------------------------------------
     sal_Bool SAL_CALL Wizard::travelNext(  ) throw (RuntimeException)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
 
         WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
@@ -345,7 +345,7 @@ namespace svt { namespace uno
     //------------------------------------------------------------------------------------------------------------------
     sal_Bool SAL_CALL Wizard::travelPrevious(  ) throw (RuntimeException)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
 
         WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
@@ -357,7 +357,7 @@ namespace svt { namespace uno
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL Wizard::enablePage( ::sal_Int16 i_PageID, ::sal_Bool i_Enable ) throw (NoSuchElementException, InvalidStateException, RuntimeException)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
 
         WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
@@ -375,7 +375,7 @@ namespace svt { namespace uno
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL Wizard::updateTravelUI(  ) throw (RuntimeException)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
 
         WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
@@ -387,7 +387,7 @@ namespace svt { namespace uno
     //------------------------------------------------------------------------------------------------------------------
     ::sal_Bool SAL_CALL Wizard::advanceTo( ::sal_Int16 i_PageId ) throw (RuntimeException)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
 
         WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
@@ -399,7 +399,7 @@ namespace svt { namespace uno
     //------------------------------------------------------------------------------------------------------------------
     ::sal_Bool SAL_CALL Wizard::goBackTo( ::sal_Int16 i_PageId ) throw (RuntimeException)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
 
         WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
@@ -411,7 +411,7 @@ namespace svt { namespace uno
     //------------------------------------------------------------------------------------------------------------------
     Reference< XWizardPage > SAL_CALL Wizard::getCurrentPage(  ) throw (RuntimeException)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
 
         WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
@@ -423,7 +423,7 @@ namespace svt { namespace uno
     //------------------------------------------------------------------------------------------------------------------
     void SAL_CALL Wizard::activatePath( ::sal_Int16 i_PathIndex, ::sal_Bool i_Final ) throw (NoSuchElementException, InvalidStateException, RuntimeException)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
 
         if ( ( i_PathIndex < 0 ) || ( i_PathIndex >= m_aWizardSteps.getLength() ) )