replace ScUnoGuard by SolarMutexGuard

ScUnoGaurd provide a Guard wrapper around Application::GetSolarMutex().
This is now provided by the class SolarMutexGuard.

1 files changed, 7 insertions, 7 deletions

diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx
index c5e86135319b..8f0b38c0eed9 100644
--- a/sc/source/ui/unoobj/eventuno.cxx
+++ b/sc/source/ui/unoobj/eventuno.cxx
@@ -34,10 +34,10 @@
 
 #include "eventuno.hxx"
 #include "miscuno.hxx"
-#include "unoguard.hxx"
 #include "docsh.hxx"
 #include "sheetevents.hxx"
 #include "unonames.hxx"
+#include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
 
@@ -85,7 +85,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const rtl::OUString& aName, const
     throw(lang::IllegalArgumentException, container::NoSuchElementException,
           lang::WrappedTargetException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     if (!mpDocShell)
         throw uno::RuntimeException();
 
@@ -137,7 +137,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const rtl::OUString& aName, const
 uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName )
     throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     sal_Int32 nEvent = lcl_GetEventFromName(aName);
     if (nEvent < 0)
         throw container::NoSuchElementException();
@@ -168,7 +168,7 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName )
 
 uno::Sequence<rtl::OUString> SAL_CALL ScSheetEventsObj::getElementNames() throw(uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     uno::Sequence<rtl::OUString> aNames(SC_SHEETEVENT_COUNT);
     for (sal_Int32 nEvent=0; nEvent<SC_SHEETEVENT_COUNT; ++nEvent)
         aNames[nEvent] = ScSheetEvents::GetEventName(nEvent);
@@ -177,7 +177,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScSheetEventsObj::getElementNames() throw(
 
 sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const ::rtl::OUString& aName ) throw(uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     sal_Int32 nEvent = lcl_GetEventFromName(aName);
     return (nEvent >= 0);
 }
@@ -186,13 +186,13 @@ sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const ::rtl::OUString& aName ) th
 
 uno::Type SAL_CALL ScSheetEventsObj::getElementType() throw(uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     return getCppuType((uno::Sequence<beans::PropertyValue>*)0);
 }
 
 sal_Bool SAL_CALL ScSheetEventsObj::hasElements() throw(uno::RuntimeException)
 {
-    ScUnoGuard aGuard;
+    SolarMutexGuard aGuard;
     if (mpDocShell)
         return sal_True;
     return sal_False;