diff options
author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-07-06 03:01:51 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-07-10 01:34:54 +0200 |
commit | 493ae7a6bb0c3ad50615db0090e7ae8d391bc327 (patch) | |
tree | 9f60f522f1ff9dde6a8131d155654f4d47b37fd0 /scripting | |
parent | 005f5db47b8e1bbd7ebddee92009be072e835fd5 (diff) |
replace usage of blacklist with denylist
.. and a few cases of instead doing blacklist->excludelist where that
made more sense.
Background and motivation:
https://tools.ietf.org/html/draft-knodel-terminology-02
[API CHANGE] officecfg::Office::Canvas::DeviceBlacklist -> DeviceDenylist
[API CHANGE] officecfg::Office::Canvas::BlacklistCurrentDevice -> DenylistCurrentDevice
[API CHANGE] officecfg::Office::Common::Misc::OpenCLBlackList -> OpenCLDenyList
Change-Id: Ia35e25496bf0cc0692d5de4cb66bfc232d3a869e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98180
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'scripting')
-rw-r--r-- | scripting/source/provider/MasterScriptProvider.cxx | 4 | ||||
-rw-r--r-- | scripting/source/provider/ProviderCache.cxx | 8 | ||||
-rw-r--r-- | scripting/source/provider/ProviderCache.hxx | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index 0f4429d2dd79..703e01c86299 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -342,7 +342,7 @@ MasterScriptProvider::providerCache() ::osl::MutexGuard aGuard( m_mutex ); if ( !m_pPCache ) { - Sequence<OUString> blacklist { "com.sun.star.script.provider.ScriptProviderForBasic" }; + Sequence<OUString> denylist { "com.sun.star.script.provider.ScriptProviderForBasic" }; if ( !m_bIsPkgMSP ) { @@ -350,7 +350,7 @@ MasterScriptProvider::providerCache() } else { - m_pPCache.reset( new ProviderCache( m_xContext, m_sAargs, blacklist ) ); + m_pPCache.reset( new ProviderCache( m_xContext, m_sAargs, denylist ) ); } } } diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx index 9f35e1187ca0..4291d811c7a8 100644 --- a/scripting/source/provider/ProviderCache.cxx +++ b/scripting/source/provider/ProviderCache.cxx @@ -44,7 +44,7 @@ ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, co } -ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext, const Sequence< OUString >& blackList ) : m_sBlackList( blackList ), m_Sctx( scriptContext ), m_xContext( xContext ) +ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext, const Sequence< OUString >& denyList ) : m_sDenyList( denyList ), m_Sctx( scriptContext ), m_xContext( xContext ) { // initialise m_hProviderDetailsCache with details of ScriptProviders @@ -151,7 +151,7 @@ ProviderCache::populateCache() auto pName = std::find_if(serviceNames.begin(), serviceNames.end(), [this](const OUString& rName) { return rName.startsWith("com.sun.star.script.provider.ScriptProviderFor") - && !isInBlackList(rName); + && !isInDenyList(rName); }); if (pName != serviceNames.end()) { @@ -193,9 +193,9 @@ ProviderCache::createProvider( ProviderDetails& details ) } bool -ProviderCache::isInBlackList( const OUString& serviceName ) +ProviderCache::isInDenyList( const OUString& serviceName ) { - return comphelper::findValue(m_sBlackList, serviceName) != -1; + return comphelper::findValue(m_sDenyList, serviceName) != -1; } } //end namespace diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx index 0aaedc4d4077..b2a35a58d172 100644 --- a/scripting/source/provider/ProviderCache.hxx +++ b/scripting/source/provider/ProviderCache.hxx @@ -52,7 +52,7 @@ public: ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext ); /// @throws css::uno::RuntimeException ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext, - const css::uno::Sequence< OUString >& blackList ); + const css::uno::Sequence< OUString >& denyList ); ~ProviderCache(); css::uno::Reference< css::script::provider::XScriptProvider > getProvider( const OUString& providerName ); @@ -66,8 +66,8 @@ private: /// @throws css::uno::RuntimeException css::uno::Reference< css::script::provider::XScriptProvider > createProvider( ProviderDetails& details ); - bool isInBlackList( const OUString& serviceName ); - css::uno::Sequence< OUString > m_sBlackList; + bool isInDenyList( const OUString& serviceName ); + css::uno::Sequence< OUString > m_sDenyList; ProviderDetails_hash m_hProviderDetailsCache; osl::Mutex m_mutex; css::uno::Sequence< css::uno::Any > m_Sctx; |