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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/core/data/grouptokenconverter.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/token.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/data/grouptokenconverter.cxx b/sc/source/core/data/grouptokenconverter.cxx index ee79aedd5004..2118f9b0afc0 100644 --- a/sc/source/core/data/grouptokenconverter.cxx +++ b/sc/source/core/data/grouptokenconverter.cxx @@ -187,7 +187,7 @@ bool ScGroupTokenConverter::convert( const ScTokenArray& rCode, sc::FormulaLogge // matrix operations and possibly incorrect results (=C:C/D:D). That is handled by // having ScCompiler check that there are no possible implicit intersections. // Additionally some functions such as INDEX() and OFFSET() require a reference, - // that is handled by blacklisting those opcodes in ScTokenArray::CheckToken(). + // that is handled by denylisting those opcodes in ScTokenArray::CheckToken(). ScComplexRefData aRef = *p->GetDoubleRef(); if( aRef.IsDeleted()) diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 8f58651355ac..6618fa468a3f 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1282,7 +1282,7 @@ void ScTokenArray::CheckForThreading( const FormulaToken& r ) #if HAVE_CPP_CONSTINIT_SORTED_VECTOR constinit #endif - static const o3tl::sorted_vector<OpCode> aThreadedCalcBlackList({ + static const o3tl::sorted_vector<OpCode> aThreadedCalcDenyList({ ocIndirect, ocMacro, ocOffset, @@ -1325,7 +1325,7 @@ void ScTokenArray::CheckForThreading( const FormulaToken& r ) OpCode eOp = r.GetOpCode(); - if (aThreadedCalcBlackList.find(eOp) != aThreadedCalcBlackList.end()) + if (aThreadedCalcDenyList.find(eOp) != aThreadedCalcDenyList.end()) { SAL_INFO("sc.core.formulagroup", "opcode " << formula::FormulaCompiler().GetOpCodeMap(sheet::FormulaLanguage::ENGLISH)->getSymbol(eOp) << "(" << int(eOp) << ") disables threaded calculation of formula group"); |