summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2020-07-06 03:01:51 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2020-07-10 01:34:54 +0200
commit493ae7a6bb0c3ad50615db0090e7ae8d391bc327 (patch)
tree9f60f522f1ff9dde6a8131d155654f4d47b37fd0 /officecfg
parent005f5db47b8e1bbd7ebddee92009be072e835fd5 (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 'officecfg')
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Canvas.xcu4
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Canvas.xcs16
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs8
3 files changed, 14 insertions, 14 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
index f1d965e556e2..7c0ee84ae010 100644
--- a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
@@ -6,10 +6,10 @@
<!-- NVidia Quadro NVS 285 simply refuses rendering (failing silently) if we take the maximum texture size -->
<value>2048</value>
</prop>
- <prop oor:name="BlacklistCurrentDevice" oor:type="xs:boolean">
+ <prop oor:name="DenylistCurrentDevice" oor:type="xs:boolean">
<value>false</value>
</prop>
- <prop oor:name="DeviceBlacklist" oor:type="oor:int-list">
+ <prop oor:name="DeviceDenylist" oor:type="oor:int-list">
<value><!-- Matrox G550 - blank display on 2nd head -->
4139 9511 260313131 1 5 13 1 1320
<!-- Matrox G550 - blank display (single head?) -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/Canvas.xcs b/officecfg/registry/schema/org/openoffice/Office/Canvas.xcs
index 77a8bce4db79..4dc21e8756b4 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Canvas.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Canvas.xcs
@@ -49,29 +49,29 @@
<info>
<desc>Contains config entries for the DirectX-based implementation of the XCanvas interface.</desc>
</info>
- <prop oor:name="DeviceBlacklist" oor:type="oor:int-list" oor:nillable="false">
+ <prop oor:name="DeviceDenylist" oor:type="oor:int-list" oor:nillable="false">
<info>
<desc>Sequence of 8 integers per device/driver
combination, that uniquely mark them as not being compatible with the
DirectX9 canvas implementation. If you have
trouble with your graphic adapter, and want to
- add it to the blacklisting, set
- BlacklistCurrentDevice below to false. After
+ add it to the denylisting, set
+ DenylistCurrentDevice below to false. After
running the Impress slideshow once, your card
identification has been added to the list.
</desc>
- <label>Sequence of blacklisted devices</label>
+ <label>Sequence of denylisted devices</label>
</info>
<value>0</value>
</prop>
- <prop oor:name="BlacklistCurrentDevice" oor:type="xs:boolean" oor:nillable="false">
+ <prop oor:name="DenylistCurrentDevice" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Indicates whether the current DirectX device
- ids should get blacklisted. When true, a
- running DXCanvas will write a DeviceBlacklist entry, and refuse to run
+ ids should get denylisted. When true, a
+ running DXCanvas will write a DeviceDenylist entry, and refuse to run
on that device subsequently.
</desc>
- <label>Blacklist current DirectX device</label>
+ <label>Denylist current DirectX device</label>
</info>
<value>false</value>
</prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index ffe91a4d3c8e..5e6999d62089 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -861,7 +861,7 @@
<info>
<desc>Specifies if OpenGL rendering should be used in VCL backends
supporting it. This one forces the use of OpenGL even if the
- blacklist would block the OpenGL driver.</desc>
+ denylist would block the OpenGL driver.</desc>
</info>
<value>false</value>
</prop>
@@ -876,7 +876,7 @@
<info>
<desc>Specifies if Skia rendering should be used in VCL backends
supporting it. This one forces the use of Skia even if the
- blacklist would block the driver.</desc>
+ denylist would block the driver.</desc>
</info>
<value>false</value>
</prop>
@@ -5622,7 +5622,7 @@
</info>
<value>true</value>
</prop>
- <prop oor:name="OpenCLBlackList" oor:type="oor:string-list" oor:nillable="false">
+ <prop oor:name="OpenCLDenyList" oor:type="oor:string-list" oor:nillable="false">
<!-- UIHints: Tools - Options General OpenCL -->
<info>
<desc>Combinations of (OS, OS version, OpenCL platform vendor, OpenCL device name, OpenCL driver version) that are known to be bad. Each entry is a string consisting of five parts separated by slashes. An empty part matches anything. In case a slash, percent or semicolon occurs inside a part, it is replaced by a percent followed by the corresponding number as two hex digits. The parts except OS can contain regular expressions. Inside these regular expressions the usual characters .*()[]\ are special and should be quoted with a backslash to be interpreted literally. OS should be just one of "Linux", "OS X" (including the space) or "Windows" (without quotes). Has higher priority than OpenCLWhiteList.</desc>
@@ -5632,7 +5632,7 @@
<prop oor:name="OpenCLWhiteList" oor:type="oor:string-list" oor:nillable="false">
<!-- UIHints: Tools - Options General OpenCL -->
<info>
- <desc>Like OpenCLBlackList, but for combinations known to be good.</desc>
+ <desc>Like OpenCLDenyList, but for combinations known to be good.</desc>
</info>
<value oor:separator=";">Linux//Advanced Micro Devices, Inc\.//1445\.5 \(sse2,avx\);//Advanced Micro Devices, Inc\.//;//Intel\(R\) Corporation//;//NVIDIA Corporation//</value>
</prop>