[Libreoffice-commits] core.git: basic/source bin/find-clang-format.py bin/get-bugzilla-attachments-by-mimetype bin/oss-fuzz-build.sh bin/sanitize-blacklist.txt bin/sanitize-excludelist.txt bin/symstore.sh canvas/source configure.ac connectivity/source cui/source cui/uiconfig desktop/source filter/source fpicker/source .git-hooks/pre-commit include/onlineupdate include/opencl include/sfx2 include/vcl offapi/com officecfg/registry oox/README oox/source opencl/source postprocess/qa Repository.mk sanitize-ubsan-blacklist sanitize-ubsan-excludelist scripting/source sc/source sfx2/source shell/source solenv/clang-format solenv/gbuild sw/qa vcl/inc vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/opengl vcl/Package_opengl_blacklist.mk vcl/Package_opengl_denylist.mk vcl/Package_skia_blacklist.mk vcl/Package_skia_denylist.mk vcl/qa vcl/README.vars vcl/skia vcl/source writerfilter/source xmlsecurity/source
Thorsten Behrens (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jul 9 23:35:48 UTC 2020
.git-hooks/pre-commit | 6 +-
Repository.mk | 4 -
basic/source/runtime/stdobj.cxx | 2
bin/find-clang-format.py | 4 -
bin/get-bugzilla-attachments-by-mimetype | 2
bin/oss-fuzz-build.sh | 2
bin/symstore.sh | 8 +-
canvas/source/directx/dx_9rm.cxx | 6 +-
canvas/source/directx/dx_config.cxx | 16 ++---
canvas/source/directx/dx_config.hxx | 6 +-
configure.ac | 2
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 6 +-
cui/source/options/optgdlg.cxx | 2
cui/uiconfig/ui/optopenclpage.ui | 2
cui/uiconfig/ui/optviewpage.ui | 2
desktop/source/deployment/inc/dp_descriptioninfoset.hxx | 6 +-
desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 24 ++++----
desktop/source/migration/migration.cxx | 8 +-
desktop/source/migration/services/oo3extensionmigration.cxx | 14 ++--
desktop/source/migration/services/oo3extensionmigration.hxx | 2
filter/source/svg/.eslintrc.js | 2
fpicker/source/office/OfficeFilePicker.cxx | 12 ++--
fpicker/source/office/OfficeFilePicker.hxx | 2
fpicker/source/office/RemoteFilesDialog.cxx | 12 ++--
fpicker/source/office/RemoteFilesDialog.hxx | 6 +-
fpicker/source/office/asyncfilepicker.cxx | 4 -
fpicker/source/office/asyncfilepicker.hxx | 2
fpicker/source/office/contentenumeration.cxx | 12 ++--
fpicker/source/office/contentenumeration.hxx | 6 +-
fpicker/source/office/fileview.cxx | 20 +++----
fpicker/source/office/fileview.hxx | 4 -
fpicker/source/office/foldertree.cxx | 6 +-
fpicker/source/office/foldertree.hxx | 4 -
fpicker/source/office/fpdialogbase.hxx | 4 -
fpicker/source/office/iodlg.cxx | 10 +--
fpicker/source/office/iodlg.hxx | 4 -
fpicker/source/office/iodlgimp.hxx | 6 +-
include/onlineupdate/mozilla/Attributes.h | 24 ++++----
include/opencl/openclconfig.hxx | 2
include/sfx2/filedlghelper.hxx | 6 +-
include/sfx2/sfxsids.hrc | 2
include/vcl/opengl/OpenGLHelper.hxx | 4 -
offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl | 2
officecfg/registry/data/org/openoffice/Office/Canvas.xcu | 4 -
officecfg/registry/schema/org/openoffice/Office/Canvas.xcs | 16 ++---
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 8 +-
oox/README | 4 -
oox/source/export/shapes.cxx | 16 ++---
opencl/source/opencl_device.cxx | 6 +-
opencl/source/openclconfig.cxx | 16 ++---
postprocess/qa/services.cxx | 16 ++---
sc/source/core/data/grouptokenconverter.cxx | 2
sc/source/core/tool/token.cxx | 4 -
scripting/source/provider/MasterScriptProvider.cxx | 4 -
scripting/source/provider/ProviderCache.cxx | 8 +-
scripting/source/provider/ProviderCache.hxx | 6 +-
sfx2/source/appl/appopen.cxx | 10 +--
sfx2/source/appl/appuno.cxx | 16 ++---
sfx2/source/dialog/filedlghelper.cxx | 20 +++----
sfx2/source/dialog/filedlgimpl.hxx | 2
sfx2/source/doc/guisaveas.cxx | 24 ++++----
shell/source/win32/SysShExec.cxx | 4 -
solenv/clang-format/ClangFormat.pm | 22 +++----
solenv/clang-format/README | 4 -
solenv/clang-format/check-last-commit | 6 +-
solenv/clang-format/generate-style-excludelist | 4 -
solenv/clang-format/reformat-formatted-files | 6 +-
solenv/gbuild/extensions/post_GbuildToJson.mk | 8 +-
sw/qa/extras/fodfexport/fodfexport.cxx | 2
sw/qa/extras/odfexport/odfexport.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 8 +-
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 8 +-
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 8 +-
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 8 +-
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 8 +-
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 2
sw/qa/extras/ooxmlexport/ooxmllinks.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlw14export.cxx | 2
sw/qa/extras/rtfexport/rtfexport.cxx | 6 +-
sw/qa/extras/rtfexport/rtfexport5.cxx | 2
sw/qa/extras/ww8export/ww8export.cxx | 6 +-
vcl/Library_vcl.mk | 2
vcl/Module_vcl.mk | 4 -
vcl/Package_opengl_denylist.mk | 6 +-
vcl/Package_skia_denylist.mk | 6 +-
vcl/README.vars | 4 -
vcl/inc/driverblocklist.hxx | 2
vcl/opengl/README.opengl | 2
vcl/opengl/opengl_denylist_windows.xml | 4 -
vcl/opengl/win/WinDeviceInfo.cxx | 6 +-
vcl/opengl/x11/X11DeviceInfo.cxx | 4 -
vcl/qa/cppunit/test_blocklist_evaluate.xml | 4 -
vcl/qa/cppunit/test_blocklist_parse.xml | 4 -
vcl/skia/SkiaHelper.cxx | 34 ++++++------
vcl/skia/skia_denylist_vulkan.xml | 4 -
vcl/skia/x11/gdiimpl.cxx | 2
vcl/source/helper/driverblocklist.cxx | 12 ++--
vcl/source/opengl/OpenGLHelper.cxx | 20 +++----
writerfilter/source/dmapper/PropertyMap.cxx | 4 -
writerfilter/source/ooxml/factoryimpl_ns.py | 2
writerfilter/source/rtftok/rtfsprm.cxx | 4 -
xmlsecurity/source/helper/ooxmlsecexporter.cxx | 20 +++----
112 files changed, 375 insertions(+), 375 deletions(-)
New commits:
commit 493ae7a6bb0c3ad50615db0090e7ae8d391bc327
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Mon Jul 6 03:01:51 2020 +0200
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Jul 10 01:34:54 2020 +0200
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 at CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit
index 1f3d21ebff98..27fba7e487a3 100755
--- a/.git-hooks/pre-commit
+++ b/.git-hooks/pre-commit
@@ -134,7 +134,7 @@ sub check_style($)
my ($h) = @_;
my $src = ClangFormat::get_extension_regex();
my @bad_names = ();
- my $blacklist_names = ClangFormat::get_blacklist();
+ my $excluded_list_names = ClangFormat::get_excludelist();
my $clang_format = ClangFormat::find();
# Get a list of non-deleted changed files.
@@ -142,14 +142,14 @@ sub check_style($)
while (my $filename = <FILES>)
{
chomp $filename;
- if ($filename =~ /\.($src)$/ and !exists($blacklist_names->{$filename}))
+ if ($filename =~ /\.($src)$/ and !exists($excluded_list_names->{$filename}))
{
if (!defined($clang_format))
{
my $version = ClangFormat::get_wanted_version();
my $opt_lo = ClangFormat::get_own_directory();
- print("\nWARNING: Commit touches new (non-blacklisted) files, but no clang-format"
+ print("\nWARNING: Commit touches new (non-excluded) files, but no clang-format"
. " ${version}\n");
print(" found (via CLANG_FORMAT or PATH env vars, or in ${opt_lo}).\n\n");
diff --git a/Repository.mk b/Repository.mk
index 5d3be2f78188..17c585303187 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -942,11 +942,11 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
vcl_opengl_shader \
vcl_theme_definitions \
$(if $(filter WNT,$(OS)), \
- vcl_opengl_blacklist \
+ vcl_opengl_denylist \
) \
$(if $(ENABLE_OPENGL_CANVAS),canvas_opengl_shader) \
$(if $(filter SKIA,$(BUILD_TYPE)), \
- vcl_skia_blacklist ) \
+ vcl_skia_denylist ) \
$(if $(DISABLE_PYTHON),,$(if $(filter-out AIX,$(OS)), \
Pyuno/commonwizards \
Pyuno/fax \
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 8a9513e81e0e..b2627748915a 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -32,7 +32,7 @@
// struct below.
// note: the limitation of 63 args is only for RTL functions defined here and
// does NOT impose a limit on User defined procedures ). This changes is to
-// allow us space for a flag to blacklist some functions in vba mode
+// allow us space for a flag to denylist some functions in vba mode
#define ARGSMASK_ 0x003F // 63 Arguments
#define COMPTMASK_ 0x00C0 // COMPATIBILITY mask
diff --git a/bin/find-clang-format.py b/bin/find-clang-format.py
index 38c9aac10780..713174114488 100755
--- a/bin/find-clang-format.py
+++ b/bin/find-clang-format.py
@@ -11,7 +11,7 @@ from difflib import unified_diff
from pathlib import Path
from subprocess import PIPE, Popen
-BLACKLIST = Path("solenv/clang-format/blacklist")
+EXCLUDELIST = Path("solenv/clang-format/excludelist")
THRESHOLD = os.getenv("CLANG_THRESHOLD", 5)
CLANG_BINARY = Path(os.getenv("CLANG_FORMAT", "/opt/lo/bin/clang-format"))
@@ -47,7 +47,7 @@ def main(*args):
print("Couldn't find clang-format on {!s}".format(CLANG_BINARY))
exit(1)
- for path in BLACKLIST.read_text().splitlines():
+ for path in EXCLUDELIST.read_text().splitlines():
path = Path(path)
if not path.exists():
continue
diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype
index 1d1f45165a48..47669d04434a 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -356,7 +356,7 @@ rss_bugzillas = (
# does not add it back immediately .-)
# 'novell': 'https://bugzilla.novell.com/buglist.cgi',
# note: running this script against bz.apache.org apparently causes one's IP
-# to be blacklisted or something; you won't get new files in any case...
+# to be banned or something; you won't get new files in any case...
# ( 'ooo', 'https://bz.apache.org/ooo/buglist.cgi' ),
( 'tdf', 'http://bugs.documentfoundation.org/buglist.cgi' ),
)
diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 646accc8a017..ce4d110ce48a 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -7,7 +7,7 @@ fi
#shuffle CXXFLAGS -stdlib=libc++ arg into CXX as well because we use
#the CXX as the linker and need to pass -stdlib=libc++ to build
-export CXX="$CXX -stdlib=libc++ -fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-blacklist.txt"
+export CXX="$CXX -stdlib=libc++ -fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-excludelist.txt"
#similarly force the -fsanitize etc args in as well as pthread to get
#things to link successfully during the build
export LDFLAGS="$CFLAGS -Wl,--compress-debug-sections,zlib -lpthread"
diff --git a/bin/sanitize-blacklist.txt b/bin/sanitize-excludelist.txt
similarity index 100%
rename from bin/sanitize-blacklist.txt
rename to bin/sanitize-excludelist.txt
diff --git a/bin/symstore.sh b/bin/symstore.sh
index 532efb16630f..c4e9870c9aa5 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -2,19 +2,19 @@
# Files listed here would not be store in the symbolestore-server.
# The format is a string with files e.g.
-# BLACKLIST="python.exe
+# EXCLUDE_LIST="python.exe
# file.dll
# next_file.exe"
#
# It removes "python.exe", "file.dll", and "next_file.exe" from what's
# added to the symstore. Separator is the newline
-BLACK_LIST="python.exe"
+EXCLUDE_LIST="python.exe"
# List files here where it's ok for this script to find more than one
# occurrence in the build tree. Files _not_ included here will generate
# an error, if duplicates are found.
#
-# Same format as for BLACK_LIST above
+# Same format as for EXCLUDE_LIST above
MOREPDBS_OKLIST="libcurl.dll
freebl3.dll
libeay32.dll
@@ -46,7 +46,7 @@ add_pdb()
stats_morefound=0
declare -a pdball
echo "Collect $extension"
- ret=$(find "${INSTDIR}/" -type f -name "*.${extension}" | grep -vF "$BLACK_LIST")
+ ret=$(find "${INSTDIR}/" -type f -name "*.${extension}" | grep -vF "$EXCLUDE_LIST")
while IFS= read -r file
do
${VERBOSE} -n "Found: $file"
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;
};
}
diff --git a/configure.ac b/configure.ac
index f5463c5c0731..ba0bc8acd3ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13304,7 +13304,7 @@ if test "$enable_mpl_subset" = "yes"; then
fi
for theme in $WITH_THEMES; do
case $theme in
- breeze|breeze_dark|breeze_dark_svg|breeze_svg|elementary|elementary_svg|karasa_jaga|karasa_jaga_svg|sukapura|sukapura_svg) #blacklist of icon themes under GPL or LGPL
+ breeze|breeze_dark|breeze_dark_svg|breeze_svg|elementary|elementary_svg|karasa_jaga|karasa_jaga_svg|sukapura|sukapura_svg) #denylist of icon themes under GPL or LGPL
AC_MSG_ERROR([need to disable icon themes from '$WITH_THEMES': $theme present, use --with-theme=colibre]) ;;
*) : ;;
esac
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index ef39382d058d..1f429d9850ad 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -54,7 +54,7 @@ namespace connectivity::evoab
static ColumnProperty **pFields=nullptr;
static guint nFields = 0;
- static const char *pBlackList[] =
+ static const char *pDenyList[] =
{
"id",
"list-show-addresses",
@@ -114,9 +114,9 @@ namespace connectivity::evoab
{
bool bAdd = true;
const char *pName = g_param_spec_get_name( pProps[i] );
- for (unsigned int j = 0; j < G_N_ELEMENTS( pBlackList ); j++ )
+ for (unsigned int j = 0; j < G_N_ELEMENTS( pDenyList ); j++ )
{
- if( !strcmp( pBlackList[j], pName ) )
+ if( !strcmp( pDenyList[j], pName ) )
{
bAdd = false;
break;
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 927840640dbf..64a85add8440 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -780,7 +780,7 @@ IMPL_LINK_NOARG(OfaViewTabPage, OnForceSkiaToggled, weld::ToggleButton&, void)
{
if (m_xForceSkia->get_active())
{
- // Ignoring the Skia blacklist implies that Skia is on.
+ // Ignoring the Skia denylist implies that Skia is on.
m_xUseSkia->set_active(true);
}
}
diff --git a/cui/uiconfig/ui/optopenclpage.ui b/cui/uiconfig/ui/optopenclpage.ui
index da4b29ccb219..76db01dd6725 100644
--- a/cui/uiconfig/ui/optopenclpage.ui
+++ b/cui/uiconfig/ui/optopenclpage.ui
@@ -17,7 +17,7 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkBox" id="blacklistbox">
+ <object class="GtkBox" id="denylistbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 023b8dccede1..0fa95dcbf387 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -526,7 +526,7 @@
</child>
<child>
<object class="GtkCheckButton" id="forceskia">
- <property name="label" translatable="yes" context="optviewpage|forceskia">Ignore Skia blacklist</property>
+ <property name="label" translatable="yes" context="optviewpage|forceskia">Ignore Skia denylist</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index b404751fce52..27b857b241ab 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -252,16 +252,16 @@ private:
SAL_DLLPRIVATE OUString
getNodeValueFromExpression(OUString const & expression) const;
- /** Check the extensions blacklist if additional extension meta data (e.g. dependencies)
+ /** Check the extensions denylist if additional extension meta data (e.g. dependencies)
are defined for this extension and have to be taken into account.
*/
SAL_DLLPRIVATE void
- checkBlacklist() const;
+ checkDenylist() const;
/** Helper method to compare the versions with the current version
*/
SAL_DLLPRIVATE static bool
- checkBlacklistVersion(const OUString& currentversion,
+ checkDenylistVersion(const OUString& currentversion,
css::uno::Sequence< OUString > const & versions);
css::uno::Reference< css::uno::XComponentContext > m_context;
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 549528aae042..3a55a4483e18 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -342,7 +342,7 @@ OUString DescriptionInfoset::getNodeValueFromExpression(OUString const & express
return n.is() ? getNodeValue(n) : OUString();
}
-void DescriptionInfoset::checkBlacklist() const
+void DescriptionInfoset::checkDenylist() const
{
if (!m_element.is())
return;
@@ -358,25 +358,25 @@ void DescriptionInfoset::checkBlacklist() const
{
{"nodepath", css::uno::Any(OUString("/org.openoffice.Office.ExtensionDependencies/Extensions"))}
}));
- css::uno::Reference< css::container::XNameAccess > blacklist(
+ css::uno::Reference< css::container::XNameAccess > denylist(
(css::configuration::theDefaultProvider::get(m_context)
->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationAccess", args)),
css::uno::UNO_QUERY_THROW);
- // check first if a blacklist entry is available
- if (!(blacklist.is() && blacklist->hasByName(*id))) return;
+ // check first if a denylist entry is available
+ if (!(denylist.is() && denylist->hasByName(*id))) return;
css::uno::Reference< css::beans::XPropertySet > extProps(
- blacklist->getByName(*id), css::uno::UNO_QUERY_THROW);
+ denylist->getByName(*id), css::uno::UNO_QUERY_THROW);
css::uno::Any anyValue = extProps->getPropertyValue("Versions");
css::uno::Sequence< OUString > blversions;
anyValue >>= blversions;
- // check if the current version requires further dependency checks from the blacklist
- if (!checkBlacklistVersion(currentversion, blversions)) return;
+ // check if the current version requires further dependency checks from the denylist
+ if (!checkDenylistVersion(currentversion, blversions)) return;
anyValue = extProps->getPropertyValue("Dependencies");
OUString udeps;
@@ -404,7 +404,7 @@ void DescriptionInfoset::checkBlacklist() const
// get the parent xml document of current description info for the import
css::uno::Reference< css::xml::dom::XDocument > xCurrentDescInfo(m_element->getOwnerDocument());
- // get dependency node of current description info to merge the new dependencies from the blacklist
+ // get dependency node of current description info to merge the new dependencies from the denylist
css::uno::Reference< css::xml::dom::XNode > xCurrentDeps(
m_xpath->selectSingleNode(m_element, "desc:dependencies"));
@@ -422,14 +422,14 @@ void DescriptionInfoset::checkBlacklist() const
css::uno::Reference< css::xml::dom::XNode > xNode(xDeps->item(i));
css::uno::Reference< css::xml::dom::XElement > xDep(xNode, css::uno::UNO_QUERY);
if (xDep.is()) {
- // found valid blacklist dependency, import the node first and append it to the existing dependency node
+ // found valid denylist dependency, import the node first and append it to the existing dependency node
css::uno::Reference< css::xml::dom::XNode > importedNode = xCurrentDescInfo->importNode(xNode, true);
xCurrentDeps->appendChild(importedNode);
}
}
}
-bool DescriptionInfoset::checkBlacklistVersion(
+bool DescriptionInfoset::checkDenylistVersion(
const OUString& currentversion,
css::uno::Sequence< OUString > const & versions)
{
@@ -484,8 +484,8 @@ css::uno::Reference< css::xml::dom::XNodeList >
DescriptionInfoset::getDependencies() const {
if (m_element.is()) {
try {
- // check the extension blacklist first and expand the dependencies if applicable
- checkBlacklist();
+ // check the extension denylist first and expand the dependencies if applicable
+ checkDenylist();
return m_xpath->selectNodeList(m_element, "desc:dependencies/*");
} catch (const css::xml::xpath::XPathException &) {
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 85ce844db1ab..0db171114467 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -774,13 +774,13 @@ void MigrationImpl::runServices()
try {
// set black list for extension migration
- uno::Sequence< OUString > seqExtBlackList;
+ uno::Sequence< OUString > seqExtDenyList;
sal_uInt32 nSize = rMigration.excludeExtensions.size();
if ( nSize > 0 )
- seqExtBlackList = comphelper::arrayToSequence< OUString >(
+ seqExtDenyList = comphelper::arrayToSequence< OUString >(
rMigration.excludeExtensions.data(), nSize );
- seqArguments[2] <<= NamedValue("ExtensionBlackList",
- uno::makeAny( seqExtBlackList ));
+ seqArguments[2] <<= NamedValue("ExtensionDenyList",
+ uno::makeAny( seqExtDenyList ));
xMigrationJob.set(
xContext->getServiceManager()->createInstanceWithArgumentsAndContext(rMigration.service, seqArguments, xContext),
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index f8691360f9ff..a9e045ca0a77 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -192,7 +192,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const OUString& sDescriptionXmlU
if ( !aExtIdentifier.isEmpty() )
{
// scan extension identifier and try to match with our black list entries
- for (const OUString & i : m_aBlackList)
+ for (const OUString & i : m_aDenyList)
{
utl::SearchParam param(i, utl::SearchParam::SearchType::Regexp);
utl::TextSearch ts(param, LANGUAGE_DONTKNOW);
@@ -217,7 +217,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const OUString& sDescriptionXmlU
// Try to use the folder name to match our black list
// as some extensions don't provide an identifier in the
// description.xml!
- for (const OUString & i : m_aBlackList)
+ for (const OUString & i : m_aDenyList)
{
utl::SearchParam param(i, utl::SearchParam::SearchType::Regexp);
utl::TextSearch ts(param, LANGUAGE_DONTKNOW);
@@ -297,13 +297,13 @@ void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments )
OSL_FAIL( "ExtensionMigration::initialize: argument UserData has wrong type!" );
}
}
- else if ( aValue.Name == "ExtensionBlackList" )
+ else if ( aValue.Name == "ExtensionDenyList" )
{
- Sequence< OUString > aBlackList;
- if ( (aValue.Value >>= aBlackList ) && aBlackList.hasElements())
+ Sequence< OUString > aDenyList;
+ if ( (aValue.Value >>= aDenyList ) && aDenyList.hasElements())
{
- m_aBlackList.resize( aBlackList.getLength() );
- ::comphelper::sequenceToArray< OUString >( m_aBlackList.data(), aBlackList );
+ m_aDenyList.resize( aDenyList.getLength() );
+ ::comphelper::sequenceToArray< OUString >( m_aDenyList.data(), aDenyList );
}
}
}
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index bb0600208475..f2aae3b4adbb 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -54,7 +54,7 @@ namespace migration
::osl::Mutex m_aMutex;
OUString m_sSourceDir;
OUString m_sTargetDir;
- TStringVector m_aBlackList;
+ TStringVector m_aDenyList;
enum ScanResult
{
diff --git a/filter/source/svg/.eslintrc.js b/filter/source/svg/.eslintrc.js
index 12561b25aeda..8daf37eabc67 100644
--- a/filter/source/svg/.eslintrc.js
+++ b/filter/source/svg/.eslintrc.js
@@ -51,7 +51,7 @@ module.exports = {
"global-require": "error",
"guard-for-in": "off",
"handle-callback-err": "error",
- "id-blacklist": "error",
+ "id-denylist": "error",
"id-length": "off",
"id-match": "error",
"indent": "off",
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 2c813d64c013..f9e4d74d2839 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -443,7 +443,7 @@ std::shared_ptr<SvtFileDialog_Base> SvtFilePicker::implCreateDialog( weld::Windo
{
OUString sStandardDir = m_aStandardDir;
dialog->SetStandardDir( sStandardDir );
- dialog->SetBlackList( m_aBlackList );
+ dialog->SetDenyList( m_aDenyList );
}
return dialog;
@@ -983,9 +983,9 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
m_aStandardDir = sStandardDir;
}
}
- else if ( namedValue.Name == "BlackList" )
+ else if ( namedValue.Name == "DenyList" )
{
- namedValue.Value >>= m_aBlackList;
+ namedValue.Value >>= m_aDenyList;
}
}
}
@@ -1010,9 +1010,9 @@ bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, co
return true;
}
- if ( _rName == "BlackList" )
+ if ( _rName == "DenyList" )
{
- OSL_VERIFY( _rValue >>= m_aBlackList );
+ OSL_VERIFY( _rValue >>= m_aDenyList );
return true;
}
@@ -1079,7 +1079,7 @@ std::shared_ptr<SvtFileDialog_Base> SvtRemoteFilePicker::implCreateDialog(weld::
{
OUString sStandardDir = m_aStandardDir;
dialog->SetStandardDir( sStandardDir );
- dialog->SetBlackList( m_aBlackList );
+ dialog->SetDenyList( m_aDenyList );
}
return dialog;
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 7e9dc4f70520..3863bf1d5168 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -75,7 +75,7 @@ protected:
OUString m_aStandardDir;
css::uno::Sequence< OUString >
- m_aBlackList;
+ m_aDenyList;
css::uno::Reference< css::ui::dialogs::XFilePickerListener >
m_xListener;
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index fcbd203b536b..ea151bb9b8ff 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -362,7 +362,7 @@ void RemoteFilesDialog::OpenURL( OUString const & sURL )
m_pCurrentAsyncAction = new AsyncPickerAction( this, m_xFileView.get(), AsyncPickerAction::Action::eOpenURL );
// -1 timeout - sync
- m_pCurrentAsyncAction->execute( sURL, sFilter, -1, -1, GetBlackList() );
+ m_pCurrentAsyncAction->execute( sURL, sFilter, -1, -1, GetDenyList() );
if( m_eMode != REMOTEDLG_MODE_SAVE )
m_xName_ed->set_text( "" );
@@ -929,15 +929,15 @@ void RemoteFilesDialog::SetHasFilename( bool )
{
}
-void RemoteFilesDialog::SetBlackList( const css::uno::Sequence< OUString >& rBlackList )
+void RemoteFilesDialog::SetDenyList( const css::uno::Sequence< OUString >& rDenyList )
{
- m_aBlackList = rBlackList;
- m_xTreeView->SetBlackList( rBlackList );
+ m_aDenyList = rDenyList;
+ m_xTreeView->SetDenyList( rDenyList );
}
-const css::uno::Sequence< OUString >& RemoteFilesDialog::GetBlackList() const
+const css::uno::Sequence< OUString >& RemoteFilesDialog::GetDenyList() const
{
- return m_aBlackList;
+ return m_aDenyList;
}
void RemoteFilesDialog::SetStandardDir( const OUString& rStdDir )
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx
index 6a80bc849f70..64ae56412b5f 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -61,8 +61,8 @@ public:
virtual SvtFileView* GetView() override;
virtual void SetHasFilename( bool ) override;
- virtual void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) override;
- virtual const css::uno::Sequence< OUString >& GetBlackList() const override;
+ virtual void SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) override;
+ virtual const css::uno::Sequence< OUString >& GetDenyList() const override;
virtual void SetStandardDir( const OUString& rStdDir ) override;
virtual const OUString& GetStandardDir() const override;
virtual void SetPath( const OUString& rNewURL ) override;
@@ -121,7 +121,7 @@ private:
::rtl::Reference< ::svt::AsyncPickerAction > m_pCurrentAsyncAction;
- css::uno::Sequence< OUString > m_aBlackList;
+ css::uno::Sequence< OUString > m_aDenyList;
std::unique_ptr<weld::Button> m_xOk_btn;
std::unique_ptr<weld::Button> m_xCancel_btn;
diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx
index 4dc64af3d4eb..349d586b8979 100644
--- a/fpicker/source/office/asyncfilepicker.cxx
+++ b/fpicker/source/office/asyncfilepicker.cxx
@@ -61,7 +61,7 @@ namespace svt
const OUString& _rFilter,
sal_Int32 _nMinTimeout,
sal_Int32 _nMaxTimeout,
- const css::uno::Sequence< OUString >& rBlackList )
+ const css::uno::Sequence< OUString >& rDenyList )
{
DBG_TESTSOLARMUTEX();
// if this asserts, we'd need to have an own mutex per instance
@@ -95,7 +95,7 @@ namespace svt
break;
case eOpenURL:
- eResult = m_pView->Initialize( _rURL, _rFilter, pActionDescriptor.get(), rBlackList );
+ eResult = m_pView->Initialize( _rURL, _rFilter, pActionDescriptor.get(), rDenyList );
break;
case eExecuteFilter:
diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx
index 830577f626d5..d644f88946e9 100644
--- a/fpicker/source/office/asyncfilepicker.hxx
+++ b/fpicker/source/office/asyncfilepicker.hxx
@@ -72,7 +72,7 @@ namespace svt
const OUString& _rFilter,
sal_Int32 _nMinTimeout,
sal_Int32 _nMaxTimeout,
- const css::uno::Sequence< OUString >& rBlackList );
+ const css::uno::Sequence< OUString >& rDenyList );
/// cancels the running action
void cancel();
diff --git a/fpicker/source/office/contentenumeration.cxx b/fpicker/source/office/contentenumeration.cxx
index 2ca057036a64..090d19a47988 100644
--- a/fpicker/source/office/contentenumeration.cxx
+++ b/fpicker/source/office/contentenumeration.cxx
@@ -82,7 +82,7 @@ namespace svt
,m_xCommandEnv ( _rxCommandEnv )
,m_pResultHandler ( nullptr )
,m_bCancelled ( false )
- ,m_rBlackList ( css::uno::Sequence< OUString >() )
+ ,m_rDenyList ( css::uno::Sequence< OUString >() )
{
}
@@ -104,13 +104,13 @@ namespace svt
EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync(
const FolderDescriptor& _rFolder,
- const css::uno::Sequence< OUString >& rBlackList )
+ const css::uno::Sequence< OUString >& rDenyList )
{
{
::osl::MutexGuard aGuard( m_aMutex );
m_aFolder = _rFolder;
m_pResultHandler = nullptr;
- m_rBlackList = rBlackList;
+ m_rDenyList = rDenyList;
}
return enumerateFolderContent();
}
@@ -220,7 +220,7 @@ namespace svt
// check for restrictions
{
::osl::MutexGuard aGuard( m_aMutex );
- if ( /* m_rBlackList.hasElements() && */ URLOnBlackList ( sRealURL ) )
+ if ( /* m_rDenyList.hasElements() && */ URLOnDenyList ( sRealURL ) )
continue;
}
@@ -310,11 +310,11 @@ namespace svt
}
- bool FileViewContentEnumerator::URLOnBlackList ( const OUString& sRealURL )
+ bool FileViewContentEnumerator::URLOnDenyList ( const OUString& sRealURL )
{
OUString entryName = sRealURL.copy( sRealURL.lastIndexOf( '/' ) + 1 );
- return comphelper::findValue(m_rBlackList, entryName) != -1;
+ return comphelper::findValue(m_rDenyList, entryName) != -1;
}
diff --git a/fpicker/source/office/contentenumeration.hxx b/fpicker/source/office/contentenumeration.hxx
index 920a6d8f2b08..f6a48c5c3360 100644
--- a/fpicker/source/office/contentenumeration.hxx
+++ b/fpicker/source/office/contentenumeration.hxx
@@ -167,9 +167,9 @@ namespace svt
IEnumerationResultHandler* m_pResultHandler;
bool m_bCancelled;
- css::uno::Sequence< OUString > m_rBlackList;
+ css::uno::Sequence< OUString > m_rDenyList;
- bool URLOnBlackList ( const OUString& sRealURL );
+ bool URLOnDenyList ( const OUString& sRealURL );
public:
/** constructs an enumerator instance
@@ -205,7 +205,7 @@ namespace svt
*/
EnumerationResult enumerateFolderContentSync(
const FolderDescriptor& _rFolder,
- const css::uno::Sequence< OUString >& rBlackList
+ const css::uno::Sequence< OUString >& rDenyList
);
/** cancels the running operation.
diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx
index 57269cc72011..0003305fccc8 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -288,12 +288,12 @@ public:
FileViewResult GetFolderContent_Impl(
const OUString& rFolder,
const FileViewAsyncAction* pAsyncDescriptor,
- const css::uno::Sequence< OUString >& rBlackList );
+ const css::uno::Sequence< OUString >& rDenyList );
FileViewResult GetFolderContent_Impl(
const FolderDescriptor& _rFolder,
const FileViewAsyncAction* pAsyncDescriptor,
- const css::uno::Sequence< OUString >& rBlackList );
+ const css::uno::Sequence< OUString >& rDenyList );
void FilterFolderContent_Impl( const OUString &rFilter );
void CancelRunningAsyncAction();
@@ -879,7 +879,7 @@ FileViewResult SvtFileView::PreviousLevel( const FileViewAsyncAction* pAsyncDesc
OUString sParentURL;
if ( GetParentURL( sParentURL ) )
- eResult = Initialize( sParentURL, mpImpl->maCurrentFilter, pAsyncDescriptor, maBlackList );
+ eResult = Initialize( sParentURL, mpImpl->maCurrentFilter, pAsyncDescriptor, maDenyList );
return eResult;
}
@@ -931,10 +931,10 @@ FileViewResult SvtFileView::Initialize(
const OUString& rURL,
const OUString& rFilter,
const FileViewAsyncAction* pAsyncDescriptor,
- const css::uno::Sequence< OUString >& rBlackList )
+ const css::uno::Sequence< OUString >& rDenyList )
{
weld::WaitObject aWaitCursor(mpImpl->m_pTopLevel);
- maBlackList = rBlackList;
+ maDenyList = rDenyList;
OUString sPushURL( mpImpl->maViewURL );
@@ -963,7 +963,7 @@ FileViewResult SvtFileView::ExecuteFilter( const OUString& rFilter, const FileVi
mpImpl->maCurrentFilter = rFilter.toAsciiLowerCase();
mpImpl->Clear();
- FileViewResult eResult = mpImpl->GetFolderContent_Impl(mpImpl->maViewURL, pAsyncDescriptor, maBlackList);
+ FileViewResult eResult = mpImpl->GetFolderContent_Impl(mpImpl->maViewURL, pAsyncDescriptor, maDenyList);
OSL_ENSURE( ( eResult != eStillRunning ) || pAsyncDescriptor, "SvtFileView::ExecuteFilter: we told it to read synchronously!" );
return eResult;
}
@@ -1167,7 +1167,7 @@ void SvtFileView_Impl::Clear()
FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
const OUString& rFolder,
const FileViewAsyncAction* pAsyncDescriptor,
- const css::uno::Sequence< OUString >& rBlackList )
+ const css::uno::Sequence< OUString >& rDenyList )
{
::osl::ClearableMutexGuard aGuard( maMutex );
INetURLObject aFolderObj( rFolder );
@@ -1176,13 +1176,13 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
FolderDescriptor aFolder( aFolderObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
aGuard.clear();
- return GetFolderContent_Impl( aFolder, pAsyncDescriptor, rBlackList );
+ return GetFolderContent_Impl( aFolder, pAsyncDescriptor, rDenyList );
}
FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
const FolderDescriptor& _rFolder,
const FileViewAsyncAction* pAsyncDescriptor,
- const css::uno::Sequence< OUString >& rBlackList )
+ const css::uno::Sequence< OUString >& rDenyList )
{
DBG_TESTSOLARMUTEX();
::osl::ClearableMutexGuard aGuard( maMutex );
@@ -1194,7 +1194,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
if ( !pAsyncDescriptor )
{
- ::svt::EnumerationResult eResult = m_xContentEnumerator->enumerateFolderContentSync( _rFolder, rBlackList );
+ ::svt::EnumerationResult eResult = m_xContentEnumerator->enumerateFolderContentSync( _rFolder, rDenyList );
if ( ::svt::EnumerationResult::SUCCESS == eResult )
{
implEnumerationSuccess();
diff --git a/fpicker/source/office/fileview.hxx b/fpicker/source/office/fileview.hxx
index 9bf4dca06e0f..19c22391e7fb 100644
--- a/fpicker/source/office/fileview.hxx
+++ b/fpicker/source/office/fileview.hxx
@@ -63,7 +63,7 @@ class SvtFileView
{
private:
std::unique_ptr<SvtFileView_Impl> mpImpl;
- css::uno::Sequence<OUString> maBlackList;
+ css::uno::Sequence<OUString> maDenyList;
DECL_LINK(HeaderSelect_Impl, int, void);
@@ -107,7 +107,7 @@ public:
const OUString& rFolderURL,
const OUString& rFilter,
const FileViewAsyncAction* pAsyncDescriptor,
- const css::uno::Sequence< OUString >& rBlackList
+ const css::uno::Sequence< OUString >& rDenyList
);
/** reads the current content of the current folder again, and applies the given filter to it
diff --git a/fpicker/source/office/foldertree.cxx b/fpicker/source/office/foldertree.cxx
index 9e618bd9d0b9..49007c982b3d 100644
--- a/fpicker/source/office/foldertree.cxx
+++ b/fpicker/source/office/foldertree.cxx
@@ -74,7 +74,7 @@ void FolderTree::FillTreeEntry(const weld::TreeIter& rEntry)
FolderDescriptor aFolder(sURL);
EnumerationResult eResult =
- xContentEnumerator->enumerateFolderContentSync( aFolder, m_aBlackList );
+ xContentEnumerator->enumerateFolderContentSync( aFolder, m_aDenyList );
if (EnumerationResult::SUCCESS == eResult)
{
@@ -169,9 +169,9 @@ void FolderTree::SetTreePath( OUString const & sUrl )
}
}
-void FolderTree::SetBlackList( const css::uno::Sequence< OUString >& rBlackList )
+void FolderTree::SetDenyList( const css::uno::Sequence< OUString >& rDenyList )
{
- m_aBlackList = rBlackList;
+ m_aDenyList = rDenyList;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/foldertree.hxx b/fpicker/source/office/foldertree.hxx
index aaa79bbf2635..da888e332308 100644
--- a/fpicker/source/office/foldertree.hxx
+++ b/fpicker/source/office/foldertree.hxx
@@ -27,7 +27,7 @@ private:
weld::Window* m_pTopLevel;
Reference< XCommandEnvironment > m_xEnv;
::osl::Mutex m_aMutex;
- Sequence< OUString > m_aBlackList;
+ Sequence< OUString > m_aDenyList;
OUString m_sLastUpdatedDir;
@@ -44,7 +44,7 @@ public:
void FillTreeEntry(const weld::TreeIter& rEntry);
void FillTreeEntry(const OUString & rUrl, const ::std::vector< std::pair< OUString, OUString > >& rFolders);
void SetTreePath(OUString const & sUrl);
- void SetBlackList(const css::uno::Sequence< OUString >& rBlackList);
+ void SetDenyList(const css::uno::Sequence< OUString >& rDenyList);
};
#endif
diff --git a/fpicker/source/office/fpdialogbase.hxx b/fpicker/source/office/fpdialogbase.hxx
index 5176e626c861..21a8302549d0 100644
--- a/fpicker/source/office/fpdialogbase.hxx
+++ b/fpicker/source/office/fpdialogbase.hxx
@@ -70,8 +70,8 @@ public:
virtual SvtFileView* GetView() = 0;
virtual void SetHasFilename( bool bHasFilename ) = 0;
- virtual void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) = 0;
- virtual const css::uno::Sequence< OUString >& GetBlackList() const = 0;
+ virtual void SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) = 0;
+ virtual const css::uno::Sequence< OUString >& GetDenyList() const = 0;
virtual void SetStandardDir( const OUString& rStdDir ) = 0;
virtual const OUString& GetStandardDir() const = 0;
virtual void SetPath( const OUString& rNewURL ) = 0;
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index d2dcef40a313..bfec874b9326 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1630,7 +1630,7 @@ void SvtFileDialog::executeAsync( ::svt::AsyncPickerAction::Action eAction,
m_aConfiguration.getNodeValue( OUString( "Timeout/Max" ) ) >>= nMaxTimeout;
m_bInExecuteAsync = true;
- m_pCurrentAsyncAction->execute(rURL, rFilter, bReallyAsync ? nMinTimeout : -1, nMaxTimeout, GetBlackList());
+ m_pCurrentAsyncAction->execute(rURL, rFilter, bReallyAsync ? nMinTimeout : -1, nMaxTimeout, GetDenyList());
m_bInExecuteAsync = false;
}
@@ -1662,15 +1662,15 @@ void SvtFileDialog::SetStandardDir( const OUString& rStdDir )
m_xImpl->SetStandardDir( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
}
-void SvtFileDialog::SetBlackList( const css::uno::Sequence< OUString >& rBlackList )
+void SvtFileDialog::SetDenyList( const css::uno::Sequence< OUString >& rDenyList )
{
- m_xImpl->SetBlackList( rBlackList );
+ m_xImpl->SetDenyList( rDenyList );
}
-const css::uno::Sequence< OUString >& SvtFileDialog::GetBlackList() const
+const css::uno::Sequence< OUString >& SvtFileDialog::GetDenyList() const
{
- return m_xImpl->GetBlackList();
+ return m_xImpl->GetDenyList();
}
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index fbca0a7711af..12f1d1bd7ca2 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -160,8 +160,8 @@ public:
void FileSelect();
void FilterSelect() override;
- void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) override;
- const css::uno::Sequence< OUString >& GetBlackList() const override;
+ void SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) override;
+ const css::uno::Sequence< OUString >& GetDenyList() const override;
void SetStandardDir( const OUString& rStdDir ) override;
const OUString& GetStandardDir() const override;
std::vector<OUString> GetPathList() const override; // for MultiSelection
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 5546e4dd47d4..0d074f1f610b 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -107,7 +107,7 @@ private:
const SvtFileDialogFilter_Impl* m_pCurFilter;
OUString m_sCurrentFilterDisplayName; // may differ from m_pCurFilter->GetName in case it is a cached entry
- css::uno::Sequence< OUString > m_aBlackList;
+ css::uno::Sequence< OUString > m_aDenyList;
public:
SvtFileDialogFilterList_Impl m_aFilter;
@@ -156,8 +156,8 @@ public:
explicit SvtExpFileDlg_Impl();
~SvtExpFileDlg_Impl();
- void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) { m_aBlackList = rBlackList; }
- const css::uno::Sequence< OUString >& GetBlackList() const { return m_aBlackList; }
+ void SetDenyList( const css::uno::Sequence< OUString >& rDenyList ) { m_aDenyList = rDenyList; }
+ const css::uno::Sequence< OUString >& GetDenyList() const { return m_aDenyList; }
void SetStandardDir( const OUString& rDir );
const OUString& GetStandardDir() const { return m_aStdDir; }
diff --git a/include/onlineupdate/mozilla/Attributes.h b/include/onlineupdate/mozilla/Attributes.h
index 6c2cc02892c1..74b77a38d082 100644
--- a/include/onlineupdate/mozilla/Attributes.h
+++ b/include/onlineupdate/mozilla/Attributes.h
@@ -245,42 +245,42 @@
#endif
/*
- * MOZ_ASAN_BLACKLIST is a macro to tell AddressSanitizer (a compile-time
+ * MOZ_ASAN_DENYLIST is a macro to tell AddressSanitizer (a compile-time
* instrumentation shipped with Clang and GCC) to not instrument the annotated
* function. Furthermore, it will prevent the compiler from inlining the
- * function because inlining currently breaks the blacklisting mechanism of
+ * function because inlining currently breaks the denylisting mechanism of
* AddressSanitizer.
*/
#if defined(__has_feature)
# if __has_feature(address_sanitizer)
-# define MOZ_HAVE_ASAN_BLACKLIST
+# define MOZ_HAVE_ASAN_DENYLIST
# endif
#elif defined(__GNUC__)
# if defined(__SANITIZE_ADDRESS__)
-# define MOZ_HAVE_ASAN_BLACKLIST
+# define MOZ_HAVE_ASAN_DENYLIST
# endif
#endif
-#if defined(MOZ_HAVE_ASAN_BLACKLIST)
-# define MOZ_ASAN_BLACKLIST MOZ_NEVER_INLINE __attribute__((no_sanitize_address))
+#if defined(MOZ_HAVE_ASAN_DENYLIST)
+# define MOZ_ASAN_DENYLIST MOZ_NEVER_INLINE __attribute__((no_sanitize_address))
#else
-# define MOZ_ASAN_BLACKLIST /* nothing */
+# define MOZ_ASAN_DENYLIST /* nothing */
#endif
/*
- * MOZ_TSAN_BLACKLIST is a macro to tell ThreadSanitizer (a compile-time
+ * MOZ_TSAN_DENYLIST is a macro to tell ThreadSanitizer (a compile-time
* instrumentation shipped with Clang) to not instrument the annotated function.
* Furthermore, it will prevent the compiler from inlining the function because
- * inlining currently breaks the blacklisting mechanism of ThreadSanitizer.
+ * inlining currently breaks the denylisting mechanism of ThreadSanitizer.
*/
#if defined(__has_feature)
# if __has_feature(thread_sanitizer)
-# define MOZ_TSAN_BLACKLIST MOZ_NEVER_INLINE __attribute__((no_sanitize_thread))
+# define MOZ_TSAN_DENYLIST MOZ_NEVER_INLINE __attribute__((no_sanitize_thread))
# else
-# define MOZ_TSAN_BLACKLIST /* nothing */
+# define MOZ_TSAN_DENYLIST /* nothing */
# endif
#else
-# define MOZ_TSAN_BLACKLIST /* nothing */
+# define MOZ_TSAN_DENYLIST /* nothing */
#endif
/**
diff --git a/include/opencl/openclconfig.hxx b/include/opencl/openclconfig.hxx
index c7a188a73203..c1b73a66485a 100644
--- a/include/opencl/openclconfig.hxx
+++ b/include/opencl/openclconfig.hxx
@@ -76,7 +76,7 @@ struct OPENCL_DLLPUBLIC OpenCLConfig
typedef std::set<ImplMatcher> ImplMatcherSet;
- ImplMatcherSet maBlackList;
+ ImplMatcherSet maDenyList;
ImplMatcherSet maWhiteList;
OpenCLConfig();
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 42d6b53c0cfb..a0a436f12e9c 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -120,7 +120,7 @@ public:
SfxFilterFlags nMust,
SfxFilterFlags nDont,
const OUString& rStandardDir,
- const css::uno::Sequence< OUString >& rBlackList,
+ const css::uno::Sequence< OUString >& rDenyList,
weld::Window* pPreferredParent);
FileDialogHelper(sal_Int16 nDialogType,
@@ -128,7 +128,7 @@ public:
const OUString& aFilterUIName,
const OUString& aExtName,
const OUString& rStandardDir,
- const css::uno::Sequence< OUString >& rBlackList,
+ const css::uno::Sequence< OUString >& rDenyList,
weld::Window* pPreferredParent);
virtual ~FileDialogHelper();
@@ -253,7 +253,7 @@ ErrCode FileOpenDialog_Impl( weld::Window* pParent,
const OUString* pPath,
sal_Int16 nDialog,
const OUString& rStandardDir,
- const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >());
+ const css::uno::Sequence< OUString >& rDenyList = css::uno::Sequence< OUString >());
ErrCode RequestPassword(const std::shared_ptr<const SfxFilter>& pCurrentFilter, OUString const & aURL, SfxItemSet* pSet, const css::uno::Reference<css::awt::XWindow>& rParent);
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index a42f43c2a702..23d7382f062d 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -153,7 +153,7 @@ class SvxSearchItem;
#define SID_PATH (SID_SFX_START + 308)
#define SID_SAVEDOCS (SID_SFX_START + 309)
#define SID_STANDARD_DIR (SID_SFX_START + 450)
-#define SID_BLACK_LIST (SID_SFX_START + 451)
+#define SID_DENY_LIST (SID_SFX_START + 451)
// browse-ids
#define SID_BROWSE_FORWARD (SID_SFX_START + 1300)
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index 4f365c2e44ff..493fd5d2e014 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -100,9 +100,9 @@ public:
static void debugMsgStreamWarn(std::ostringstream const &pStream);
/**
- * checks if the device/driver pair is on our OpenGL blacklist
+ * checks if the device/driver pair is on our OpenGL denylist
*/
- static bool isDeviceBlacklisted();
+ static bool isDeviceDenylisted();
/**
* checks if the system supports all features that are necessary for the OpenGL VCL support
diff --git a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl
index 3fb7430fa6a6..69374baf8b0d 100644
--- a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl
+++ b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl
@@ -18,7 +18,7 @@ interface XOpenCLSelection : com::sun::star::uno::XInterface
* Returns true if calculation with OpenCL is enabled (at all).
* The actual use of OpenCL for a formula is also affected by the
* configuration settings specifying whether OpenCL is used for
- * all opcodes or just for a subset, and the black- and whitelists
+ * all opcodes or just for a subset, and the deny- and allowlists
* of OpenCL implementations that are in use.
*/
boolean isOpenCLEnabled();
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>
diff --git a/oox/README b/oox/README
index 7f127b617981..6c459f58c92a 100644
--- a/oox/README
+++ b/oox/README
@@ -157,7 +157,7 @@ http://www.microsoft.com/en-us/download/details.aspx?id=30425
== Export ==
Here is how LO's enhanced custom shapes are exported:
* Shape name is ooxml-* - they are imported from ooxml, export as is.
-* Blacklist - ODF presets that has OOXML equivalent.
+* Denylist - ODF presets that has OOXML equivalent.
We convert adjustment values case by case. Microsoft Office
is rather strict about adjustment values, either none of them
are provided so that default values are taken, or the exact set
@@ -165,7 +165,7 @@ Here is how LO's enhanced custom shapes are exported:
from the preset with less handles to the one with more handles
so that default values suitable for the odf one need to be
provided.
-* Whitelist - ODF presets that has OOXML equivalent but looks a bit
+* Allowlist - ODF presets that has OOXML equivalent but looks a bit
different, export them as PolyPolygon.
Check Andras Timar's presentation[1] and ShapeExport::WriteCustomShape()
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index c1982961537b..09c5bc386eac 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -518,9 +518,9 @@ ShapeExport& ShapeExport::WriteGroupShape(const uno::Reference<drawing::XShape>&
return *this;
}
-static bool lcl_IsOnBlacklist(OUString const & rShapeType)
+static bool lcl_IsOnDenylist(OUString const & rShapeType)
{
- static const std::initializer_list<OUStringLiteral> vBlacklist = {
+ static const std::initializer_list<OUStringLiteral> vDenylist = {
"block-arc",
"rectangle",
"ellipse",
@@ -582,7 +582,7 @@ static bool lcl_IsOnBlacklist(OUString const & rShapeType)
"flowchart-display"
};
- return std::find(vBlacklist.begin(), vBlacklist.end(), rShapeType) != vBlacklist.end();
+ return std::find(vDenylist.begin(), vDenylist.end(), rShapeType) != vDenylist.end();
}
static bool lcl_IsOnWhitelist(OUString const & rShapeType)
@@ -812,20 +812,20 @@ ShapeExport& ShapeExport::WriteCustomShape( const Reference< XShape >& xShape )
// we export non-primitive shapes to custom geometry
// we also export non-ooxml shapes which have handles/equations to custom geometry, because
// we cannot convert ODF equations to DrawingML equations. TODO: see what binary DOC export filter does.
- // but our WritePolyPolygon()/WriteCustomGeometry() functions are incomplete, therefore we use a blacklist
+ // but our WritePolyPolygon()/WriteCustomGeometry() functions are incomplete, therefore we use a denylist
// we use a whitelist for shapes where mapping to MSO preset shape is not optimal
bool bCustGeom = true;
- bool bOnBlacklist = false;
+ bool bOnDenylist = false;
if( sShapeType == "ooxml-non-primitive" )
bCustGeom = true;
else if( sShapeType.startsWith("ooxml") )
bCustGeom = false;
else if( lcl_IsOnWhitelist(sShapeType) )
bCustGeom = true;
- else if( lcl_IsOnBlacklist(sShapeType) )
+ else if( lcl_IsOnDenylist(sShapeType) )
{
bCustGeom = false;
- bOnBlacklist = true;
+ bOnDenylist = true;
}
else if( bHasHandles )
bCustGeom = true;
@@ -853,7 +853,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const Reference< XShape >& xShape )
if (!bSuccess)
WritePresetShape( sPresetShape );
}
- else if (bOnBlacklist && bHasHandles && nAdjustmentValuesIndex !=-1 && !sShapeType.startsWith("mso-spt"))
+ else if (bOnDenylist && bHasHandles && nAdjustmentValuesIndex !=-1 && !sShapeType.startsWith("mso-spt"))
{
WriteShapeTransformation( xShape, XML_a, bFlipH, bFlipV );
Sequence< EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
diff --git a/opencl/source/opencl_device.cxx b/opencl/source/opencl_device.cxx
index 1b6800e0ef8c..971c63ee3fe0 100644
--- a/opencl/source/opencl_device.cxx
+++ b/opencl/source/opencl_device.cxx
@@ -345,7 +345,7 @@ int pickBestDevice(std::unique_ptr<ds_profile> const & profile)
{
ds_device& device = profile->devices[d];
- // Check blacklist and whitelist for actual devices
+ // Check denylist and whitelist for actual devices
if (device.eType == DeviceType::OpenCLDevice)
{
// There is a silly impedance mismatch here. Why do we
@@ -360,10 +360,10 @@ int pickBestDevice(std::unique_ptr<ds_profile> const & profile)
aDevice.maName = OStringToOUString(device.sDeviceName, RTL_TEXTENCODING_UTF8);
aDevice.maDriver = OStringToOUString(device.sDriverVersion, RTL_TEXTENCODING_UTF8);
- // If blacklisted or not whitelisted, ignore it
+ // If denylisted or not whitelisted, ignore it
if (OpenCLConfig::get().checkImplementation(aPlatform, aDevice))
{
- SAL_INFO("opencl.device", "Device[" << d << "] " << device.sDeviceName << " is blacklisted or not whitelisted");
+ SAL_INFO("opencl.device", "Device[" << d << "] " << device.sDeviceName << " is denylisted or not whitelisted");
device.fTime = DBL_MAX;
device.bErrors = false;
}
diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx
index 643d9fc2a8a1..9a4b1d6bc4c0 100644
--- a/opencl/source/openclconfig.cxx
+++ b/opencl/source/openclconfig.cxx
@@ -25,10 +25,10 @@
OpenCLConfig::OpenCLConfig() :
mbUseOpenCL(true)
{
- // This entry we have had for some time (when blacklisting was
+ // This entry we have had for some time (when denylisting was
// done elsewhere in the code), so presumably there is a known
// good reason for it.
- maBlackList.insert(ImplMatcher("Windows", "", "Intel\\(R\\) Corporation", "", "9\\.17\\.10\\.2884"));
+ maDenyList.insert(ImplMatcher("Windows", "", "Intel\\(R\\) Corporation", "", "9\\.17\\.10\\.2884"));
// This is what I have tested on Linux and it works for our unit tests.
maWhiteList.insert(ImplMatcher("Linux", "", "Advanced Micro Devices, Inc\\.", "", "1445\\.5 \\(sse2,avx\\)"));
@@ -42,7 +42,7 @@ OpenCLConfig::OpenCLConfig() :
bool OpenCLConfig::operator== (const OpenCLConfig& r) const
{
return (mbUseOpenCL == r.mbUseOpenCL &&
- maBlackList == r.maBlackList &&
+ maDenyList == r.maDenyList &&
maWhiteList == r.maWhiteList);
}
@@ -180,7 +180,7 @@ OpenCLConfig OpenCLConfig::get()
result.mbUseOpenCL = officecfg::Office::Common::Misc::UseOpenCL::get();
- result.maBlackList = StringSequenceToSetOfImplMatcher(officecfg::Office::Common::Misc::OpenCLBlackList::get());
+ result.maDenyList = StringSequenceToSetOfImplMatcher(officecfg::Office::Common::Misc::OpenCLDenyList::get());
result.maWhiteList = StringSequenceToSetOfImplMatcher(officecfg::Office::Common::Misc::OpenCLWhiteList::get());
return result;
@@ -191,7 +191,7 @@ void OpenCLConfig::set()
std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
officecfg::Office::Common::Misc::UseOpenCL::set(mbUseOpenCL, batch);
- officecfg::Office::Common::Misc::OpenCLBlackList::set(SetOfImplMatcherToStringSequence(maBlackList), batch);
+ officecfg::Office::Common::Misc::OpenCLDenyList::set(SetOfImplMatcherToStringSequence(maDenyList), batch);
officecfg::Office::Common::Misc::OpenCLWhiteList::set(SetOfImplMatcherToStringSequence(maWhiteList), batch);
batch->commit();
@@ -199,8 +199,8 @@ void OpenCLConfig::set()
bool OpenCLConfig::checkImplementation(const OpenCLPlatformInfo& rPlatform, const OpenCLDeviceInfo& rDevice) const
{
- // Check blacklist of known bad OpenCL implementations
- if (match(maBlackList, rPlatform, rDevice, "blacklist"))
+ // Check denylist of known bad OpenCL implementations
+ if (match(maDenyList, rPlatform, rDevice, "denylist"))
{
SAL_INFO("opencl", "Rejecting");
return true;
@@ -222,7 +222,7 @@ std::ostream& operator<<(std::ostream& rStream, const OpenCLConfig& rConfig)
{
rStream << "{"
"UseOpenCL=" << (rConfig.mbUseOpenCL ? "YES" : "NO") << ","
- "BlackList=" << rConfig.maBlackList << ","
+ "DenyList=" << rConfig.maDenyList << ","
"WhiteList=" << rConfig.maWhiteList <<
"}";
return rStream;
diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index 0806fc14e987..282197acab52 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -122,7 +122,7 @@ private:
};
void Test::test() {
- // On Windows, blacklist the com.sun.star.comp.report.OReportDefinition
+ // On Windows, denylist the com.sun.star.comp.report.OReportDefinition
// implementation (reportdesign::OReportDefinition in
// reportdesign/source/core/api/ReportDefinition.cxx), as it spawns a thread
// that forever blocks in SendMessageW when no VCL event loop is running
@@ -136,12 +136,12 @@ void Test::test() {
// WorkWindow::ImplInit -> ImplBorderWindow::ImplBorderWindow ->
// ImplBorderWindow::ImplInit -> Window::ImplInit ->
// WinSalInstance::CreateFrame -> ImplSendMessage -> SendMessageW):
- std::vector<OUString> blacklist;
- blacklist.emplace_back("com.sun.star.comp.report.OReportDefinition");
+ std::vector<OUString> denylist;
+ denylist.emplace_back("com.sun.star.comp.report.OReportDefinition");
// <https://bugs.documentfoundation.org/show_bug.cgi?id=89343>
// "~SwXMailMerge() goes into endless SwCache::Check()":
- blacklist.emplace_back("SwXMailMerge");
+ denylist.emplace_back("SwXMailMerge");
css::uno::Reference<css::container::XContentEnumerationAccess> enumAcc(
m_xContext->getServiceManager(), css::uno::UNO_QUERY_THROW);
@@ -263,8 +263,8 @@ void Test::test() {
}
std::vector<css::uno::Reference<css::lang::XComponent>> comps;
for (auto const & i: impls) {
- if (std::find(blacklist.begin(), blacklist.end(), i.first)
- == blacklist.end())
+ if (std::find(denylist.begin(), denylist.end(), i.first)
+ == denylist.end())
{
if (i.second.constructors.empty()) {
if (i.second.accumulationBased) {
@@ -458,7 +458,7 @@ void Test::createInstance(
}
}
if (!propsinfo->hasPropertyByName(prop->getName())) {
- static std::set<std::pair<OUString, OUString>> const blacklist{
+ static std::set<std::pair<OUString, OUString>> const denylist{
{"com.sun.star.comp.chart.DataSeries", "BorderDash"},
{"com.sun.star.comp.chart2.ChartDocumentWrapper", "UserDefinedAttributes"},
{"com.sun.star.comp.dbu.OColumnControlModel", "Tabstop"},
@@ -485,7 +485,7 @@ void Test::createInstance(
{"com.sun.star.comp.report.OFormattedField", "TextLineColor"},
{"com.sun.star.comp.report.OFormattedField", "TreatAsNumber"},
{"stardiv.Toolkit.UnoControlRoadmapModel", "Interactive"}};
- if (blacklist.find({implementationName, prop->getName()}) != blacklist.end()) {
+ if (denylist.find({implementationName, prop->getName()}) != denylist.end()) {
continue;
}
CPPUNIT_ASSERT_MESSAGE(
diff --git a/sanitize-ubsan-blacklist b/sanitize-ubsan-excludelist
similarity index 100%
rename from sanitize-ubsan-blacklist
rename to sanitize-ubsan-excludelist
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");
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;
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 4ecc4cf8814b..073f25121a1b 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -637,17 +637,17 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
if ( pStandardDirItem )
sStandardDir = pStandardDirItem->GetValue();
- css::uno::Sequence< OUString > aBlackList;
+ css::uno::Sequence< OUString > aDenyList;
- const SfxStringListItem* pBlackListItem = rReq.GetArg<SfxStringListItem>(SID_BLACK_LIST);
- if ( pBlackListItem )
- pBlackListItem->GetStringList( aBlackList );
+ const SfxStringListItem* pDenyListItem = rReq.GetArg<SfxStringListItem>(SID_DENY_LIST);
+ if ( pDenyListItem )
+ pDenyListItem->GetStringList( aDenyList );
vcl::Window* pTopWindow = GetTopWindow();
ErrCode nErr = sfx2::FileOpenDialog_Impl(pTopWindow ? pTopWindow->GetFrameWeld() : nullptr,
nDialogType,
eDialogFlags, aURLList,
- aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList);
+ aFilter, pSet, &aPath, nDialog, sStandardDir, aDenyList);
if ( nErr == ERRCODE_ABORT )
{
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 7ac8358696be..7f0617a66c67 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -139,7 +139,7 @@ char const sNoAutoSave[] = "NoAutoSave";
char const sFolderName[] = "FolderName";
char const sUseSystemDialog[] = "UseSystemDialog";
char const sStandardDir[] = "StandardDir";
-char const sBlackList[] = "BlackList";
+char const sDenyList[] = "DenyList";
char const sModifyPasswordInfo[] = "ModifyPasswordInfo";
char const sSuggestedSaveAsDir[] = "SuggestedSaveAsDir";
char const sSuggestedSaveAsName[] = "SuggestedSaveAsName";
@@ -622,14 +622,14 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
if (bOK)
rSet.Put( SfxStringItem( SID_STANDARD_DIR, sVal ) );
}
- else if ( aName == sBlackList )
+ else if ( aName == sDenyList )
{
uno::Sequence<OUString> xVal;
bool bOK = (rProp.Value >>= xVal);
- DBG_ASSERT( bOK, "invalid type or value for BlackList" );
+ DBG_ASSERT( bOK, "invalid type or value for DenyList" );
if (bOK)
{
- SfxStringListItem stringList(SID_BLACK_LIST);
+ SfxStringListItem stringList(SID_DENY_LIST);
stringList.SetStringList( xVal );
rSet.Put( stringList );
}
@@ -994,7 +994,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
nAdditional++;
if ( rSet.GetItemState( SID_STANDARD_DIR ) == SfxItemState::SET )
nAdditional++;
- if ( rSet.GetItemState( SID_BLACK_LIST ) == SfxItemState::SET )
+ if ( rSet.GetItemState( SID_DENY_LIST ) == SfxItemState::SET )
nAdditional++;
if ( rSet.GetItemState( SID_CONTENT ) == SfxItemState::SET )
nAdditional++;
@@ -1207,7 +1207,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
continue;
if ( nId == SID_STANDARD_DIR )
continue;
- if ( nId == SID_BLACK_LIST )
+ if ( nId == SID_DENY_LIST )
continue;
if ( nId == SID_CONTENTTYPE )
continue;
@@ -1539,9 +1539,9 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
pValue[nActProp].Name = sStandardDir;
pValue[nActProp++].Value <<= static_cast<const SfxStringItem*>(pItem)->GetValue();
}
- if ( rSet.GetItemState( SID_BLACK_LIST, false, &pItem ) == SfxItemState::SET )
+ if ( rSet.GetItemState( SID_DENY_LIST, false, &pItem ) == SfxItemState::SET )
{
- pValue[nActProp].Name = sBlackList;
+ pValue[nActProp].Name = sDenyList;
css::uno::Sequence< OUString > aList;
static_cast<const SfxStringListItem*>(pItem)->GetStringList( aList );
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index ece8ce6f11fe..a747959699e8 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -846,7 +846,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
sal_Int16 nDialog,
weld::Window* pFrameWeld,
const OUString& sStandardDir,
- const css::uno::Sequence< OUString >& rBlackList
+ const css::uno::Sequence< OUString >& rDenyList
)
:m_nDialogType ( nDialogType )
,meContext ( FileDialogHelper::UNKNOWN_CONTEXT )
@@ -1053,8 +1053,8 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
);
aInitArguments[2] <<= NamedValue(
- "BlackList",
- makeAny( rBlackList )
+ "DenyList",
+ makeAny( rDenyList )
);
@@ -2286,10 +2286,10 @@ FileDialogHelper::FileDialogHelper(
SfxFilterFlags nMust,
SfxFilterFlags nDont,
const OUString& rStandardDir,
- const css::uno::Sequence< OUString >& rBlackList,
+ const css::uno::Sequence< OUString >& rDenyList,
weld::Window* pPreferredParent)
: m_nError(0),
- mpImpl( new FileDialogHelper_Impl( this, nDialogType, nFlags, nDialog, pPreferredParent, rStandardDir, rBlackList ) )
+ mpImpl( new FileDialogHelper_Impl( this, nDialogType, nFlags, nDialog, pPreferredParent, rStandardDir, rDenyList ) )
{
// create the list of filters
mpImpl->addFilters(
@@ -2308,10 +2308,10 @@ FileDialogHelper::FileDialogHelper(
const OUString& aFilterUIName,
const OUString& aExtName,
const OUString& rStandardDir,
- const css::uno::Sequence< OUString >& rBlackList,
+ const css::uno::Sequence< OUString >& rDenyList,
weld::Window* pPreferredParent )
: m_nError(0),
- mpImpl( new FileDialogHelper_Impl( this, nDialogType, nFlags, SFX2_IMPL_DIALOG_CONFIG, pPreferredParent, rStandardDir, rBlackList ) )
+ mpImpl( new FileDialogHelper_Impl( this, nDialogType, nFlags, SFX2_IMPL_DIALOG_CONFIG, pPreferredParent, rStandardDir, rDenyList ) )
{
// the wildcard here is expected in form "*.extension"
OUString aWildcard;
@@ -2624,7 +2624,7 @@ ErrCode FileOpenDialog_Impl( weld::Window* pParent,
const OUString* pPath,
sal_Int16 nDialog,
const OUString& rStandardDir,
- const css::uno::Sequence< OUString >& rBlackList )
+ const css::uno::Sequence< OUString >& rDenyList )
{
ErrCode nRet;
std::unique_ptr<FileDialogHelper> pDialog;
@@ -2632,9 +2632,9 @@ ErrCode FileOpenDialog_Impl( weld::Window* pParent,
// read-only to discourage editing (which would invalidate existing
// signatures).
if (nFlags & FileDialogFlags::SignPDF)
- pDialog.reset(new FileDialogHelper(nDialogType, nFlags, SfxResId(STR_SFX_FILTERNAME_PDF), "pdf", rStandardDir, rBlackList, pParent));
+ pDialog.reset(new FileDialogHelper(nDialogType, nFlags, SfxResId(STR_SFX_FILTERNAME_PDF), "pdf", rStandardDir, rDenyList, pParent));
else
- pDialog.reset(new FileDialogHelper(nDialogType, nFlags, OUString(), nDialog, SfxFilterFlags::NONE, SfxFilterFlags::NONE, rStandardDir, rBlackList, pParent));
+ pDialog.reset(new FileDialogHelper(nDialogType, nFlags, OUString(), nDialog, SfxFilterFlags::NONE, SfxFilterFlags::NONE, rStandardDir, rDenyList, pParent));
OUString aPath;
if ( pPath )
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index c0ddb5545381..4fb74cd14943 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -172,7 +172,7 @@ namespace sfx2
sal_Int16 nDialog,
weld::Window* pFrameWeld,
const OUString& sStandardDir = OUString(),
- const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >()
+ const css::uno::Sequence< OUString >& rDenyList = css::uno::Sequence< OUString >()
);
virtual ~FileDialogHelper_Impl() override;
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 9aacff35b760..c47d18a5710d 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -314,7 +314,7 @@ public:
OUString& aSuggestedDir,
sal_Int16 nDialog,
const OUString& rStandardDir,
- const css::uno::Sequence< OUString >& rBlackList
+ const css::uno::Sequence< OUString >& rDenyList
);
bool ShowDocumentInfoDialog(const std::function< void () >&);
@@ -800,7 +800,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int16 nStoreMode,
OUString& aSuggestedDir,
sal_Int16 nDialog,
const OUString& rStandardDir,
- const css::uno::Sequence< OUString >& rBlackList)
+ const css::uno::Sequence< OUString >& rDenyList)
{
if ( nStoreMode == SAVEASREMOTE_REQUESTED )
nStoreMode = SAVEAS_REQUESTED;
@@ -865,20 +865,20 @@ bool ModelData_Impl::OutputFileDialog( sal_Int16 nStoreMode,
// this is a PDF export
// the filter options has been shown already
const OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( "UIName", OUString() );
- pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, "pdf", rStandardDir, rBlackList, pFrameWin ));
+ pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, "pdf", rStandardDir, rDenyList, pFrameWin ));
pFileDlg->SetCurrentFilter( aFilterUIName );
}
else if ((nStoreMode & EPUBEXPORT_REQUESTED) && !aPreselectedFilterPropsHM.empty())
{
// This is an EPUB export, the filter options has been shown already.
const OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( "UIName", OUString() );
- pFileDlg.reset(new sfx2::FileDialogHelper(aDialogMode, aDialogFlags, aFilterUIName, "epub", rStandardDir, rBlackList, pFrameWin));
+ pFileDlg.reset(new sfx2::FileDialogHelper(aDialogMode, aDialogFlags, aFilterUIName, "epub", rStandardDir, rDenyList, pFrameWin));
pFileDlg->SetCurrentFilter(aFilterUIName);
}
else
{
// This is the normal dialog
- pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aDocServiceName, nDialog, nMust, nDont, rStandardDir, rBlackList, pFrameWin ));
+ pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aDocServiceName, nDialog, nMust, nDont, rStandardDir, rDenyList, pFrameWin ));
}
sfx2::FileDialogHelper::Context eCtxt = sfx2::FileDialogHelper::UNKNOWN_CONTEXT;
@@ -907,7 +907,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int16 nStoreMode,
{
// This is the normal dialog
pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aDocServiceName, nDialog,
- nMust, nDont, rStandardDir, rBlackList, pFrameWin ));
+ nMust, nDont, rStandardDir, rDenyList, pFrameWin ));
pFileDlg->CreateMatcher( aDocServiceName );
}
@@ -1518,17 +1518,17 @@ bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& xMo
if ( aStdDirIter != aModelData.GetMediaDescr().end() )
aStdDirIter->second >>= sStandardDir;
- css::uno::Sequence< OUString > aBlackList;
+ css::uno::Sequence< OUString > aDenyList;
- ::comphelper::SequenceAsHashMap::const_iterator aBlackListIter =
- aModelData.GetMediaDescr().find( OUString("BlackList") );
- if ( aBlackListIter != aModelData.GetMediaDescr().end() )
- aBlackListIter->second >>= aBlackList;
+ ::comphelper::SequenceAsHashMap::const_iterator aDenyListIter =
+ aModelData.GetMediaDescr().find( OUString("DenyList") );
+ if ( aDenyListIter != aModelData.GetMediaDescr().end() )
+ aDenyListIter->second >>= aDenyList;
for (;;)
{
// in case the dialog is opened a second time the folder should be the same as previously navigated to by the user, not what was handed over by initial parameters
- bUseFilterOptions = aModelData.OutputFileDialog( nStoreMode, aFilterProps, bSetStandardName, aSuggestedName, bPreselectPassword, aSuggestedDir, nDialog, sStandardDir, aBlackList );
+ bUseFilterOptions = aModelData.OutputFileDialog( nStoreMode, aFilterProps, bSetStandardName, aSuggestedName, bPreselectPassword, aSuggestedDir, nDialog, sStandardDir, aDenyList );
if ( nStoreMode == SAVEAS_REQUESTED )
{
// in case of saving check filter for possible alien warning
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index a68315e8d3e6..3a788728b847 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -166,10 +166,10 @@ CSysShExec::~CSysShExec()
namespace
{
-bool checkExtension(OUString const & extension, OUString const & blacklist) {
+bool checkExtension(OUString const & extension, OUString const & denylist) {
assert(!extension.isEmpty());
for (sal_Int32 i = 0; i != -1;) {
- OUString tok = blacklist.getToken(0, ';', i);
+ OUString tok = denylist.getToken(0, ';', i);
tok.startsWith(".", &tok);
if (extension.equalsIgnoreAsciiCase(tok)) {
return false;
diff --git a/solenv/clang-format/ClangFormat.pm b/solenv/clang-format/ClangFormat.pm
index 5aba53fd285c..30f3816231bf 100644
--- a/solenv/clang-format/ClangFormat.pm
+++ b/solenv/clang-format/ClangFormat.pm
@@ -9,33 +9,33 @@ package ClangFormat;
use strict;
use warnings;
-our @EXPORT_OK = qw(get_blacklist set_blacklist get_wanted_version get_own_directory get_extension_regex find check_style);
+our @EXPORT_OK = qw(get_excludelist set_excludelist get_wanted_version get_own_directory get_extension_regex find check_style);
-# Reads the blacklist.
-sub get_blacklist()
+# Reads the excludelist.
+sub get_excludelist()
{
my $src = "c|cpp|cxx|h|hxx|inl";
- my %blacklist_names = ();
+ my %excludelist_names = ();
- # Read the blacklist.
- if (open(LINES, "solenv/clang-format/blacklist"))
+ # Read the excludelist.
+ if (open(LINES, "solenv/clang-format/excludelist"))
{
while (my $line = <LINES>)
{
chomp $line;
- $blacklist_names{$line} = 1;
+ $excludelist_names{$line} = 1;
}
}
- return \%blacklist_names;
+ return \%excludelist_names;
}
-# Writes the blacklist.
+# Writes the excludelist.
# The single argument is a reference to an array.
-sub set_blacklist
+sub set_excludelist
{
my @filenames = @{$_[0]};
- open my $fh, ">", "solenv/clang-format/blacklist" or die $!;
+ open my $fh, ">", "solenv/clang-format/excludelist" or die $!;
print $fh "$_\n" for @filenames;
close $fh;
}
diff --git a/solenv/clang-format/README b/solenv/clang-format/README
index 7d6407a35626..fc3a8be91bd6 100644
--- a/solenv/clang-format/README
+++ b/solenv/clang-format/README
@@ -20,7 +20,7 @@ Style enforcing code.
== Directory contents ==
-- blacklist: list of existing files not to be formatted:
+- excludelist: list of existing files not to be formatted:
- if you rename a file mentioned in this list, please update the entry (and
keep the file sorted)
@@ -29,7 +29,7 @@ Style enforcing code.
- ClangFormat.pm: shared code between the git hook and these scripts
-- generate-style-blacklist: was used to generate `blacklist`
+- generate-style-excludelist: was used to generate `excludelist`
- reformat-formatted-files: run this script in case the style config changes or
clang-format version is updated
diff --git a/solenv/clang-format/check-last-commit b/solenv/clang-format/check-last-commit
index 57939815bb0a..0de5ac4b0783 100755
--- a/solenv/clang-format/check-last-commit
+++ b/solenv/clang-format/check-last-commit
@@ -26,7 +26,7 @@ sub check_style()
my $src = ClangFormat::get_extension_regex();
my @good_names = ();
my @bad_names = ();
- my $blacklist_names = ClangFormat::get_blacklist();
+ my $excluded_list_names = ClangFormat::get_excludelist();
my $clang_format = ClangFormat::find();
my $parent = $commit + 1;
@@ -38,7 +38,7 @@ sub check_style()
while (my $filename = <FILES>)
{
chomp $filename;
- if ($filename =~ /\.($src)$/ and !exists($blacklist_names->{$filename}))
+ if ($filename =~ /\.($src)$/ and !exists($excluded_list_names->{$filename}))
{
if (! -x $clang_format)
{
@@ -67,7 +67,7 @@ sub check_style()
print("and the clang-format rules. Tips:\n");
print("\n- You may run '/opt/lo/bin/clang-format -i <problematic file>' to fix up style automatically.\n");
print("- See solenv/clang-format/README on where to get the required version of clang-format binaries.\n");
- print("- If you renamed a blacklisted file, update solenv/clang-format/blacklist accordingly to keep it blacklisted.\n");
+ print("- If you renamed an excluded file, update solenv/clang-format/excludelist accordingly to keep it excluded.\n");
print("\nsolenv/clang-format/check-last-commit: KO\n");
exit(1);
}
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/excludelist
similarity index 100%
rename from solenv/clang-format/blacklist
rename to solenv/clang-format/excludelist
diff --git a/solenv/clang-format/generate-style-blacklist b/solenv/clang-format/generate-style-excludelist
similarity index 86%
rename from solenv/clang-format/generate-style-blacklist
rename to solenv/clang-format/generate-style-excludelist
index 60e7d277c6e7..b34b2041dea2 100755
--- a/solenv/clang-format/generate-style-blacklist
+++ b/solenv/clang-format/generate-style-excludelist
@@ -5,7 +5,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# Generates a blacklist containing all existing cxx/hxx files.
+# Generates an excludelist containing all existing cxx/hxx files.
use strict;
use warnings;
@@ -26,6 +26,6 @@ while (my $filename = <FILES>)
}
}
-ClangFormat::set_blacklist(\@filenames);
+ClangFormat::set_excludelist(\@filenames);
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/clang-format/reformat-formatted-files b/solenv/clang-format/reformat-formatted-files
index 04b0adde8e4e..0302d3f9b244 100755
--- a/solenv/clang-format/reformat-formatted-files
+++ b/solenv/clang-format/reformat-formatted-files
@@ -5,7 +5,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# Reformat files which are not blacklisted. This is interesting if the
+# Reformat files which are not excluded. This is interesting if the
# clang-format version or config changes.
# -n allows just listing the formatted files.
@@ -16,7 +16,7 @@ use ClangFormat;
my $clang_format = ClangFormat::find();
my $src = ClangFormat::get_extension_regex();
-my $blacklist_names = ClangFormat::get_blacklist();
+my $excluded_list_names = ClangFormat::get_excludelist();
my @filenames = ();
my $dry_run = 0;
@@ -25,7 +25,7 @@ open (FILES, "git ls-files |") || die "Cannot run git ls-files.";
while (my $filename = <FILES>)
{
chomp $filename;
- if ($filename =~ /\.($src)$/ and !exists($blacklist_names->{$filename}))
+ if ($filename =~ /\.($src)$/ and !exists($excluded_list_names->{$filename}))
{
push @filenames, $filename;
}
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk
index 7f05392e1179..708de742fffb 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -18,9 +18,9 @@
# --JAVAOBJECTS
# --PYTHONOBJECTS
#
-# Add black listed modules a json files (--BLACKLIST)
+# Add black listed modules a json files (--DENYLIST)
#
-# Reduce number of blacklisted modules
+# Reduce number of denylisted modules
ifneq ($(filter gbuildtojson,$(MAKECMDGOALS)),)
@@ -186,7 +186,7 @@ endef
gb_Module_add_l10n_target =
-gb_GbuildToJson_BLACKLISTEDMODULES := cli_ure jurt external
+gb_GbuildToJson_DENYLISTEDMODULES := cli_ure jurt external
define gb_Module__add_moduledir_impl
include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(notdir $(2)).mk
@@ -196,7 +196,7 @@ gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb
endef
define gb_Module_add_moduledir
-$(if $(filter $(gb_GbuildToJson_BLACKLISTEDMODULES),$(2)),,$(call gb_Module__add_moduledir_impl,$(1),$(2)))
+$(if $(filter $(gb_GbuildToJson_DENYLISTEDMODULES),$(2)),,$(call gb_Module__add_moduledir_impl,$(1),$(2)))
endef
diff --git a/sw/qa/extras/fodfexport/fodfexport.cxx b/sw/qa/extras/fodfexport/fodfexport.cxx
index bdf7c679ea76..9fd8e3c82afc 100644
--- a/sw/qa/extras/fodfexport/fodfexport.cxx
+++ b/sw/qa/extras/fodfexport/fodfexport.cxx
@@ -18,7 +18,7 @@ public:
}
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override
{
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 728ed037a54c..ddf37f102834 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -50,7 +50,7 @@ public:
Test() : SwModelTestBase("/sw/qa/extras/odfexport/data/", "writer8") {}
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override {
// Only test import of .odt document
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 133c2add7822..1112129ae02d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -29,17 +29,17 @@ public:
protected:
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override {
- const char* aBlacklist[] = {
+ const char* aDenylist[] = {
"math-escape.docx",
"math-mso2k7.docx",
};
- std::vector<const char*> vBlacklist(aBlacklist, aBlacklist + SAL_N_ELEMENTS(aBlacklist));
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list