Make compilers combine sUNO_* vars across TUs

...by changing them from internal linkage to being inline (where available).
The net effect is that compilers (that HAVE_CPP_INLINE_VARIABLES) are required
to combine all uses of a given sUNO_* var across a Library, where before that
was only possible if the compiler could prove that placing multiple such vars
across TUs at the same address didn't change the program's behavior.

(And

> $ diff <(nm --def instdir/program/libsdlo.so | grep sUNO_ | cut -d ' ' -f 3 | LC_ALL=C sort) <(nm --def instdir/program/libsdlo.so | grep sUNO_ | cut -d ' ' -f 3 | LC_ALL=C sort | uniq)
> 2d1
> < _ZL16sUNO_View_ViewId
> 8d6
> < _ZL18sUNO_View_PageKind
> 23d20
> < _ZL22sUNO_View_LockedLayers
> 30d26
> < _ZL23sUNO_View_VisibleLayers
> 39d34
> < _ZL25sUNO_View_PrintableLayers

showed that there were duplicates, while

> $ nm --def instdir/program/libsdlo.so | grep sUNO_ | cut -d ' ' -f 3 | LC_ALL=C sort | uniq | wc -l
> 71

shows that only 71 of the 117 sUNO_* vars are actually used at all---there's
still room for clean up.)

Introduces LIBO_INTERNAL_ONLY SAL_INLINE_VARIABLE.

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

2 files changed, 135 insertions, 117 deletions

diff --git a/include/sal/types.h b/include/sal/types.h
index 474a223a2ff2..08751c33cd53 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -697,6 +697,20 @@ 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/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 9becfc0bd328..1e190e4f592d 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -20,137 +20,141 @@
 #ifndef INCLUDED_SD_SOURCE_UI_INC_UNOKYWDS_HXX
 #define INCLUDED_SD_SOURCE_UI_INC_UNOKYWDS_HXX
 
+#include <sal/config.h>
+
+#include <sal/types.h>
+
 // SdUnoPseudoStyleFamily
-const char sUNO_PseudoSheet_Title[] = "title";
-const char sUNO_PseudoSheet_SubTitle[] = "subtitle";
-const char sUNO_PseudoSheet_Background[] = "background";
-const char sUNO_PseudoSheet_Background_Objects[] = "backgroundobjects";
-const char sUNO_PseudoSheet_Notes[] = "notes";
-const char sUNO_PseudoSheet_Outline1[] = "outline1";
-const char sUNO_PseudoSheet_Outline2[] = "outline2";
-const char sUNO_PseudoSheet_Outline3[] = "outline3";
-const char sUNO_PseudoSheet_Outline4[] = "outline4";
-const char sUNO_PseudoSheet_Outline5[] = "outline5";
-const char sUNO_PseudoSheet_Outline6[] = "outline6";
-const char sUNO_PseudoSheet_Outline7[] = "outline7";
-const char sUNO_PseudoSheet_Outline8[] = "outline8";
-const char sUNO_PseudoSheet_Outline9[] = "outline9";
+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";
 
 // SdLayer
-const char sUNO_LayerName_background[] = "background";
-const char sUNO_LayerName_background_objects[] = "backgroundobjects";
-const char sUNO_LayerName_layout[] = "layout";
-const char sUNO_LayerName_controls[] = "controls";
-const char sUNO_LayerName_measurelines[] = "measurelines";
+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";
 
 // SdXShape
-const char sUNO_shape_style[] = "Style";
-const char sUNO_shape_layername[] = "LayerName";
-const char sUNO_shape_zorder[] = "ZOrder";
+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";
 
 // services
