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 /oox | |
| 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 'oox')
| -rw-r--r-- | oox/source/export/shapes.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 6e6fc5e0bfbd..cd139b8496b5 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -532,10 +532,7 @@ ShapeExport& ShapeExport::WriteGroupShape(const uno::Reference<drawing::XShape>& static bool lcl_IsOnBlacklist(OUString& rShapeType) { -#if !HAVE_BROKEN_STATIC_INITIALIZER_LIST - static -#endif - const std::initializer_list<OUStringLiteral> vBlacklist = { + static const std::initializer_list<OUStringLiteral> vBlacklist = { OUStringLiteral("block-arc"), OUStringLiteral("rectangle"), OUStringLiteral("ellipse"), @@ -601,10 +598,7 @@ static bool lcl_IsOnBlacklist(OUString& rShapeType) static bool lcl_IsOnWhitelist(OUString& rShapeType) { -#if !HAVE_BROKEN_STATIC_INITIALIZER_LIST - static -#endif - const std::initializer_list<OUStringLiteral> vWhitelist = { + static const std::initializer_list<OUStringLiteral> vWhitelist = { OUStringLiteral("forbidden"), OUStringLiteral("heart"), OUStringLiteral("puzzle") |