diff options
Diffstat (limited to 'oox/source/export/shapes.cxx')
| -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") |