diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-12-15 08:54:08 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-12-15 11:24:53 +0000 |
| commit | 721116c7ade10d76e3ed6832e3988c91427ba431 (patch) | |
| tree | 5355413a5924885b33bb28b200d20643dee62655 /xmlsecurity | |
| parent | ef4b9032de55e6b1b182e4ead1bbe6e590df296e (diff) | |
Phase out support for HAVE_BROKEN_STATIC_INITIALIZER_LIST
...I'm pondering a change that would make that a hard requirement, and from the
comment in configure.ac it looks like only old Clang < 3.4 were affected.
Change-Id: I8ef64f759fed1a45d88f94d0e8a60839ad10b263
Reviewed-on: https://gerrit.libreoffice.org/32029
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/helper/ooxmlsecexporter.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx b/xmlsecurity/source/helper/ooxmlsecexporter.cxx index 34843a5cdae0..df35dee8dc27 100644 --- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx +++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx @@ -73,10 +73,7 @@ struct OOXMLSecExporter::Impl bool OOXMLSecExporter::Impl::isOOXMLBlacklist(const OUString& rStreamName) { -#if !HAVE_BROKEN_STATIC_INITIALIZER_LIST - static -#endif - const std::initializer_list<OUStringLiteral> vBlacklist = + static const std::initializer_list<OUStringLiteral> vBlacklist = { OUStringLiteral("/%5BContent_Types%5D.xml"), OUStringLiteral("/docProps/app.xml"), @@ -93,10 +90,7 @@ bool OOXMLSecExporter::Impl::isOOXMLBlacklist(const OUString& rStreamName) bool OOXMLSecExporter::Impl::isOOXMLRelationBlacklist(const OUString& rRelationName) { -#if !HAVE_BROKEN_STATIC_INITIALIZER_LIST - static -#endif - const std::initializer_list<OUStringLiteral> vBlacklist = + 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"), |