summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2020-07-06 03:01:51 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2020-07-10 01:34:54 +0200
commit493ae7a6bb0c3ad50615db0090e7ae8d391bc327 (patch)
tree9f60f522f1ff9dde6a8131d155654f4d47b37fd0 /sw/qa
parent005f5db47b8e1bbd7ebddee92009be072e835fd5 (diff)
replace usage of blacklist with denylist
.. and a few cases of instead doing blacklist->excludelist where that made more sense. Background and motivation: https://tools.ietf.org/html/draft-knodel-terminology-02 [API CHANGE] officecfg::Office::Canvas::DeviceBlacklist -> DeviceDenylist [API CHANGE] officecfg::Office::Canvas::BlacklistCurrentDevice -> DenylistCurrentDevice [API CHANGE] officecfg::Office::Common::Misc::OpenCLBlackList -> OpenCLDenyList Change-Id: Ia35e25496bf0cc0692d5de4cb66bfc232d3a869e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98180 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sw/qa')
-rw-r--r--sw/qa/extras/fodfexport/fodfexport.cxx2
-rw-r--r--sw/qa/extras/odfexport/odfexport.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport.cxx8
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport10.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport11.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport12.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport13.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport14.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport15.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport2.cxx8
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport3.cxx8
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport4.cxx8
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport5.cxx8
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport6.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport7.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport8.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport9.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmllinks.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlw14export.cxx2
-rw-r--r--sw/qa/extras/rtfexport/rtfexport.cxx6
-rw-r--r--sw/qa/extras/rtfexport/rtfexport5.cxx2
-rw-r--r--sw/qa/extras/ww8export/ww8export.cxx6
23 files changed, 42 insertions, 42 deletions
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));
+ std::vector<const char*> vDenylist(aDenylist, aDenylist + SAL_N_ELEMENTS(aDenylist));
// If the testcase is stored in some other format, it's pointless to test.
- return (OString(filename).endsWith(".docx") && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
+ return (OString(filename).endsWith(".docx") && std::find(vDenylist.begin(), vDenylist.end(), filename) == vDenylist.end());
}
/**
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index ebb3d8cf4e2b..4c2027a8b6c7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -74,7 +74,7 @@ public:
protected:
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override {
// If the testcase is stored in some other format, it's pointless to test.
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 1be122da3e66..096e23d3fa3f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -28,7 +28,7 @@ public:
protected:
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override {
// If the testcase is stored in some other format, it's pointless to test.
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index 15ae1de673ce..340aff5aa055 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -27,7 +27,7 @@ public:
protected:
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override
{
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 430749768862..e59c3ded1524 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -32,7 +32,7 @@ public:
protected:
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override {
// If the testcase is stored in some other format, it's pointless to test.
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index f2e09af96bfa..2559e09cc1d6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -36,7 +36,7 @@ public:
protected:
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override {
// If the testcase is stored in some other format, it's pointless to test.
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 240447bf35c0..9c1fb2c02edf 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -20,7 +20,7 @@ public:
protected:
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override {
// If the testcase is stored in some other format, it's pointless to test.
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index fa75e2d6af85..3ea718c07f6c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -37,17 +37,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));
+ std::vector<const char*> vDenylist(aDenylist, aDenylist + SAL_N_ELEMENTS(aDenylist));
// If the testcase is stored in some other format, it's pointless to test.
- return (OString(filename).endsWith(".docx") && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
+ return (OString(filename).endsWith(".docx") && std::find(vDenylist.begin(), vDenylist.end(), filename) == vDenylist.end());
}
/**
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index ea7a3643954b..c32928cccdf2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -31,17 +31,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));
+ std::vector<const char*> vDenylist(aDenylist, aDenylist + SAL_N_ELEMENTS(aDenylist));
// If the testcase is stored in some other format, it's pointless to test.
- return (OString(filename).endsWith(".docx") && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
+ return (OString(filename).endsWith(".docx") && std::find(vDenylist.begin(), vDenylist.end(), filename) == vDenylist.end());
}
};
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index e89522670483..2687707bb5e8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -34,17 +34,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));
+ std::vector<const char*> vDenylist(aDenylist, aDenylist + SAL_N_ELEMENTS(aDenylist));
// If the testcase is stored in some other format, it's pointless to test.
- return (OString(filename).endsWith(".docx") && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
+ return (OString(filename).endsWith(".docx") && std::find(vDenylist.begin(), vDenylist.end(), filename) == vDenylist.end());
}
void verifyComboBoxExport(bool aComboBoxAsDropDown);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 092a17646002..480e9c700c08 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -31,17 +31,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));
+ std::vector<const char*> vDenylist(aDenylist, aDenylist + SAL_N_ELEMENTS(aDenylist));
// If the testcase is stored in some other format, it's pointless to test.
- return (OString(filename).endsWith(".docx") && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
+ return (OString(filename).endsWith(".docx") && std::find(vDenylist.begin(), vDenylist.end(), filename) == vDenylist.end());
}
};
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index 123a339c6232..efbef3e23acb 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -34,7 +34,7 @@ public:
protected:
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override {
// If the testcase is stored in some other format, it's pointless to test.
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index a3d8f8b7c51e..74e822f2bb27 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -26,7 +26,7 @@ public:
protected:
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override {
// If the testcase is stored in some other format, it's pointless to test.
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 5f401b266bfc..d94a2e5236c6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -71,7 +71,7 @@ public:
protected:
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override {
// If the testcase is stored in some other format, it's pointless to test.
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 07b6ebb8b69d..6e1d88b91489 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -45,7 +45,7 @@ public:
protected:
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override {
// If the testcase is stored in some other format, it's pointless to test.
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index df4ac56ec5b1..db10f3043510 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -19,7 +19,7 @@ public:
protected:
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override {
// If the testcase is stored in some other format, it's pointless to test.
diff --git a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
index 8be5c38a92f7..9f94f57b92e6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
@@ -118,7 +118,7 @@ public:
protected:
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override
{
diff --git a/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx b/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx
index 5c2d43698299..d7701586b167 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlw14export.cxx
@@ -16,7 +16,7 @@ public:
protected:
/**
- * Blacklist handling
+ * Denylist handling
*/
bool mustTestImportOf(const char* filename) const override {
// If the testcase is stored in some other format, it's pointless to test.
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx
index 7bae2b0eab9f..f472a7ac446f 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -43,16 +43,16 @@ public:
bool mustTestImportOf(const char* filename) const override
{
// Don't test the first import of these, for some reason those tests fail
- const char* aBlacklist[] = {
+ const char* aDenylist[] = {
"math-eqarray.rtf", "math-escaping.rtf", "math-lim.rtf",
"math-mso2007.rtf", "math-nary.rtf", "math-rad.rtf",
"math-vertical-stacks.rtf", "math-runs.rtf",
};
- std::vector<const char*> vBlacklist(aBlacklist, aBlacklist + SAL_N_ELEMENTS(aBlacklist));
+ std::vector<const char*> vDenylist(aDenylist, aDenylist + SAL_N_ELEMENTS(aDenylist));
// If the testcase is stored in some other format, it's pointless to test.
return (OString(filename).endsWith(".rtf")
- && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
+ && std::find(vDenylist.begin(), vDenylist.end(), filename) == vDenylist.end());
}
virtual void postLoad(const char* pFilename) override
diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx b/sw/qa/extras/rtfexport/rtfexport5.cxx
index 23f83a17149b..ab6bf31bf3ce 100644
--- a/sw/qa/extras/rtfexport/rtfexport5.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport5.cxx
@@ -61,7 +61,7 @@ public:
}
protected:
- /// Blacklist handling.
+ /// Denylist handling.
bool mustTestImportOf(const char* filename) const override
{
// If the testcase is stored in some other format, it's pointless to
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index fb27544c7622..19126fdcca0c 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -67,7 +67,7 @@ public:
*/
bool mustValidate(const char* filename) const override
{
- const std::vector<const char*> aBlacklist =
+ const std::vector<const char*> aDenylist =
{
// the following doc exports currently don't pass binary validation
"tdf56321_flipImage_both.doc",
@@ -91,8 +91,8 @@ public:
"first-header-footer.doc"
};
- // Don't bother with non-.doc files; weed out blacklisted .doc files
- return (OString(filename).endsWith(".doc") && std::find(aBlacklist.begin(), aBlacklist.end(), filename) == aBlacklist.end());
+ // Don't bother with non-.doc files; weed out denylisted .doc files
+ return (OString(filename).endsWith(".doc") && std::find(aDenylist.begin(), aDenylist.end(), filename) == aDenylist.end());
}
protected: