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>

17 files changed, 121 insertions, 241 deletions

diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
index a84f2bedec5a..a182c4d346c0 100644
--- a/config_host/config_global.h.in
+++ b/config_host/config_global.h.in
@@ -27,9 +27,6 @@ Any change in this header will cause a rebuild of almost everything.
 /* Guaranteed copy elision (C++17), __cpp_guaranteed_copy_elision (C++2a): */
 #define HAVE_CPP_GUARANTEED_COPY_ELISION 0
 
-/* Inline variables (C++17), __cpp_inline_variables (C++2a): */
-#define HAVE_CPP_INLINE_VARIABLES 0
-
 /* Fix for <http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1579> "Return by converting
    move constructor": */
 #define HAVE_CXX_CWG1579_FIX 0
diff --git a/configure.ac b/configure.ac
index 0055641ae95f..b7b3b03b90cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12474,7 +12474,8 @@ if test "$build_os" = "cygwin"; then
     AC_SUBST(ILIB)
 fi
 
-AC_MSG_CHECKING([whether $CXX supports inline variables])
+dnl This check can eventually be removed completely (e.g., after libreoffice-6-3 branch off):
+AC_MSG_CHECKING([that $CXX supports inline variables])
 AC_LANG_PUSH([C++])
 save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
@@ -12490,10 +12491,8 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
         struct T { static constexpr S s{}; };
         S const * f() { return &T::s; }
         #endif
-    ]])], [
-        AC_DEFINE([HAVE_CPP_INLINE_VARIABLES],[1])
-        AC_MSG_RESULT([yes])
-    ], [AC_MSG_RESULT([no])])
+    ]])],
+    AC_MSG_RESULT([yes]), AC_MSG_ERROR([$CXX lacks required inline variable support]))
 CXXFLAGS=$save_CXXFLAGS
 if test "$build_os" = cygwin; then
     LIB=$save_LIB
diff --git a/include/sal/types.h b/include/sal/types.h
index 6e20a854861f..c4e472cc4210 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -677,20 +677,6 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) {
 #endif
 /// @endcond
 
-/// @cond INTERNAL
-/** Inline variables, where supported.
-
-    @since LibreOffice 6.2
-*/
-#if defined LIBO_INTERNAL_ONLY
-#if HAVE_CPP_INLINE_VARIABLES
-#define SAL_INLINE_VARIABLE inline
-#else
-#define SAL_INLINE_VARIABLE
-#endif
-#endif
-/// @endcond
-
 #endif // INCLUDED_SAL_TYPES_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index a7647b9d512f..9f01788b0f4b 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -41,7 +41,6 @@
 #include "reflcnst.hxx"
 #include "keyimpl.hxx"
 
-#include <config_global.h>
 #include <osl/thread.h>
 #include <rtl/alloc.h>
 #include <rtl/ustring.hxx>
@@ -421,10 +420,6 @@ void dumpType(typereg::Reader const & reader, OString const & indent) {
 
 }
 
-#if !HAVE_CPP_INLINE_VARIABLES
-constexpr OUStringLiteral ORegistry::ROOT;
-#endif
-
 ORegistry::ORegistry()
     : m_refCount(1)
     , m_readOnly(false)
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index f8e2b4acd7c2..418771a94d0f 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -192,11 +192,6 @@ struct ScShapeDataLess
     }
 };
 
