diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 6 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 1112129ae02d..27a361484e28 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -47,12 +47,12 @@ protected: */ bool mustValidate(const char* filename) const override { - const char* aWhitelist[] = { + const char* aAllowlist[] = { "paragraph-mark-nonempty.odt" }; - std::vector<const char*> vWhitelist(aWhitelist, aWhitelist + SAL_N_ELEMENTS(aWhitelist)); + std::vector<const char*> vAllowlist(aAllowlist, aAllowlist + SAL_N_ELEMENTS(aAllowlist)); - return std::find(vWhitelist.begin(), vWhitelist.end(), filename) != vWhitelist.end(); + return std::find(vAllowlist.begin(), vAllowlist.end(), filename) != vAllowlist.end(); } }; diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index 3ea718c07f6c..1676fa8c09e5 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -55,16 +55,16 @@ protected: */ bool mustValidate(const char* filename) const override { - const char* aWhitelist[] = { + const char* aAllowlist[] = { "page-graphic-background.odt", "zoom.docx", "empty.odt", "fdo38244.docx", "comments-nested.odt" }; - std::vector<const char*> vWhitelist(aWhitelist, aWhitelist + SAL_N_ELEMENTS(aWhitelist)); + std::vector<const char*> vAllowlist(aAllowlist, aAllowlist + SAL_N_ELEMENTS(aAllowlist)); - return std::find(vWhitelist.begin(), vWhitelist.end(), filename) != vWhitelist.end(); + return std::find(vAllowlist.begin(), vAllowlist.end(), filename) != vAllowlist.end(); } }; diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1f4684e3f255..76d067390cf1 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -5986,7 +5986,7 @@ static bool lcl_guessQFormat(const OUString& rName, sal_uInt16 nWwId) nWwId == ww::stiEmphasis ) return true; - static o3tl::sorted_vector<OUString, OUStringIgnoreCase> const aWhitelist + static o3tl::sorted_vector<OUString, OUStringIgnoreCase> const aAllowlist { "No Spacing", "List Paragraph", @@ -6000,7 +6000,7 @@ static bool lcl_guessQFormat(const OUString& rName, sal_uInt16 nWwId) "TOC Heading", }; // Not custom style? Then we have a list of standard styles which should be qFormat. - return aWhitelist.find(rName) != aWhitelist.end(); + return aAllowlist.find(rName) != aAllowlist.end(); } void DocxAttributeOutput::StartStyle( const OUString& rName, StyleType eType, |