From 83d2c5180d255532b7cdf5d2922fee1cf056eef3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 16 Dec 2016 17:14:07 +0100 Subject: Adapt to no-longer explicit OUStringLiteral ctor ...from previous commit Change-Id: I062b7cd212c17e7eb5274476e6859228d0477c7f Reviewed-on: https://gerrit.libreoffice.org/32098 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann --- xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx | 12 ++++++------ xmlsecurity/source/helper/ooxmlsecexporter.cxx | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx index 51fc15ebc407..507b3e5ea09e 100644 --- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx +++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx @@ -369,9 +369,9 @@ void PDFSigningTest::testGood() const std::initializer_list aNames = { // We failed to determine if this is good or bad. - OUStringLiteral("good-non-detached.pdf"), + "good-non-detached.pdf", // Boolean value for dictionary key caused read error. - OUStringLiteral("dict-bool.pdf"), + "dict-bool.pdf", }; for (const auto& rName : aNames) @@ -388,13 +388,13 @@ void PDFSigningTest::testTokenize() const std::initializer_list aNames = { // We looped on this broken input. - OUStringLiteral("no-eof.pdf"), + "no-eof.pdf", // ']' in a name token was mishandled. - OUStringLiteral("name-bracket.pdf"), + "name-bracket.pdf", // %%EOF at the end wasn't followed by a newline. - OUStringLiteral("noeol.pdf"), + "noeol.pdf", // File that's intentionally smaller than 1024 bytes. - OUStringLiteral("small.pdf"), + "small.pdf", }; for (const auto& rName : aNames) diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx b/xmlsecurity/source/helper/ooxmlsecexporter.cxx index df35dee8dc27..9a9b9872640f 100644 --- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx +++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx @@ -75,11 +75,11 @@ bool OOXMLSecExporter::Impl::isOOXMLBlacklist(const OUString& rStreamName) { static const std::initializer_list vBlacklist = { - OUStringLiteral("/%5BContent_Types%5D.xml"), - OUStringLiteral("/docProps/app.xml"), - OUStringLiteral("/docProps/core.xml"), + "/%5BContent_Types%5D.xml", + "/docProps/app.xml", + "/docProps/core.xml", // Don't attempt to sign other signatures for now. - OUStringLiteral("/_xmlsignatures") + "/_xmlsignatures" }; // Just check the prefix, as we don't care about the content type part of the stream name. return std::find_if(vBlacklist.begin(), vBlacklist.end(), [&](const OUStringLiteral& rLiteral) @@ -92,9 +92,9 @@ bool OOXMLSecExporter::Impl::isOOXMLRelationBlacklist(const OUString& rRelationN { static const std::initializer_list vBlacklist = { - OUStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties"), - OUStringLiteral("http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties"), - OUStringLiteral("http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin") + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties", + "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties", + "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin" }; return std::find(vBlacklist.begin(), vBlacklist.end(), rRelationName) != vBlacklist.end(); } -- cgit