diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-12-16 17:14:07 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-12-17 16:12:02 +0000 |
| commit | 83d2c5180d255532b7cdf5d2922fee1cf056eef3 (patch) | |
| tree | 7a58db4a6723008afe96e17185a69aa17a864e1f /xmlsecurity/source | |
| parent | 87707670c993794ab12b0fad0f048f11429269c2 (diff) | |
Adapt to no-longer explicit OUStringLiteral ctor
...from previous commit
Change-Id: I062b7cd212c17e7eb5274476e6859228d0477c7f
Reviewed-on: https://gerrit.libreoffice.org/32098
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmlsecurity/source')
| -rw-r--r-- | xmlsecurity/source/helper/ooxmlsecexporter.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
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<OUStringLiteral> 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<OUStringLiteral> 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(); } |