HAVE_CPP_INLINE_VARIABLES is always true now

...but for safety, leave the configure.ac check in for some longer.

Also remove now-redundant SAL_INLINE_VARIABLE again (which was
LIBO_INTERNAL_ONLY).

Change-Id: Id049e0cb84b4f97f5859f1b16b867b39b448dec0
Reviewed-on: https://gerrit.libreoffice.org/64772
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

6 files changed, 0 insertions, 64 deletions

diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index 86a03ec34a29..10f62e9aa81d 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -49,10 +49,6 @@ private:
     Property m_aColorProp;
 };
 
-#if !HAVE_CPP_INLINE_VARIABLES
-constexpr OUStringLiteral lcl_ColorPropertySetInfo::g_aColorPropName;
-#endif
-
 lcl_ColorPropertySetInfo::lcl_ColorPropertySetInfo() :
         m_aColorProp( g_aColorPropName, -1,
                       cppu::UnoType<sal_Int32>::get(), 0)
@@ -83,10 +79,6 @@ namespace xmloff
 namespace chart
 {
 
-#if !HAVE_CPP_INLINE_VARIABLES
-constexpr OUStringLiteral ColorPropertySet::g_aColorPropName;
-#endif
-
 ColorPropertySet::ColorPropertySet( sal_Int32 nColor ) :
         m_nColor( nColor ),
         m_nDefaultColor( 0x0099ccff )  // blue 8
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 7c8aa03b302b..f4185d8692b9 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -271,10 +271,6 @@ public:
     OUString maCategoriesRange;
 };
 
-#if !HAVE_CPP_INLINE_VARIABLES
-constexpr OUStringLiteral SchXMLExportHelper_Impl::gsTableName;
-#endif
-
 namespace
 {
 
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index 7098cc12eea9..362616038479 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -241,21 +241,6 @@ public:
     static constexpr OUStringLiteral gsAnimPath = "AnimationPath";
 };
 
-#if !HAVE_CPP_INLINE_VARIABLES
-constexpr OUStringLiteral AnimExpImpl::gsDimColor;
-constexpr OUStringLiteral AnimExpImpl::gsDimHide;
-constexpr OUStringLiteral AnimExpImpl::gsDimPrev;
-constexpr OUStringLiteral AnimExpImpl::gsEffect;
-constexpr OUStringLiteral AnimExpImpl::gsPlayFull;
-constexpr OUStringLiteral AnimExpImpl::gsPresOrder;
-constexpr OUStringLiteral AnimExpImpl::gsSound;
-constexpr OUStringLiteral AnimExpImpl::gsSoundOn;
-constexpr OUStringLiteral AnimExpImpl::gsSpeed;
-constexpr OUStringLiteral AnimExpImpl::gsTextEffect;
-constexpr OUStringLiteral AnimExpImpl::gsIsAnimation;
-constexpr OUStringLiteral AnimExpImpl::gsAnimPath;
-#endif
-
 XMLAnimationsExporter::XMLAnimationsExporter( XMLShapeExport* pShapeExp )
     : mpImpl( new AnimExpImpl )
 {
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index c92c832ee3d5..19deda30a463 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -335,21 +335,6 @@ public:
     static constexpr OUStringLiteral gsIsAnimation = "IsAnimation";
 };
 
-#if !HAVE_CPP_INLINE_VARIABLES
-constexpr OUStringLiteral AnimImpImpl::gsDimColor;
-constexpr OUStringLiteral AnimImpImpl::gsDimHide;
-constexpr OUStringLiteral AnimImpImpl::gsDimPrev;
-constexpr OUStringLiteral AnimImpImpl::gsEffect;
-constexpr OUStringLiteral AnimImpImpl::gsPlayFull;
-constexpr OUStringLiteral AnimImpImpl::gsSound;
-constexpr OUStringLiteral AnimImpImpl::gsSoundOn;
-constexpr OUStringLiteral AnimImpImpl::gsSpeed;
-constexpr OUStringLiteral AnimImpImpl::gsTextEffect;
-constexpr OUStringLiteral AnimImpImpl::gsPresShapeService;
-constexpr OUStringLiteral AnimImpImpl::gsAnimPath;
-constexpr OUStringLiteral AnimImpImpl::gsIsAnimation;
-#endif
-
 enum XMLActionKind
 {
     XMLE_SHOW,
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 2df993feccac..9a68a31634fd 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -288,11 +288,6 @@ SERVICE( XMLDrawMetaImportOasis, "com.sun.star.comp.Draw.XMLOasisMetaImporter",
 SERVICE( XMLImpressSettingsImportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", false, SvXMLImportFlags::SETTINGS )
 SERVICE( XMLDrawSettingsImportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", true, SvXMLImportFlags::SETTINGS )
 
-#if !HAVE_CPP_INLINE_VARIABLES
-constexpr OUStringLiteral SdXMLImport::gsPageLayouts;
-constexpr OUStringLiteral SdXMLImport::gsPreview;
-#endif
-
 SdXMLImport::SdXMLImport(
     const css::uno::Reference< css::uno::XComponentContext >& xContext,
     OUString const & implementationName,
diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx
index a236b7e4dfcb..c0846dd2a71d 100644
--- a/xmloff/source/text/XMLIndexMarkExport.cxx
+++ b/xmloff/source/text/XMLIndexMarkExport.cxx
@@ -37,23 +37,6 @@ using ::com::sun::star::beans::XPropertySetInfo;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
 
-
-#if !HAVE_CPP_INLINE_VARIABLES
-constexpr OUStringLiteral XMLIndexMarkExport::gsLevel;
-constexpr OUStringLiteral XMLIndexMarkExport::gsUserIndexName;
-constexpr OUStringLiteral XMLIndexMarkExport::gsPrimaryKey;
-constexpr OUStringLiteral XMLIndexMarkExport::gsSecondaryKey;
-constexpr OUStringLiteral XMLIndexMarkExport::gsDocumentIndexMark;
-constexpr OUStringLiteral XMLIndexMarkExport::gsIsStart;
-constexpr OUStringLiteral XMLIndexMarkExport::gsIsCollapsed;
-constexpr OUStringLiteral XMLIndexMarkExport::gsAlternativeText;
-constexpr OUStringLiteral XMLIndexMarkExport::gsTextReading;
-constexpr OUStringLiteral XMLIndexMarkExport::gsPrimaryKeyReading;
-constexpr OUStringLiteral XMLIndexMarkExport::gsSecondaryKeyReading;
-constexpr OUStringLiteral XMLIndexMarkExport::gsMainEntry;
-#endif
-
-
 XMLIndexMarkExport::XMLIndexMarkExport(
     SvXMLExport& rExp)
 :   rExport(rExp)