summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-12-07 12:24:05 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-12-07 22:47:49 +0100
commit66ef8ca217680095d8aaae025d82c2cbcd8ec1d2 (patch)
tree2a7f4d2b5892c5fea9b89f0f27ccd6f771af5769 /sd
parent7ffdd830d5fb52f2ca25aa80277d22ea6d89970b (diff)
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>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/inc/unokywds.hxx234
1 files changed, 117 insertions, 117 deletions
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: */