From 4c363dd65a18e9b8d4dcd1b0aaf545a40c3dbec5 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 31 Mar 2016 15:47:54 +0200 Subject: Typo in HAVE_BROKEN_STATIC_INITILIZER_LIST Change-Id: Ia29868d1832b529d438a5a5448b751683c226846 --- config_host/config_global.h.in | 2 +- configure.ac | 2 +- oox/source/export/shapes.cxx | 4 ++-- xmlsecurity/source/helper/ooxmlsecexporter.cxx | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in index c7c5987cd19d..dd959a9fd170 100644 --- a/config_host/config_global.h.in +++ b/config_host/config_global.h.in @@ -22,7 +22,7 @@ Any change in this header will cause a rebuild of almost everything. #define HAVE_GCC_DEPRECATED_MESSAGE 0 #define HAVE_THREADSAFE_STATICS 0 #define HAVE_BROKEN_CONST_ITERATORS 0 -#define HAVE_BROKEN_STATIC_INITILIZER_LIST 0 +#define HAVE_BROKEN_STATIC_INITIALIZER_LIST 0 #define HAVE_SYSLOG_H 0 /* Compiler supports __attribute__((warn_unused)). */ #define HAVE_GCC_ATTRIBUTE_WARN_UNUSED 0 diff --git a/configure.ac b/configure.ac index 9b88fd480e9c..7ee051c8b766 100644 --- a/configure.ac +++ b/configure.ac @@ -12692,7 +12692,7 @@ LIBS=$save_LIBS CXXFLAGS=$save_CXXFLAGS AC_MSG_RESULT([$broken]) if test "$broken" = yes; then - AC_DEFINE([HAVE_BROKEN_STATIC_INITILIZER_LIST]) + AC_DEFINE([HAVE_BROKEN_STATIC_INITIALIZER_LIST]) fi diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index f7e84db57784..f8339025d11f 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -535,7 +535,7 @@ ShapeExport& ShapeExport::WriteGroupShape(uno::Reference xShape static bool lcl_IsOnBlacklist(OUString& rShapeType) { -#if !HAVE_BROKEN_STATIC_INITILIZER_LIST +#if !HAVE_BROKEN_STATIC_INITIALIZER_LIST static #endif const std::initializer_list vBlacklist = { @@ -601,7 +601,7 @@ static bool lcl_IsOnBlacklist(OUString& rShapeType) static bool lcl_IsOnWhitelist(OUString& rShapeType) { -#if !HAVE_BROKEN_STATIC_INITILIZER_LIST +#if !HAVE_BROKEN_STATIC_INITIALIZER_LIST static #endif const std::initializer_list vWhitelist = { diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx b/xmlsecurity/source/helper/ooxmlsecexporter.cxx index d88d542ce4fa..590d33ead7aa 100644 --- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx +++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx @@ -74,7 +74,7 @@ struct OOXMLSecExporter::Impl bool OOXMLSecExporter::Impl::isOOXMLBlacklist(const OUString& rStreamName) { -#if !HAVE_BROKEN_STATIC_INITILIZER_LIST +#if !HAVE_BROKEN_STATIC_INITIALIZER_LIST static #endif const std::initializer_list vBlacklist = @@ -94,7 +94,7 @@ bool OOXMLSecExporter::Impl::isOOXMLBlacklist(const OUString& rStreamName) bool OOXMLSecExporter::Impl::isOOXMLRelationBlacklist(const OUString& rRelationName) { -#if !HAVE_BROKEN_STATIC_INITILIZER_LIST +#if !HAVE_BROKEN_STATIC_INITIALIZER_LIST static #endif const std::initializer_list vBlacklist = -- cgit