From 721116c7ade10d76e3ed6832e3988c91427ba431 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 15 Dec 2016 08:54:08 +0100 Subject: 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 Tested-by: Stephan Bergmann --- xmlsecurity/source/helper/ooxmlsecexporter.cxx | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'xmlsecurity') 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 vBlacklist = + static const std::initializer_list 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 vBlacklist = + 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"), -- cgit