[Libreoffice-commits] core.git: connectivity/source desktop/source filter/source lingucomponent/source linguistic/source linguistic/workben scripting/source sd/source sw/source UnoControls/source
Noel Grandin
noel at peralex.com
Mon Nov 16 03:37:36 PST 2015
UnoControls/source/controls/framecontrol.cxx | 1
connectivity/source/cpool/ZPoolCollection.cxx | 1
desktop/source/migration/services/oo3extensionmigration.cxx | 24 +-----------
desktop/source/migration/services/wordbookmigration.cxx | 24 +-----------
filter/source/config/cache/basecontainer.cxx | 6 ---
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 6 ---
lingucomponent/source/languageguessing/guesslang.cxx | 2 -
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm | 6 ---
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 6 ---
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 4 --
linguistic/source/convdic.cxx | 2 -
linguistic/source/convdiclist.cxx | 2 -
linguistic/source/dlistimp.cxx | 4 --
linguistic/source/hhconvdic.cxx | 2 -
linguistic/source/lngopt.cxx | 4 --
linguistic/source/lngsvcmgr.cxx | 3 -
linguistic/workben/sspellimp.cxx | 3 -
scripting/source/protocolhandler/scripthandler.cxx | 3 -
sd/source/ui/unoidl/unolayer.cxx | 3 -
sd/source/ui/unoidl/unopage.cxx | 3 -
sw/source/core/unocore/unochart.cxx | 1
21 files changed, 7 insertions(+), 103 deletions(-)
New commits:
commit 21a9bc8716a88fa2472c525b2e6f84fe1213a8f8
Author: Noel Grandin <noel at peralex.com>
Date: Mon Nov 16 09:40:28 2015 +0200
no need to take a mutex when only dealing with stack-local data
Change-Id: Ie45e626aad55a8174a53b769a98601bf54dedf65
Reviewed-on: https://gerrit.libreoffice.org/19979
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index cfbb19f..dc9195a 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 d04dd4e..77d1c19 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 a0e401b..903e451 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 9ae3563..b289ee5 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 82cea59..37e5094 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 9a6ea3e..7b433a9 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 8ac3e8d..0cc0054 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 9334d6b..29b6b74 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 48d2b4a..928b191 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 f1841c2..357e8d9 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 aa60ac3..d04e4f1 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 305b51c..14b3703 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 a3c798f..15ed050 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 75125c9..34ceecf 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 4df40e8..d43f9f0 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 2e479ec..a1c0667 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 32b8686..5310fe5 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 e1a1e61..1c5d855 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 45d040b..66658f9 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 35a42d7..98a9aa3 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 f4d317c..9f05264 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");
}
More information about the Libreoffice-commits
mailing list