From 2622a457404ff6593535219aab8e3cba1cb07c9e Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Thu, 14 Oct 2010 22:18:02 -0500 Subject: replace ScUnoGuard by SolarMutexGuard ScUnoGaurd provide a Guard wrapper around Application::GetSolarMutex(). This is now provided by the class SolarMutexGuard. --- sc/source/ui/unoobj/appluno.cxx | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'sc/source/ui/unoobj/appluno.cxx') diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 338996a86ede..6db804e0bb9f 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -46,7 +46,6 @@ #include "printopt.hxx" #include "userlist.hxx" #include "sc.hrc" // VAR_ARGS -#include "unoguard.hxx" #include "unonames.hxx" #include "funcdesc.hxx" #include @@ -497,7 +496,7 @@ ScSpreadsheetSettings::~ScSpreadsheetSettings() uno::Reference SAL_CALL ScSpreadsheetSettings_CreateInstance( const uno::Reference& /* rSMgr */ ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDLL::Init(); static uno::Reference xInst((cppu::OWeakObject*)new ScSpreadsheetSettings()); return xInst; @@ -521,7 +520,7 @@ uno::Sequence ScSpreadsheetSettings::getSupportedServiceNames_Sta uno::Reference SAL_CALL ScSpreadsheetSettings::getPropertySetInfo() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; static uno::Reference aRef( new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); return aRef; @@ -533,7 +532,7 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString(aPropertyName); ScModule* pScMod = SC_MOD(); @@ -680,7 +679,7 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const rtl::OUString& throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aString = aPropertyName; uno::Any aRet; @@ -760,7 +759,7 @@ ScRecentFunctionsObj::~ScRecentFunctionsObj() uno::Reference SAL_CALL ScRecentFunctionsObj_CreateInstance( const uno::Reference& /* rSMgr */ ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDLL::Init(); static uno::Reference xInst((cppu::OWeakObject*)new ScRecentFunctionsObj()); return xInst; @@ -784,7 +783,7 @@ uno::Sequence ScRecentFunctionsObj::getSupportedServiceNames_Stat uno::Sequence SAL_CALL ScRecentFunctionsObj::getRecentFunctionIds() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScAppOptions& rOpt = SC_MOD()->GetAppOptions(); USHORT nCount = rOpt.GetLRUFuncListCount(); const USHORT* pFuncs = rOpt.GetLRUFuncList(); @@ -803,7 +802,7 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds( const uno::Sequence& aRecentFunctionIds ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = (USHORT) Min( aRecentFunctionIds.getLength(), (INT32) LRU_MAX ); const INT32* pAry = aRecentFunctionIds.getConstArray(); @@ -841,7 +840,7 @@ ScFunctionListObj::~ScFunctionListObj() uno::Reference SAL_CALL ScFunctionListObj_CreateInstance( const uno::Reference& /* rSMgr */ ) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; ScDLL::Init(); static uno::Reference xInst((cppu::OWeakObject*)new ScFunctionListObj()); return xInst; @@ -922,7 +921,7 @@ static void lcl_FillSequence( uno::Sequence& rSequence, co uno::Sequence SAL_CALL ScFunctionListObj::getById( sal_Int32 nId ) throw(lang::IllegalArgumentException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) { @@ -952,7 +951,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByName( const rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameStr(aName); const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) @@ -982,7 +981,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByName( const rtl::OUString& aName ) sal_Int32 SAL_CALL ScFunctionListObj::getCount() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; USHORT nCount = 0; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) @@ -994,7 +993,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) { @@ -1022,7 +1021,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex ) uno::Reference SAL_CALL ScFunctionListObj::createEnumeration() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.FunctionDescriptionEnumeration"))); } @@ -1030,19 +1029,19 @@ uno::Reference SAL_CALL ScFunctionListObj::createEnumer uno::Type SAL_CALL ScFunctionListObj::getElementType() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return getCppuType((uno::Sequence*)0); } sal_Bool SAL_CALL ScFunctionListObj::hasElements() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; return ( getCount() > 0 ); } uno::Sequence SAL_CALL ScFunctionListObj::getElementNames() throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) { @@ -1063,7 +1062,7 @@ uno::Sequence SAL_CALL ScFunctionListObj::getElementNames() throw sal_Bool SAL_CALL ScFunctionListObj::hasByName( const rtl::OUString& aName ) throw(uno::RuntimeException) { - ScUnoGuard aGuard; + SolarMutexGuard aGuard; String aNameStr(aName); const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); if ( pFuncList ) -- cgit v1.2.3