diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-14 22:18:02 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 17:57:35 -0500 |
| commit | 2622a457404ff6593535219aab8e3cba1cb07c9e (patch) | |
| tree | c0252373576c4ae240a27e54ce22239532038774 /sc/source/ui/unoobj/funcuno.cxx | |
| parent | defa3490b432f331b0f27a9ab14795f476cd3990 (diff) | |
replace ScUnoGuard by SolarMutexGuard
ScUnoGaurd provide a Guard wrapper around Application::GetSolarMutex().
This is now provided by the class SolarMutexGuard.
Diffstat (limited to 'sc/source/ui/unoobj/funcuno.cxx')
| -rw-r--r-- | sc/source/ui/unoobj/funcuno.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index a4b107492e54..7b1efbd8e20f 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -39,7 +39,6 @@ #include "funcuno.hxx" #include "miscuno.hxx" #include "cellsuno.hxx" -#include "unoguard.hxx" #include "scdll.hxx" #include "document.hxx" #include "compiler.hxx" @@ -255,7 +254,7 @@ void ScFunctionAccess::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance( const uno::Reference<lang::XMultiServiceFactory>& ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDLL::Init(); static uno::Reference< uno::XInterface > xInst((::cppu::OWeakObject*) new ScFunctionAccess); return xInst; @@ -304,7 +303,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFunctionAccess::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( &aPropertyMap )); return aRef; @@ -316,7 +315,7 @@ void SAL_CALL ScFunctionAccess::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsArrayFunction" ) ) ) { @@ -340,7 +339,7 @@ uno::Any SAL_CALL ScFunctionAccess::getPropertyValue( const rtl::OUString& aProp throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsArrayFunction" ) ) ) return uno::Any( mbArray ); @@ -536,7 +535,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName, throw(container::NoSuchElementException, lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; if (!mbValid) throw uno::RuntimeException(); |