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 /writerfilter | |
| 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 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/factoryimpl_ns.py | 2 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfsprm.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index d510bfc8be35..44e34fad585c 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1692,13 +1692,13 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) uno::Reference< beans::XPropertySetInfo > pagePropertiesInfo( pageProperties->getPropertySetInfo() ); const uno::Sequence< beans::Property > propertyList( pagePropertiesInfo->getProperties() ); // Ignore write-only properties. - static const o3tl::sorted_vector<OUString> aBlacklist + static const o3tl::sorted_vector<OUString> aDenylist = { "FooterBackGraphicURL", "BackGraphicURL", "HeaderBackGraphicURL" }; for ( const auto& rProperty : propertyList ) { if ( (rProperty.Attributes & beans::PropertyAttribute::READONLY) == 0 ) { - if (aBlacklist.find(rProperty.Name) == aBlacklist.end()) + if (aDenylist.find(rProperty.Name) == aDenylist.end()) evenOddStyle->setPropertyValue( rProperty.Name, pageProperties->getPropertyValue(rProperty.Name)); diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py b/writerfilter/source/ooxml/factoryimpl_ns.py index db06cf1c9218..a17335f12646 100644 --- a/writerfilter/source/ooxml/factoryimpl_ns.py +++ b/writerfilter/source/ooxml/factoryimpl_ns.py @@ -97,7 +97,7 @@ def resourceForAttribute(nsNode, attrNode): dataNodes = attrNode.getElementsByTagName("data") if len(dataNodes): t = dataNodes[0].getAttribute("type") - # Blacklist existing unexpected data types. + # Denylist existing unexpected data types. if t not in ("token", "long", "decimal", "float", "byte", "ST_DecimalNumber", "positiveInteger"): raise Exception("unexpected data type: " + dataNodes[0].getAttribute("type")) return resourceName diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx index fe6af8e5e4d8..d281187277de 100644 --- a/writerfilter/source/rtftok/rtfsprm.cxx +++ b/writerfilter/source/rtftok/rtfsprm.cxx @@ -196,7 +196,7 @@ static RTFValue::Pointer_t getDefaultSPRM(Id const id, Id nStyleType) } /// Is it problematic to deduplicate this SPRM? -static bool isSPRMDeduplicateBlacklist(Id nId) +static bool isSPRMDeduplicateDenylist(Id nId) { switch (nId) { @@ -259,7 +259,7 @@ static void cloneAndDeduplicateSprm(std::pair<Id, RTFValue::Pointer_t> const& rS { if (rSprm.second->equals(*pValue)) { - if (!isSPRMDeduplicateBlacklist(rSprm.first)) + if (!isSPRMDeduplicateDenylist(rSprm.first)) ret.erase(rSprm.first); // duplicate to style } else if (!rSprm.second->getSprms().empty() || !rSprm.second->getAttributes().empty()) |