-const char sUNO_Service_StyleFamily[] = "com.sun.star.style.StyleFamily";
-const char sUNO_Service_StyleFamilies[] = "com.sun.star.style.StyleFamilies";
-const char sUNO_Service_Style[] = "com.sun.star.style.Style";
-const char sUNO_Service_FillProperties[] = "com.sun.star.drawing.FillProperties";
-const char sUNO_Service_LineProperties[] = "com.sun.star.drawing.LineProperties";
-const char sUNO_Service_ParagraphProperties[] = "com.sun.star.style.ParagraphProperties";
-const char sUNO_Service_CharacterProperties[] = "com.sun.star.style.CharacterProperties";
-const char sUNO_Service_Text[] = "com.sun.star.drawing.Text";
-const char sUNO_Service_TextProperties[] = "com.sun.star.drawing.TextProperties";
-const char sUNO_Service_ShadowProperties[] = "com.sun.star.drawing.ShadowProperties";
-const char sUNO_Service_ConnectorProperties[] = "com.sun.star.drawing.ConnectorProperties";
-const char sUNO_Service_MeasureProperties[] = "com.sun.star.drawing.MeasureProperties";
-const char sUNO_Service_PageBackground[] = "com.sun.star.drawing.PageBackground";
-const char sUNO_Service_GraphicObjectShape[] = "com.sun.star.drawing.GraphicObjectShape";
-const char sUNO_Service_ImageMapRectangleObject[] = "com.sun.star.image.ImageMapRectangleObject";
-const char sUNO_Service_ImageMapCircleObject[] = "com.sun.star.image.ImageMapCircleObject";
-const char sUNO_Service_ImageMapPolygonObject[] = "com.sun.star.image.ImageMapPolygonObject";
+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";
 
 // properties
-const char sUNO_Prop_Background[] = "Background";
-const char sUNO_Prop_ForbiddenCharacters[] = "ForbiddenCharacters";
-const char sUNO_Prop_MapUnit[] = "MapUnit";
-const char sUNO_Prop_VisibleArea[] = "VisibleArea";
-const char sUNO_Prop_Aspect[] = "Aspect";
-const char sUNO_Prop_TabStop[] = "TabStop";
-const char sUNO_Prop_CharLocale[] = "CharLocale";
-const char sUNO_Prop_AutomContFocus[] = "AutomaticControlFocus";
-const char sUNO_Prop_ApplyFrmDsgnMode[] = "ApplyFormDesignMode";
-const char sUNO_Prop_IsBackgroundVisible[] = "IsBackgroundVisible";
-const char sUNO_Prop_IsBackgroundObjectsVisible[] = "IsBackgroundObjectsVisible";
-const char sUNO_Prop_UserDefinedAttributes[] = "UserDefinedAttributes";
-const char sUNO_Prop_BookmarkURL[] = "BookmarkURL";
-const char sUNO_Prop_RuntimeUID[] = "RuntimeUID";
-const char sUNO_Prop_HasValidSignatures[] = "HasValidSignatures";
-const char sUNO_Prop_InteropGrabBag[] = "InteropGrabBag";
+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";
 
 // view settings
-const char sUNO_View_ViewId[] = "ViewId";
-const char sUNO_View_SnapLinesDrawing[] = "SnapLinesDrawing";
-const char sUNO_View_SnapLinesNotes[] = "SnapLinesNotes";
-const char sUNO_View_SnapLinesHandout[] = "SnapLinesHandout";
-const char sUNO_View_RulerIsVisible[] = "RulerIsVisible";
-const char sUNO_View_PageKind[] = "PageKind";
-const char sUNO_View_SelectedPage[] = "SelectedPage";
-const char sUNO_View_IsLayerMode[] = "IsLayerMode";
-const char sUNO_View_IsQuickEdit[] = "IsQuickEdit";
-const char sUNO_View_IsDoubleClickTextEdit[] = "IsDoubleClickTextEdit";
-const char sUNO_View_IsClickChangeRotation[] = "IsClickChangeRotation";
-const char sUNO_View_IsDragWithCopy[] = "IsDragWithCopy";
-const char sUNO_View_SlidesPerRow[] = "SlidesPerRow";
-const char sUNO_View_DrawMode[] = "DrawMode";
-const char sUNO_View_PreviewDrawMode[] = "PreviewDrawMode";
-const char sUNO_View_IsShowPreviewInPageMode[] = "IsShowPreviewInPageMode";
-const char sUNO_View_IsShowPreviewInMasterPageMode[] = "IsShowPreviewInMasterPageMode";
-const char sUNO_View_SetShowPreviewInOutlineMode[] = "SetShowPreviewInOutlineMode";
-const char sUNO_View_EditMode[] = "EditMode";
-const char sUNO_View_EditModeStandard[] = "EditModeStandard";   // To be deprecated
-// const char sUNO_View_EditModeNotes[] = "EditModeNotes";
-// const char sUNO_View_EditModeHandout[] = "EditModeHandout";
-const char sUNO_View_VisArea[] = "VisArea";
+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";
 