-#if !HAVE_CPP_INLINE_VARIABLES
-constexpr OUStringLiteral ScShapeDataLess::gsLayerId;
-constexpr OUStringLiteral ScShapeDataLess::gsZOrder;
-#endif
-
 struct DeselectShape
 {
     void operator() (const ScAccessibleShapeData* pAccShapeData) const
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 1e190e4f592d..d6855d2cf1c8 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -25,136 +25,136 @@
 #include <sal/types.h>
 
 // SdUnoPseudoStyleFamily
-SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Title[] = "title";
-SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_SubTitle[] = "subtitle";
-SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Background[] = "background";
-SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Background_Objects[] = "backgroundobjects";
-SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Notes[] = "notes";
-SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline1[] = "outline1";
-SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline2[] = "outline2";
-SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline3[] = "outline3";
-SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline4[] = "outline4";
-SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline5[] = "outline5";
-SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline6[] = "outline6";
-SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline7[] = "outline7";
-SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline8[] = "outline8";
-SAL_INLINE_VARIABLE const char sUNO_PseudoSheet_Outline9[] = "outline9";
+inline const char sUNO_PseudoSheet_Title[] = "title";
+inline const char sUNO_PseudoSheet_SubTitle[] = "subtitle";
+inline const char sUNO_PseudoSheet_Background[] = "background";
+inline const char sUNO_PseudoSheet_Background_Objects[] = "backgroundobjects";
+inline const char sUNO_PseudoSheet_Notes[] = "notes";
+inline const char sUNO_PseudoSheet_Outline1[] = "outline1";
+inline const char sUNO_PseudoSheet_Outline2[] = "outline2";
+inline const char sUNO_PseudoSheet_Outline3[] = "outline3";
+inline const char sUNO_PseudoSheet_Outline4[] = "outline4";
+inline const char sUNO_PseudoSheet_Outline5[] = "outline5";
+inline const char sUNO_PseudoSheet_Outline6[] = "outline6";
+inline const char sUNO_PseudoSheet_Outline7[] = "outline7";
+inline const char sUNO_PseudoSheet_Outline8[] = "outline8";
+inline const char sUNO_PseudoSheet_Outline9[] = "outline9";
 
 // SdLayer
-SAL_INLINE_VARIABLE const char sUNO_LayerName_background[] = "background";
-SAL_INLINE_VARIABLE const char sUNO_LayerName_background_objects[] = "backgroundobjects";
-SAL_INLINE_VARIABLE const char sUNO_LayerName_layout[] = "layout";
-SAL_INLINE_VARIABLE const char sUNO_LayerName_controls[] = "controls";
-SAL_INLINE_VARIABLE const char sUNO_LayerName_measurelines[] = "measurelines";
+inline const char sUNO_LayerName_background[] = "background";
+inline const char sUNO_LayerName_background_objects[] = "backgroundobjects";
+inline const char sUNO_LayerName_layout[] = "layout";
+inline const char sUNO_LayerName_controls[] = "controls";
+inline const char sUNO_LayerName_measurelines[] = "measurelines";
 
 // SdXShape
-SAL_INLINE_VARIABLE const char sUNO_shape_style[] = "Style";
-SAL_INLINE_VARIABLE const char sUNO_shape_layername[] = "LayerName";
-SAL_INLINE_VARIABLE const char sUNO_shape_zorder[] = "ZOrder";
+inline const char sUNO_shape_style[] = "Style";
+inline const char sUNO_shape_layername[] = "LayerName";
+inline const char sUNO_shape_zorder[] = "ZOrder";
 
 // services
-SAL_INLINE_VARIABLE const char sUNO_Service_StyleFamily[] = "com.sun.star.style.StyleFamily";
-SAL_INLINE_VARIABLE const char sUNO_Service_StyleFamilies[] = "com.sun.star.style.StyleFamilies";
-SAL_INLINE_VARIABLE const char sUNO_Service_Style[] = "com.sun.star.style.Style";
-SAL_INLINE_VARIABLE const char sUNO_Service_FillProperties[] = "com.sun.star.drawing.FillProperties";
-SAL_INLINE_VARIABLE const char sUNO_Service_LineProperties[] = "com.sun.star.drawing.LineProperties";
-SAL_INLINE_VARIABLE const char sUNO_Service_ParagraphProperties[] = "com.sun.star.style.ParagraphProperties";
-SAL_INLINE_VARIABLE const char sUNO_Service_CharacterProperties[] = "com.sun.star.style.CharacterProperties";
-SAL_INLINE_VARIABLE const char sUNO_Service_Text[] = "com.sun.star.drawing.Text";
-SAL_INLINE_VARIABLE const char sUNO_Service_TextProperties[] = "com.sun.star.drawing.TextProperties";
-SAL_INLINE_VARIABLE const char sUNO_Service_ShadowProperties[] = "com.sun.star.drawing.ShadowProperties";
-SAL_INLINE_VARIABLE const char sUNO_Service_ConnectorProperties[] = "com.sun.star.drawing.ConnectorProperties";
-SAL_INLINE_VARIABLE const char sUNO_Service_MeasureProperties[] = "com.sun.star.drawing.MeasureProperties";
-SAL_INLINE_VARIABLE const char sUNO_Service_PageBackground[] = "com.sun.star.drawing.PageBackground";
-SAL_INLINE_VARIABLE const char sUNO_Service_GraphicObjectShape[] = "com.sun.star.drawing.GraphicObjectShape";
-SAL_INLINE_VARIABLE const char sUNO_Service_ImageMapRectangleObject[] = "com.sun.star.image.ImageMapRectangleObject";
-SAL_INLINE_VARIABLE const char sUNO_Service_ImageMapCircleObject[] = "com.sun.star.image.ImageMapCircleObject";
-SAL_INLINE_VARIABLE const char sUNO_Service_ImageMapPolygonObject[] = "com.sun.star.image.ImageMapPolygonObject";
+inline const char sUNO_Service_StyleFamily[] = "com.sun.star.style.StyleFamily";
+inline const char sUNO_Service_StyleFamilies[] = "com.sun.star.style.StyleFamilies";
+inline const char sUNO_Service_Style[] = "com.sun.star.style.Style";
+inline const char sUNO_Service_FillProperties[] = "com.sun.star.drawing.FillProperties";
+inline const char sUNO_Service_LineProperties[] = "com.sun.star.drawing.LineProperties";
+inline const char sUNO_Service_ParagraphProperties[] = "com.sun.star.style.ParagraphProperties";
+inline const char sUNO_Service_CharacterProperties[] = "com.sun.star.style.CharacterProperties";
+inline const char sUNO_Service_Text[] = "com.sun.star.drawing.Text";
+inline const char sUNO_Service_TextProperties[] = "com.sun.star.drawing.TextProperties";
+inline const char sUNO_Service_ShadowProperties[] = "com.sun.star.drawing.ShadowProperties";
+inline const char sUNO_Service_ConnectorProperties[] = "com.sun.star.drawing.ConnectorProperties";
+inline const char sUNO_Service_MeasureProperties[] = "com.sun.star.drawing.MeasureProperties";
+inline const char sUNO_Service_PageBackground[] = "com.sun.star.drawing.PageBackground";
+inline const char sUNO_Service_GraphicObjectShape[] = "com.sun.star.drawing.GraphicObjectShape";
+inline const char sUNO_Service_ImageMapRectangleObject[] = "com.sun.star.image.ImageMapRectangleObject";
+inline const char sUNO_Service_ImageMapCircleObject[] = "com.sun.star.image.ImageMapCircleObject";
+inline const char sUNO_Service_ImageMapPolygonObject[] = "com.sun.star.image.ImageMapPolygonObject";
 
 // properties
-SAL_INLINE_VARIABLE const char sUNO_Prop_Background[] = "Background";
-SAL_INLINE_VARIABLE const char sUNO_Prop_ForbiddenCharacters[] = "ForbiddenCharacters";
-SAL_INLINE_VARIABLE const char sUNO_Prop_MapUnit[] = "MapUnit";
-SAL_INLINE_VARIABLE const char sUNO_Prop_VisibleArea[] = "VisibleArea";
-SAL_INLINE_VARIABLE const char sUNO_Prop_Aspect[] = "Aspect";
-SAL_INLINE_VARIABLE const char sUNO_Prop_TabStop[] = "TabStop";
-SAL_INLINE_VARIABLE const char sUNO_Prop_CharLocale[] = "CharLocale";
-SAL_INLINE_VARIABLE const char sUNO_Prop_AutomContFocus[] = "AutomaticControlFocus";
-SAL_INLINE_VARIABLE const char sUNO_Prop_ApplyFrmDsgnMode[] = "ApplyFormDesignMode";
-SAL_INLINE_VARIABLE const char sUNO_Prop_IsBackgroundVisible[] = "IsBackgroundVisible";
-SAL_INLINE_VARIABLE const char sUNO_Prop_IsBackgroundObjectsVisible[] = "IsBackgroundObjectsVisible";
-SAL_INLINE_VARIABLE const char sUNO_Prop_UserDefinedAttributes[] = "UserDefinedAttributes";
-SAL_INLINE_VARIABLE const char sUNO_Prop_BookmarkURL[] = "BookmarkURL";
-SAL_INLINE_VARIABLE const char sUNO_Prop_RuntimeUID[] = "RuntimeUID";
-SAL_INLINE_VARIABLE const char sUNO_Prop_HasValidSignatures[] = "HasValidSignatures";
-SAL_INLINE_VARIABLE const char sUNO_Prop_InteropGrabBag[] = "InteropGrabBag";
+inline const char sUNO_Prop_Background[] = "Background";
+inline const char sUNO_Prop_ForbiddenCharacters[] = "ForbiddenCharacters";
+inline const char sUNO_Prop_MapUnit[] = "MapUnit";
+inline const char sUNO_Prop_VisibleArea[] = "VisibleArea";
+inline const char sUNO_Prop_Aspect[] = "Aspect";
+inline const char sUNO_Prop_TabStop[] = "TabStop";
+inline const char sUNO_Prop_CharLocale[] = "CharLocale";
+inline const char sUNO_Prop_AutomContFocus[] = "AutomaticControlFocus";
+inline const char sUNO_Prop_ApplyFrmDsgnMode[] = "ApplyFormDesignMode";
+inline const char sUNO_Prop_IsBackgroundVisible[] = "IsBackgroundVisible";
+inline const char sUNO_Prop_IsBackgroundObjectsVisible[] = "IsBackgroundObjectsVisible";
+inline const char sUNO_Prop_UserDefinedAttributes[] = "UserDefinedAttributes";
+inline const char sUNO_Prop_BookmarkURL[] = "BookmarkURL";
+inline const char sUNO_Prop_RuntimeUID[] = "RuntimeUID";
+inline const char sUNO_Prop_HasValidSignatures[] = "HasValidSignatures";
+inline const char sUNO_Prop_InteropGrabBag[] = "InteropGrabBag";
 
 // view settings
-SAL_INLINE_VARIABLE const char sUNO_View_ViewId[] = "ViewId";
-SAL_INLINE_VARIABLE const char sUNO_View_SnapLinesDrawing[] = "SnapLinesDrawing";
-SAL_INLINE_VARIABLE const char sUNO_View_SnapLinesNotes[] = "SnapLinesNotes";
-SAL_INLINE_VARIABLE const char sUNO_View_SnapLinesHandout[] = "SnapLinesHandout";
-SAL_INLINE_VARIABLE const char sUNO_View_RulerIsVisible[] = "RulerIsVisible";
-SAL_INLINE_VARIABLE const char sUNO_View_PageKind[] = "PageKind";
-SAL_INLINE_VARIABLE const char sUNO_View_SelectedPage[] = "SelectedPage";
-SAL_INLINE_VARIABLE const char sUNO_View_IsLayerMode[] = "IsLayerMode";
-SAL_INLINE_VARIABLE const char sUNO_View_IsQuickEdit[] = "IsQuickEdit";
-SAL_INLINE_VARIABLE const char sUNO_View_IsDoubleClickTextEdit[] = "IsDoubleClickTextEdit";
-SAL_INLINE_VARIABLE const char sUNO_View_IsClickChangeRotation[] = "IsClickChangeRotation";
-SAL_INLINE_VARIABLE const char sUNO_View_IsDragWithCopy[] = "IsDragWithCopy";
-SAL_INLINE_VARIABLE const char sUNO_View_SlidesPerRow[] = "SlidesPerRow";
-SAL_INLINE_VARIABLE const char sUNO_View_DrawMode[] = "DrawMode";
-SAL_INLINE_VARIABLE const char sUNO_View_PreviewDrawMode[] = "PreviewDrawMode";
-SAL_INLINE_VARIABLE const char sUNO_View_IsShowPreviewInPageMode[] = "IsShowPreviewInPageMode";
-SAL_INLINE_VARIABLE const char sUNO_View_IsShowPreviewInMasterPageMode[] = "IsShowPreviewInMasterPageMode";
-SAL_INLINE_VARIABLE const char sUNO_View_SetShowPreviewInOutlineMode[] = "SetShowPreviewInOutlineMode";
-SAL_INLINE_VARIABLE const char sUNO_View_EditMode[] = "EditMode";
-SAL_INLINE_VARIABLE const char sUNO_View_EditModeStandard[] = "EditModeStandard";   // To be deprecated
-// SAL_INLINE_VARIABLE const char sUNO_View_EditModeNotes[] = "EditModeNotes";
-// SAL_INLINE_VARIABLE const char sUNO_View_EditModeHandout[] = "EditModeHandout";
-SAL_INLINE_VARIABLE const char sUNO_View_VisArea[] = "VisArea";
+inline const char sUNO_View_ViewId[] = "ViewId";
+inline const char sUNO_View_SnapLinesDrawing[] = "SnapLinesDrawing";
+inline const char sUNO_View_SnapLinesNotes[] = "SnapLinesNotes";
+inline const char sUNO_View_SnapLinesHandout[] = "SnapLinesHandout";
+inline const char sUNO_View_RulerIsVisible[] = "RulerIsVisible";
+inline const char sUNO_View_PageKind[] = "PageKind";
+inline const char sUNO_View_SelectedPage[] = "SelectedPage";
+inline const char sUNO_View_IsLayerMode[] = "IsLayerMode";
+inline const char sUNO_View_IsQuickEdit[] = "IsQuickEdit";
+inline const char sUNO_View_IsDoubleClickTextEdit[] = "IsDoubleClickTextEdit";
+inline const char sUNO_View_IsClickChangeRotation[] = "IsClickChangeRotation";
+inline const char sUNO_View_IsDragWithCopy[] = "IsDragWithCopy";
+inline const char sUNO_View_SlidesPerRow[] = "SlidesPerRow";
+inline const char sUNO_View_DrawMode[] = "DrawMode";
+inline const char sUNO_View_PreviewDrawMode[] = "PreviewDrawMode";
+inline const char sUNO_View_IsShowPreviewInPageMode[] = "IsShowPreviewInPageMode";
+inline const char sUNO_View_IsShowPreviewInMasterPageMode[] = "IsShowPreviewInMasterPageMode";
+inline const char sUNO_View_SetShowPreviewInOutlineMode[] = "SetShowPreviewInOutlineMode";
+inline const char sUNO_View_EditMode[] = "EditMode";
+inline const char sUNO_View_EditModeStandard[] = "EditModeStandard";   // To be deprecated
+// inline const char sUNO_View_EditModeNotes[] = "EditModeNotes";
+// inline const char sUNO_View_EditModeHandout[] = "EditModeHandout";
+inline const char sUNO_View_VisArea[] = "VisArea";
 
-SAL_INLINE_VARIABLE const char sUNO_View_GridIsVisible[] = "GridIsVisible";
-SAL_INLINE_VARIABLE const char sUNO_View_GridIsFront[] = "GridIsFront";
-SAL_INLINE_VARIABLE const char sUNO_View_IsSnapToGrid[] = "IsSnapToGrid";
-SAL_INLINE_VARIABLE const char sUNO_View_IsSnapToPageMargins[] = "IsSnapToPageMargins";
-SAL_INLINE_VARIABLE const char sUNO_View_IsSnapToSnapLines[] = "IsSnapToSnapLines";
-SAL_INLINE_VARIABLE const char sUNO_View_IsSnapToObjectFrame[] = "IsSnapToObjectFrame";
-SAL_INLINE_VARIABLE const char sUNO_View_IsSnapToObjectPoints[] = "IsSnapToObjectPoints";
-SAL_INLINE_VARIABLE const char sUNO_View_IsSnapLinesVisible[] = "IsSnapLinesVisible";
-SAL_INLINE_VARIABLE const char sUNO_View_IsDragStripes[] = "IsDragStripes";
-SAL_INLINE_VARIABLE const char sUNO_View_IsPlusHandlesAlwaysVisible[] = "IsPlusHandlesAlwaysVisible";
-SAL_INLINE_VARIABLE const char sUNO_View_IsFrameDragSingles[] = "IsFrameDragSingles";
-SAL_INLINE_VARIABLE const char sUNO_View_IsMarkedHitMovesAlways[] = "IsMarkedHitMovesAlways";
-SAL_INLINE_VARIABLE const char sUNO_View_EliminatePolyPointLimitAngle[] = "EliminatePolyPointLimitAngle";
-SAL_INLINE_VARIABLE const char sUNO_View_IsEliminatePolyPoints[] = "IsEliminatePolyPoints";
-SAL_INLINE_VARIABLE const char sUNO_View_IsLineDraft[] = "IsLineDraft";
-SAL_INLINE_VARIABLE const char sUNO_View_IsFillDraft[] = "IsFillDraft";
-SAL_INLINE_VARIABLE const char sUNO_View_IsTextDraft[] = "IsTextDraft";
-SAL_INLINE_VARIABLE const char sUNO_View_IsGrafDraft[] = "IsGrafDraft";
-SAL_INLINE_VARIABLE const char sUNO_View_ActiveLayer[] = "ActiveLayer";
-SAL_INLINE_VARIABLE const char sUNO_View_NoAttribs[] = "NoAttribs";
-SAL_INLINE_VARIABLE const char sUNO_View_NoColors[] = "NoColors";
-SAL_INLINE_VARIABLE const char sUNO_View_GridCoarseWidth[] = "GridCoarseWidth";
-SAL_INLINE_VARIABLE const char sUNO_View_GridCoarseHeight[] = "GridCoarseHeight";
-SAL_INLINE_VARIABLE const char sUNO_View_GridFineWidth[] = "GridFineWidth";
-SAL_INLINE_VARIABLE const char sUNO_View_GridFineHeight[] = "GridFineHeight";
-SAL_INLINE_VARIABLE const char sUNO_View_IsAngleSnapEnabled[] = "IsAngleSnapEnabled";
-SAL_INLINE_VARIABLE const char sUNO_View_SnapAngle[] = "SnapAngle";
-SAL_INLINE_VARIABLE const char sUNO_View_GridSnapWidthXNumerator[] = "GridSnapWidthXNumerator";
-SAL_INLINE_VARIABLE const char sUNO_View_GridSnapWidthXDenominator[] = "GridSnapWidthXDenominator";
-SAL_INLINE_VARIABLE const char sUNO_View_GridSnapWidthYNumerator[] = "GridSnapWidthYNumerator";
-SAL_INLINE_VARIABLE const char sUNO_View_GridSnapWidthYDenominator[] = "GridSnapWidthYDenominator";
-SAL_INLINE_VARIABLE const char sUNO_View_VisibleLayers[] = "VisibleLayers";
-SAL_INLINE_VARIABLE const char sUNO_View_PrintableLayers[] = "PrintableLayers";
-SAL_INLINE_VARIABLE const char sUNO_View_LockedLayers[] = "LockedLayers";
+inline const char sUNO_View_GridIsVisible[] = "GridIsVisible";
+inline const char sUNO_View_GridIsFront[] = "GridIsFront";
+inline const char sUNO_View_IsSnapToGrid[] = "IsSnapToGrid";
+inline const char sUNO_View_IsSnapToPageMargins[] = "IsSnapToPageMargins";
+inline const char sUNO_View_IsSnapToSnapLines[] = "IsSnapToSnapLines";
+inline const char sUNO_View_IsSnapToObjectFrame[] = "IsSnapToObjectFrame";
+inline const char sUNO_View_IsSnapToObjectPoints[] = "IsSnapToObjectPoints";
+inline const char sUNO_View_IsSnapLinesVisible[] = "IsSnapLinesVisible";
+inline const char sUNO_View_IsDragStripes[] = "IsDragStripes";
+inline const char sUNO_View_IsPlusHandlesAlwaysVisible[] = "IsPlusHandlesAlwaysVisible";
+inline const char sUNO_View_IsFrameDragSingles[] = "IsFrameDragSingles";
+inline const char sUNO_View_IsMarkedHitMovesAlways[] = "IsMarkedHitMovesAlways";
+inline const char sUNO_View_EliminatePolyPointLimitAngle[] = "EliminatePolyPointLimitAngle";
+inline const char sUNO_View_IsEliminatePolyPoints[] = "IsEliminatePolyPoints";
+inline const char sUNO_View_IsLineDraft[] = "IsLineDraft";
+inline const char sUNO_View_IsFillDraft[] = "IsFillDraft";
+inline const char sUNO_View_IsTextDraft[] = "IsTextDraft";
+inline const char sUNO_View_IsGrafDraft[] = "IsGrafDraft";
+inline const char sUNO_View_ActiveLayer[] = "ActiveLayer";
+inline const char sUNO_View_NoAttribs[] = "NoAttribs";
+inline const char sUNO_View_NoColors[] = "NoColors";
+inline const char sUNO_View_GridCoarseWidth[] = "GridCoarseWidth";
+inline const char sUNO_View_GridCoarseHeight[] = "GridCoarseHeight";
+inline const char sUNO_View_GridFineWidth[] = "GridFineWidth";
+inline const char sUNO_View_GridFineHeight[] = "GridFineHeight";
+inline const char sUNO_View_IsAngleSnapEnabled[] = "IsAngleSnapEnabled";
+inline const char sUNO_View_SnapAngle[] = "SnapAngle";
+inline const char sUNO_View_GridSnapWidthXNumerator[] = "GridSnapWidthXNumerator";
+inline const char sUNO_View_GridSnapWidthXDenominator[] = "GridSnapWidthXDenominator";
+inline const char sUNO_View_GridSnapWidthYNumerator[] = "GridSnapWidthYNumerator";
+inline const char sUNO_View_GridSnapWidthYDenominator[] = "GridSnapWidthYDenominator";
+inline const char sUNO_View_VisibleLayers[] = "VisibleLayers";
+inline const char sUNO_View_PrintableLayers[] = "PrintableLayers";
+inline const char sUNO_View_LockedLayers[] = "LockedLayers";
 
-SAL_INLINE_VARIABLE const char sUNO_View_VisibleAreaTop[] = "VisibleAreaTop";
-SAL_INLINE_VARIABLE const char sUNO_View_VisibleAreaLeft[] = "VisibleAreaLeft";
-SAL_INLINE_VARIABLE const char sUNO_View_VisibleAreaWidth[] = "VisibleAreaWidth";
-SAL_INLINE_VARIABLE const char sUNO_View_VisibleAreaHeight[] = "VisibleAreaHeight";
+inline const char sUNO_View_VisibleAreaTop[] = "VisibleAreaTop";
+inline const char sUNO_View_VisibleAreaLeft[] = "VisibleAreaLeft";
+inline const char sUNO_View_VisibleAreaWidth[] = "VisibleAreaWidth";
+inline const char sUNO_View_VisibleAreaHeight[] = "VisibleAreaHeight";
 
-SAL_INLINE_VARIABLE const char sUNO_View_ZoomOnPage[] = "ZoomOnPage";
+inline const char sUNO_View_ZoomOnPage[] = "ZoomOnPage";
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 741c9c191e5e..4fe587b23109 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -80,15 +80,6 @@ using namespace ::svx;
 namespace svxform
 {
 
-#if !HAVE_CPP_INLINE_VARIABLES
-constexpr OUStringLiteral ReplaceString::m_sDoc_API;
-constexpr OUStringLiteral ReplaceString::m_sInstance_API;
-constexpr OUStringLiteral ReplaceString::m_sNone_API;
-constexpr OUStringLiteral MethodString::m_sPost_API;
-constexpr OUStringLiteral MethodString::m_sPut_API;
-constexpr OUStringLiteral MethodString::m_sGet_API;
-#endif
-
     // properties of instance
     #define PN_INSTANCE_MODEL       "Instance"
     #define PN_INSTANCE_ID          "ID"
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index ba523eb0d207..e2726b18be34 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -20,7 +20,6 @@
 #include <memory>
 #include <stdlib.h>
 
-#include <config_global.h>
 #include <svx/svxids.hrc>
 #include <i18nlangtag/languagetag.hxx>
 #include <svtools/ctrltool.hxx>
@@ -359,10 +358,6 @@ void SvxCSS1BorderInfo::SetBorderLine( SvxBoxItemLine nLine, SvxBoxItem &rBoxIte
     rBoxItem.SetLine( &aBorderLine, nLine );
 }
 
-#if !HAVE_CPP_INLINE_VARIABLES
-constexpr sal_uInt16 SvxCSS1PropertyInfo::UNSET_BORDER_DISTANCE;
-#endif
-
 SvxCSS1PropertyInfo::SvxCSS1PropertyInfo()
 {
     Clear();
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 2207d929a9c4..1932006ea8ba 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -23,7 +23,6 @@
 #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>
@@ -1227,10 +1226,6 @@ public:
     }
 };
 
-#if !HAVE_CPP_INLINE_VARIABLES
-constexpr sal_Int32 SwXMLTableContext::MAX_WIDTH;
-#endif
-
 const SwXMLTableCell_Impl *SwXMLTableContext::GetCell( sal_uInt32 nRow,
                                                  sal_uInt32 nCol ) const
 {
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 21e583132c92..ec251ec8b3a0 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -74,11 +74,6 @@ namespace
     class theOptionsDlgOptions_ImplMutex : public rtl::Static<osl::Mutex, theOptionsDlgOptions_ImplMutex>{};
 }
 
-#if !HAVE_CPP_INLINE_VARIABLES
-constexpr OUStringLiteral SvtOptionsDlgOptions_Impl::g_sPathDelimiter;
-#endif
-
-
 ::osl::Mutex & SvtOptionsDlgOptions_Impl::getInitMutex()
 {
     return theOptionsDlgOptions_ImplMutex::get();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 9f188d88b499..3241990b8061 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -399,10 +399,6 @@ public:
     }
 };
 
-#if !HAVE_CPP_INLINE_VARIABLES
-constexpr sal_Int32 GraphicImport_Impl::nFillColor;
-#endif
-
 GraphicImport::GraphicImport(uno::Reference<uno::XComponentContext> const& xComponentContext,
                              uno::Reference<lang::XMultiServiceFactory> const& xTextFactory,
                              DomainMapper& rDMapper,
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)