diff options
21 files changed, 7 insertions, 103 deletions
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index cfbb19fc89e6..dc9195a11b09 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -266,7 +266,6 @@ void SAL_CALL FrameControl::unadvise( const Type& aTyp const Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames() { - MutexGuard aGuard( Mutex::getGlobalMutex() ); Sequence<OUString> seqServiceNames { SERVICENAME_FRAMECONTROL }; return seqServiceNames; } diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index d04dd4e2e19a..77d1c19d247d 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -134,7 +134,6 @@ sal_Int32 SAL_CALL OPoolCollection::getLoginTimeout( ) throw(RuntimeException, OUString SAL_CALL OPoolCollection::getImplementationName( ) throw(RuntimeException, std::exception) { - MutexGuard aGuard(m_aMutex); return getImplementationName_Static(); } diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index a0e401beb0ef..903e451a9541 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -61,34 +61,14 @@ static const char sExtensionRootSubDirName[] = "/uno_packages"; OUString OO3ExtensionMigration_getImplementationName() { - static OUString* pImplName = nullptr; - if ( !pImplName ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !pImplName ) - { - static OUString aImplName( "com.sun.star.comp.desktop.migration.OOo3Extensions" ); - pImplName = &aImplName; - } - } - return *pImplName; + return OUString( "com.sun.star.comp.desktop.migration.OOo3Extensions" ); } Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames() { - static Sequence< OUString >* pNames = nullptr; - if ( !pNames ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !pNames ) - { - static Sequence< OUString > aNames { "com.sun.star.migration.Extensions" }; - pNames = &aNames; - } - } - return *pNames; + return Sequence< OUString > { "com.sun.star.migration.Extensions" }; } diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index 9ae35631b947..b289ee5f549a 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -43,34 +43,14 @@ namespace migration OUString WordbookMigration_getImplementationName() { - static OUString* pImplName = nullptr; - if ( !pImplName ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !pImplName ) - { - static OUString aImplName( "com.sun.star.comp.desktop.migration.Wordbooks" ); - pImplName = &aImplName; - } - } - return *pImplName; + return OUString( "com.sun.star.comp.desktop.migration.Wordbooks" ); } Sequence< OUString > WordbookMigration_getSupportedServiceNames() { - static Sequence< OUString >* pNames = nullptr; - if ( !pNames ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !pNames ) - { - static Sequence< OUString > aNames { "com.sun.star.migration.Wordbooks" }; - pNames = &aNames; - } - } - return *pNames; + return Sequence< OUString > { "com.sun.star.migration.Wordbooks" }; } diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index 82cea598684c..37e50945b2d9 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -152,10 +152,7 @@ FilterCache* BaseContainer::impl_getWorkingCache() const OUString SAL_CALL BaseContainer::getImplementationName() throw (css::uno::RuntimeException, std::exception) { - // SAFE -> - ::osl::ResettableMutexGuard aLock(m_aLock); return m_sImplementationName; - // <- SAFE } @@ -169,10 +166,7 @@ sal_Bool SAL_CALL BaseContainer::supportsService(const OUString& sServiceName) css::uno::Sequence< OUString > SAL_CALL BaseContainer::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { - // SAFE -> - ::osl::ResettableMutexGuard aLock(m_aLock); return m_lServiceNames; - // <- SAFE } diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx index 9a6ea3e0d57d..7b433a9fcd1a 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx @@ -851,8 +851,6 @@ void SAL_CALL Hyphenator::removeEventListener( const Reference< XEventListener > OUString SAL_CALL Hyphenator::getImplementationName() throw(RuntimeException, std::exception) { - MutexGuard aGuard( GetLinguMutex() ); - return getImplementationName_Static(); } @@ -865,16 +863,12 @@ sal_Bool SAL_CALL Hyphenator::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL Hyphenator::getSupportedServiceNames() throw(RuntimeException, std::exception) { - MutexGuard aGuard( GetLinguMutex() ); - return getSupportedServiceNames_Static(); } Sequence< OUString > Hyphenator::getSupportedServiceNames_Static() throw() { - MutexGuard aGuard( GetLinguMutex() ); - Sequence< OUString > aSNS { SN_HYPHENATOR }; return aSNS; } diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index 8ac3e8da7e34..0cc0054e4b49 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -325,7 +325,6 @@ void SAL_CALL LangGuess_Impl::enableLanguages( OUString SAL_CALL LangGuess_Impl::getImplementationName( ) throw(RuntimeException, std::exception) { - osl::MutexGuard aGuard( GetLangGuessMutex() ); return OUString( IMPLNAME ); } @@ -338,7 +337,6 @@ sal_Bool SAL_CALL LangGuess_Impl::supportsService( const OUString& ServiceName ) Sequence<OUString> SAL_CALL LangGuess_Impl::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { - osl::MutexGuard aGuard( GetLangGuessMutex() ); return getSupportedServiceNames_Static(); } diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm index 9334d6b3854d..29b6b7414295 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm @@ -524,8 +524,6 @@ void SAL_CALL OUString SAL_CALL MacSpellChecker::getImplementationName() throw(RuntimeException) { - MutexGuard aGuard( GetLinguMutex() ); - return getImplementationName_Static(); } @@ -538,16 +536,12 @@ sal_Bool SAL_CALL MacSpellChecker::supportsService( const OUString& ServiceName Sequence< OUString > SAL_CALL MacSpellChecker::getSupportedServiceNames() throw(RuntimeException) { - MutexGuard aGuard( GetLinguMutex() ); - return getSupportedServiceNames_Static(); } Sequence< OUString > MacSpellChecker::getSupportedServiceNames_Static() throw() { - MutexGuard aGuard( GetLinguMutex() ); - Sequence< OUString > aSNS { SN_SPELLCHECKER }; return aSNS; } diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index 48d2b4a23e76..928b1914c46b 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -613,8 +613,6 @@ void SAL_CALL SpellChecker::removeEventListener( const Reference< XEventListener OUString SAL_CALL SpellChecker::getImplementationName() throw(RuntimeException, std::exception) { - MutexGuard aGuard( GetLinguMutex() ); - return getImplementationName_Static(); } @@ -627,16 +625,12 @@ sal_Bool SAL_CALL SpellChecker::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL SpellChecker::getSupportedServiceNames() throw(RuntimeException, std::exception) { - MutexGuard aGuard( GetLinguMutex() ); - return getSupportedServiceNames_Static(); } Sequence< OUString > SpellChecker::getSupportedServiceNames_Static() throw() { - MutexGuard aGuard( GetLinguMutex() ); - Sequence< OUString > aSNS { SN_SPELLCHECKER }; return aSNS; } diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index f1841c2f5330..357e8d932c48 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -623,7 +623,6 @@ void SAL_CALL Thesaurus::removeEventListener( const Reference< XEventListener >& OUString SAL_CALL Thesaurus::getImplementationName() throw(RuntimeException, std::exception) { - MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); } @@ -636,15 +635,12 @@ sal_Bool SAL_CALL Thesaurus::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL Thesaurus::getSupportedServiceNames() throw(RuntimeException, std::exception) { - MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); } Sequence< OUString > Thesaurus::getSupportedServiceNames_Static() throw() { - MutexGuard aGuard( GetLinguMutex() ); - Sequence< OUString > aSNS { SN_THESAURUS }; return aSNS; } diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index aa60ac322227..d04e4f166f2c 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -651,7 +651,6 @@ void SAL_CALL ConvDic::removeFlushListener( OUString SAL_CALL ConvDic::getImplementationName( ) throw (RuntimeException, std::exception) { - MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); } @@ -664,7 +663,6 @@ sal_Bool SAL_CALL ConvDic::supportsService( const OUString& rServiceName ) uno::Sequence< OUString > SAL_CALL ConvDic::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { - MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); } diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 305b51c7ffc5..14b370336959 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -590,7 +590,6 @@ void SAL_CALL ConvDicList::removeEventListener( OUString SAL_CALL ConvDicList::getImplementationName() throw (RuntimeException, std::exception) { - MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); } @@ -603,7 +602,6 @@ sal_Bool SAL_CALL ConvDicList::supportsService( const OUString& rServiceName ) uno::Sequence< OUString > SAL_CALL ConvDicList::getSupportedServiceNames() throw (RuntimeException, std::exception) { - MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); } diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index a3c798f00dff..15ed050b55d5 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -727,7 +727,6 @@ void DicList::SaveDics() OUString SAL_CALL DicList::getImplementationName( ) throw(RuntimeException, std::exception) { - osl::MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); } @@ -741,15 +740,12 @@ sal_Bool SAL_CALL DicList::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL DicList::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { - osl::MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); } uno::Sequence< OUString > DicList::getSupportedServiceNames_Static() throw() { - osl::MutexGuard aGuard( GetLinguMutex() ); - uno::Sequence< OUString > aSNS { "com.sun.star.linguistic2.DictionaryList" }; return aSNS; } diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index 75125c9b48be..34ceecf1c9b5 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -113,7 +113,6 @@ void SAL_CALL HHConvDic::addEntry( OUString SAL_CALL HHConvDic::getImplementationName( ) throw (RuntimeException, std::exception) { - MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); } @@ -128,7 +127,6 @@ sal_Bool SAL_CALL HHConvDic::supportsService( const OUString& rServiceName ) uno::Sequence< OUString > SAL_CALL HHConvDic::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { - MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); } diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 4df40e87be97..d43f9f0c2e93 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -424,7 +424,6 @@ void SAL_CALL OUString SAL_CALL LinguProps::getImplementationName() throw(RuntimeException, std::exception) { - MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); } @@ -439,7 +438,6 @@ sal_Bool SAL_CALL LinguProps::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL LinguProps::getSupportedServiceNames() throw(RuntimeException, std::exception) { - MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); } @@ -447,8 +445,6 @@ uno::Sequence< OUString > SAL_CALL LinguProps::getSupportedServiceNames() uno::Sequence< OUString > LinguProps::getSupportedServiceNames_Static() throw() { - MutexGuard aGuard( GetLinguMutex() ); - uno::Sequence< OUString > aSNS { "com.sun.star.linguistic2.LinguProperties" }; return aSNS; } diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 2e479ecf4a58..a1c06675a51b 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -2026,7 +2026,6 @@ OUString SAL_CALL LngSvcMgr::getImplementationName() throw(uno::RuntimeException, std::exception) { - osl::MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); } @@ -2043,7 +2042,6 @@ uno::Sequence< OUString > SAL_CALL LngSvcMgr::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { - osl::MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); } @@ -2051,7 +2049,6 @@ uno::Sequence< OUString > SAL_CALL uno::Sequence< OUString > LngSvcMgr::getSupportedServiceNames_Static() throw() { - osl::MutexGuard aGuard( GetLinguMutex() ); uno::Sequence< OUString > aSNS { "com.sun.star.linguistic2.LinguServiceManager" }; return aSNS; } diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index 32b8686f0587..5310fe5dbde2 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -408,7 +408,6 @@ void SAL_CALL OUString SAL_CALL SpellChecker::getImplementationName() throw(RuntimeException) { - MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); } @@ -422,7 +421,6 @@ sal_Bool SAL_CALL SpellChecker::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL SpellChecker::getSupportedServiceNames() throw(RuntimeException) { - MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); } @@ -430,7 +428,6 @@ Sequence< OUString > SAL_CALL SpellChecker::getSupportedServiceNames() Sequence< OUString > SpellChecker::getSupportedServiceNames_Static() throw() { - MutexGuard aGuard( GetLinguMutex() ); Sequence< OUString > aSNS { SN_SPELLCHECKER }; return aSNS; } diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index e1a1e6162b9d..1c5d8558d485 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -468,9 +468,8 @@ throw( RuntimeException, std::exception ) /* Helper for XServiceInfo */ Sequence< OUString > ScriptProtocolHandler::impl_getStaticSupportedServiceNames() { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); Sequence< OUString > seqServiceNames { OUString::createFromAscii(::scripting_protocolhandler::MYSERVICENAME) }; - return seqServiceNames ; + return seqServiceNames; } /* Helper for XServiceInfo */ diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 45d040baadd8..66658f9bd50e 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -478,8 +478,7 @@ sal_Bool SAL_CALL SdLayerManager::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL SdLayerManager::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { - OUString aServiceName(UNO_PREFIX "drawing.LayerManager"); - uno::Sequence< OUString > aSeq( &aServiceName, 1 ); + uno::Sequence< OUString > aSeq { UNO_PREFIX "drawing.LayerManager" }; return aSeq; } diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 35a42d7532f4..98a9aa34257a 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -2036,8 +2036,7 @@ sal_Bool SAL_CALL SdPageLinkTargets::supportsService( const OUString& ServiceNam Sequence< OUString > SAL_CALL SdPageLinkTargets::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { - const OUString aSN( "com.sun.star.document.LinkTargets" ); - Sequence< OUString > aSeq( &aSN, 1); + Sequence< OUString > aSeq { "com.sun.star.document.LinkTargets" }; return aSeq; } diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index f4d317c7dd32..9f052649146d 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -1863,7 +1863,6 @@ uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL S OUString SAL_CALL SwChartDataSource::getImplementationName( ) throw (uno::RuntimeException, std::exception) { - SolarMutexGuard aGuard; return OUString("SwChartDataSource"); } |