use SolarMutexGuard to guard the SolarMutex

3 files changed, 9 insertions, 9 deletions

diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx
index 7e2fb0f6cb89..f7f03347a9d1 100644
--- a/sd/source/ui/view/ViewClipboard.cxx
+++ b/sd/source/ui/view/ViewClipboard.cxx
@@ -245,7 +245,7 @@ USHORT ViewClipboard::InsertSlides (
     }
     if (nInsertPgCnt > 0)
     {
-        const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        const SolarMutexGuard aGuard;
         ::sd::Window* pWin = mrView.GetViewShell()->GetActiveWindow();
         const BOOL bWait = pWin && pWin->IsWait();
 
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 0e35f1c837b5..2e5d92d124eb 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -197,7 +197,7 @@ void ViewTabBar::disposing (void)
     }
 
     {
-        const ::vos::OGuard aSolarGuard (Application::GetSolarMutex());
+        const SolarMutexGuard aSolarGuard;
         // Set all references to the one tab page to NULL and delete the page.
         for (USHORT nIndex=0; nIndex<mpTabControl->GetPageCount(); ++nIndex)
             mpTabControl->SetTabPage(nIndex, NULL);
@@ -321,7 +321,7 @@ void SAL_CALL ViewTabBar::addTabBarButtonAfter (
     const TabBarButton& rAnchor)
     throw (::com::sun::star::uno::RuntimeException)
 {
-    const ::vos::OGuard aSolarGuard (Application::GetSolarMutex());
+    const SolarMutexGuard aSolarGuard;
     AddTabBarButton(rButton, rAnchor);
 }
 
@@ -331,7 +331,7 @@ void SAL_CALL ViewTabBar::addTabBarButtonAfter (
 void SAL_CALL ViewTabBar::appendTabBarButton (const TabBarButton& rButton)
     throw (::com::sun::star::uno::RuntimeException)
 {
-    const ::vos::OGuard aSolarGuard (Application::GetSolarMutex());
+    const SolarMutexGuard aSolarGuard;
     AddTabBarButton(rButton);
 }
 
@@ -340,7 +340,7 @@ void SAL_CALL ViewTabBar::appendTabBarButton (const TabBarButton& rButton)
 void SAL_CALL ViewTabBar::removeTabBarButton (const TabBarButton& rButton)
     throw (::com::sun::star::uno::RuntimeException)
 {
-    const ::vos::OGuard aSolarGuard (Application::GetSolarMutex());
+    const SolarMutexGuard aSolarGuard;
     RemoveTabBarButton(rButton);
 }
 
@@ -350,7 +350,7 @@ void SAL_CALL ViewTabBar::removeTabBarButton (const TabBarButton& rButton)
 sal_Bool SAL_CALL ViewTabBar::hasTabBarButton (const TabBarButton& rButton)
     throw (::com::sun::star::uno::RuntimeException)
 {
-    const ::vos::OGuard aSolarGuard (Application::GetSolarMutex());
+    const SolarMutexGuard aSolarGuard;
     return HasTabBarButton(rButton);
 }
 
@@ -360,7 +360,7 @@ sal_Bool SAL_CALL ViewTabBar::hasTabBarButton (const TabBarButton& rButton)
 Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
-    const ::vos::OGuard aSolarGuard (Application::GetSolarMutex());
+    const SolarMutexGuard aSolarGuard;
     return GetTabBarButtons();
 }
 
@@ -394,7 +394,7 @@ const Sequence<sal_Int8>& ViewTabBar::getUnoTunnelId (void)
     static Sequence<sal_Int8>* pSequence = NULL;
     if (pSequence == NULL)
     {
-        const ::vos::OGuard aSolarGuard (Application::GetSolarMutex());
+        const SolarMutexGuard aSolarGuard;
         if (pSequence == NULL)
         {
             static ::com::sun::star::uno::Sequence<sal_Int8> aSequence (16);
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index 2ebef279c5e7..59822d5a53c2 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -469,7 +469,7 @@ void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& )
 
                 if( !!aScanBmp )
                 {
-                    const ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                    const SolarMutexGuard aGuard;
                     SdrPage*            pPage = mpDrawView->GetSdrPageView()->GetPage();
                     Size                aBmpSize( aScanBmp.GetPrefSize() ), aPageSize( pPage->GetSize() );
                     const MapMode       aMap100( MAP_100TH_MM );