summaryrefslogtreecommitdiff
path: root/canvas
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 /canvas
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 'canvas')
-rw-r--r--canvas/source/directx/dx_9rm.cxx6
-rw-r--r--canvas/source/directx/dx_config.cxx16
-rw-r--r--canvas/source/directx/dx_config.hxx6
3 files changed, 14 insertions, 14 deletions
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 834deb89eb2b..3659ac3b7380 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -617,7 +617,7 @@ namespace dxcanvas
return false;
maPageSize = ::basegfx::B2IVector(aCaps.MaxTextureWidth,aCaps.MaxTextureHeight);
- // check device against white & blacklist entries
+ // check device against white & denylist entries
D3DADAPTER_IDENTIFIER9 aIdent;
if(FAILED(mpDirect3D9->GetAdapterIdentifier(nAdapter,0,&aIdent)))
return false;
@@ -637,9 +637,9 @@ namespace dxcanvas
if( !aConfigItem.isDeviceUsable(aInfo) )
return false;
- if( aConfigItem.isBlacklistCurrentDevice() )
+ if( aConfigItem.isDenylistCurrentDevice() )
{
- aConfigItem.blacklistDevice(aInfo);
+ aConfigItem.denylistDevice(aInfo);
return false;
}
diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx
index 77fca04f65d9..48609d8c500e 100644
--- a/canvas/source/directx/dx_config.cxx
+++ b/canvas/source/directx/dx_config.cxx
@@ -40,12 +40,12 @@ namespace dxcanvas
ConfigItemMode::NONE ),
maValues(),
maMaxTextureSize(),
- mbBlacklistCurrentDevice(false),
+ mbDenylistCurrentDevice(false),
mbValuesDirty(false)
{
try
{
- uno::Sequence< OUString > aName { "DeviceBlacklist" };
+ uno::Sequence< OUString > aName { "DeviceDenylist" };
uno::Sequence< uno::Any > aProps( GetProperties( aName ));
uno::Sequence< sal_Int32 > aValues;
@@ -70,10 +70,10 @@ namespace dxcanvas
}
}
- aName[0] = "BlacklistCurrentDevice";
+ aName[0] = "DenylistCurrentDevice";
aProps = GetProperties( aName );
if( aProps.getLength() > 0 )
- aProps[0] >>= mbBlacklistCurrentDevice;
+ aProps[0] >>= mbDenylistCurrentDevice;
aName[0] = "MaxTextureSize";
aProps = GetProperties( aName );
@@ -111,7 +111,7 @@ namespace dxcanvas
*pValues++ = rInfo.nDriverBuildId;
}
- PutProperties({"DeviceBlacklist"}, {css::uno::Any(aValues)});
+ PutProperties({"DeviceDenylist"}, {css::uno::Any(aValues)});
}
catch( const uno::Exception& )
{
@@ -127,12 +127,12 @@ namespace dxcanvas
return maValues.find(rDeviceInfo) == maValues.end();
}
- bool DXCanvasItem::isBlacklistCurrentDevice() const
+ bool DXCanvasItem::isDenylistCurrentDevice() const
{
- return mbBlacklistCurrentDevice;
+ return mbDenylistCurrentDevice;
}
- void DXCanvasItem::blacklistDevice( const DeviceInfo& rDeviceInfo )
+ void DXCanvasItem::denylistDevice( const DeviceInfo& rDeviceInfo )
{
mbValuesDirty = true;
maValues.insert(rDeviceInfo);
diff --git a/canvas/source/directx/dx_config.hxx b/canvas/source/directx/dx_config.hxx
index 2a1cc8ee63d8..496652b30197 100644
--- a/canvas/source/directx/dx_config.hxx
+++ b/canvas/source/directx/dx_config.hxx
@@ -63,8 +63,8 @@ namespace dxcanvas
~DXCanvasItem() override;
bool isDeviceUsable( const DeviceInfo& rDeviceInfo ) const;
- bool isBlacklistCurrentDevice() const;
- void blacklistDevice( const DeviceInfo& rDeviceInfo );
+ bool isDenylistCurrentDevice() const;
+ void denylistDevice( const DeviceInfo& rDeviceInfo );
void adaptMaxTextureSize( basegfx::B2IVector& io_maxTextureSize ) const;
virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override;
@@ -73,7 +73,7 @@ namespace dxcanvas
typedef std::set< DeviceInfo > ValueSet;
ValueSet maValues;
std::optional<sal_Int32> maMaxTextureSize;
- bool mbBlacklistCurrentDevice;
+ bool mbDenylistCurrentDevice;
bool mbValuesDirty;
};
}