-const char sUNO_View_GridIsVisible[] = "GridIsVisible";
-const char sUNO_View_GridIsFront[] = "GridIsFront";
-const char sUNO_View_IsSnapToGrid[] = "IsSnapToGrid";
-const char sUNO_View_IsSnapToPageMargins[] = "IsSnapToPageMargins";
-const char sUNO_View_IsSnapToSnapLines[] = "IsSnapToSnapLines";
-const char sUNO_View_IsSnapToObjectFrame[] = "IsSnapToObjectFrame";
-const char sUNO_View_IsSnapToObjectPoints[] = "IsSnapToObjectPoints";
-const char sUNO_View_IsSnapLinesVisible[] = "IsSnapLinesVisible";
-const char sUNO_View_IsDragStripes[] = "IsDragStripes";
-const char sUNO_View_IsPlusHandlesAlwaysVisible[] = "IsPlusHandlesAlwaysVisible";
-const char sUNO_View_IsFrameDragSingles[] = "IsFrameDragSingles";
-const char sUNO_View_IsMarkedHitMovesAlways[] = "IsMarkedHitMovesAlways";
-const char sUNO_View_EliminatePolyPointLimitAngle[] = "EliminatePolyPointLimitAngle";
-const char sUNO_View_IsEliminatePolyPoints[] = "IsEliminatePolyPoints";
-const char sUNO_View_IsLineDraft[] = "IsLineDraft";
-const char sUNO_View_IsFillDraft[] = "IsFillDraft";
-const char sUNO_View_IsTextDraft[] = "IsTextDraft";
-const char sUNO_View_IsGrafDraft[] = "IsGrafDraft";
-const char sUNO_View_ActiveLayer[] = "ActiveLayer";
-const char sUNO_View_NoAttribs[] = "NoAttribs";
-const char sUNO_View_NoColors[] = "NoColors";
-const char sUNO_View_GridCoarseWidth[] = "GridCoarseWidth";
-const char sUNO_View_GridCoarseHeight[] = "GridCoarseHeight";
-const char sUNO_View_GridFineWidth[] = "GridFineWidth";
-const char sUNO_View_GridFineHeight[] = "GridFineHeight";
-const char sUNO_View_IsAngleSnapEnabled[] = "IsAngleSnapEnabled";
-const char sUNO_View_SnapAngle[] = "SnapAngle";
-const char sUNO_View_GridSnapWidthXNumerator[] = "GridSnapWidthXNumerator";
-const char sUNO_View_GridSnapWidthXDenominator[] = "GridSnapWidthXDenominator";
-const char sUNO_View_GridSnapWidthYNumerator[] = "GridSnapWidthYNumerator";
-const char sUNO_View_GridSnapWidthYDenominator[] = "GridSnapWidthYDenominator";
-const char sUNO_View_VisibleLayers[] = "VisibleLayers";
-const char sUNO_View_PrintableLayers[] = "PrintableLayers";
-const char sUNO_View_LockedLayers[] = "LockedLayers";
+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";
 
-const char sUNO_View_VisibleAreaTop[] = "VisibleAreaTop";
-const char sUNO_View_VisibleAreaLeft[] = "VisibleAreaLeft";
-const char sUNO_View_VisibleAreaWidth[] = "VisibleAreaWidth";
-const char sUNO_View_VisibleAreaHeight[] = "VisibleAreaHeight";
+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";
 
-const char sUNO_View_ZoomOnPage[] = "ZoomOnPage";
+SAL_INLINE_VARIABLE const char sUNO_View_ZoomOnPage[] = "ZoomOnPage";
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */