diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-08-31 16:13:18 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-08-31 20:14:40 +0200 |
| commit | d9998186d37c58751f45dd7cb97d6c72f901a346 (patch) | |
| tree | 01e31bd159062beaecc62edfc01b77220f87d7a1 /sw/source | |
| parent | b5f081e1ac14f60497f62a27be86b07b0baa42f7 (diff) | |
GCC only supports inline variables since GCC 7
(see also discussion at <https://gerrit.libreoffice.org/#/c/59204/11> "new
loplugin:conststringfield" about its changes to registry/source/regimpl.cxx)
Change-Id: Id2743adbfeb4d7c42105a65ba8400d7051da2f03
Reviewed-on: https://gerrit.libreoffice.org/59873
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/html/svxcss1.cxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmltbli.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 676792e75069..f153c4999b82 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -20,6 +20,7 @@ #include <memory> #include <stdlib.h> +#include <config_global.h> #include <svx/svxids.hrc> #include <i18nlangtag/languagetag.hxx> #include <svtools/ctrltool.hxx> @@ -357,7 +358,7 @@ void SvxCSS1BorderInfo::SetBorderLine( SvxBoxItemLine nLine, SvxBoxItem &rBoxIte rBoxItem.SetLine( &aBorderLine, nLine ); } -#if __cplusplus <= 201402 +#if !HAVE_CPP_INLINE_VARIABLES constexpr sal_uInt16 SvxCSS1PropertyInfo::UNSET_BORDER_DISTANCE; #endif diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 851cee176955..22e2c35b9a22 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/table/XCellRange.hpp> +#include <config_global.h> #include <o3tl/numeric.hxx> #include <o3tl/make_unique.hxx> #include <o3tl/safeint.hxx> @@ -1226,7 +1227,7 @@ public: } }; -#if __cplusplus <= 201402 || (defined __GNUC__ && __GNUC__ <= 6 && !defined __clang__) +#if !HAVE_CPP_INLINE_VARIABLES constexpr sal_Int32 SwXMLTableContext::MAX_WIDTH; #endif |