diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-09-25 06:29:09 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-09-25 09:05:39 +0900 |
commit | 982f75e2c4d2f20cede8ab1f27cb2ded4318ea62 (patch) | |
tree | ca3dff95c9dc40ec6890e9c3b4425bf83e218811 /xmloff | |
parent | 3734830c9cf8cb7254ba88a8c55ce6dfa1c5b7c9 (diff) |
Mark as const / static
Change-Id: I4a70ed8b527096e35fa717b87efc4b6990f29121
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/chart/PropertyMap.hxx | 18 | ||||
-rw-r--r-- | xmloff/source/draw/sdpropls.cxx | 66 | ||||
-rw-r--r-- | xmloff/source/draw/sdpropls.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/style/PageMasterPropHdlFactory.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/prhdlfac.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/text/txtprhdl.cxx | 32 |
6 files changed, 64 insertions, 64 deletions
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index 2757756122cc..4bab098f500c 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -222,7 +222,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = // maps for enums to XML attributes -SvXMLEnumMapEntry aXMLChartAxisLabelPositionEnumMap[] = +const SvXMLEnumMapEntry aXMLChartAxisLabelPositionEnumMap[] = { { ::xmloff::token::XML_NEAR_AXIS, ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS }, { ::xmloff::token::XML_NEAR_AXIS_OTHER_SIDE, ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE }, @@ -233,7 +233,7 @@ SvXMLEnumMapEntry aXMLChartAxisLabelPositionEnumMap[] = { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXMLChartAxisMarkPositionEnumMap[] = +const SvXMLEnumMapEntry aXMLChartAxisMarkPositionEnumMap[] = { { ::xmloff::token::XML_AT_LABELS, ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS }, { ::xmloff::token::XML_AT_AXIS, ::com::sun::star::chart::ChartAxisMarkPosition_AT_AXIS }, @@ -241,7 +241,7 @@ SvXMLEnumMapEntry aXMLChartAxisMarkPositionEnumMap[] = { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXMLChartAxisArrangementEnumMap[] = +const SvXMLEnumMapEntry aXMLChartAxisArrangementEnumMap[] = { { ::xmloff::token::XML_SIDE_BY_SIDE, ::com::sun::star::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE }, { ::xmloff::token::XML_STAGGER_EVEN, ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_EVEN }, @@ -249,7 +249,7 @@ SvXMLEnumMapEntry aXMLChartAxisArrangementEnumMap[] = { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXMLChartErrorBarStyleEnumMap[] = +const SvXMLEnumMapEntry aXMLChartErrorBarStyleEnumMap[] = { { ::xmloff::token::XML_NONE, ::com::sun::star::chart::ErrorBarStyle::NONE }, { ::xmloff::token::XML_VARIANCE, ::com::sun::star::chart::ErrorBarStyle::VARIANCE }, @@ -262,7 +262,7 @@ SvXMLEnumMapEntry aXMLChartErrorBarStyleEnumMap[] = { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXMLChartSolidTypeEnumMap[] = +const SvXMLEnumMapEntry aXMLChartSolidTypeEnumMap[] = { { ::xmloff::token::XML_CUBOID, ::com::sun::star::chart::ChartSolidType::RECTANGULAR_SOLID }, { ::xmloff::token::XML_CYLINDER, ::com::sun::star::chart::ChartSolidType::CYLINDER }, @@ -271,14 +271,14 @@ SvXMLEnumMapEntry aXMLChartSolidTypeEnumMap[] = { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXMLChartDataRowSourceTypeEnumMap[] = +const SvXMLEnumMapEntry aXMLChartDataRowSourceTypeEnumMap[] = { { ::xmloff::token::XML_COLUMNS, ::com::sun::star::chart::ChartDataRowSource_COLUMNS }, { ::xmloff::token::XML_ROWS, ::com::sun::star::chart::ChartDataRowSource_ROWS }, { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXMLChartInterpolationTypeEnumMap[] = +const SvXMLEnumMapEntry aXMLChartInterpolationTypeEnumMap[] = { // this is neither an enum nor a constants group, but just a // documented long property @@ -298,7 +298,7 @@ SvXMLEnumMapEntry aXMLChartInterpolationTypeEnumMap[] = { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXMLChartDataLabelPlacementEnumMap[] = +const SvXMLEnumMapEntry aXMLChartDataLabelPlacementEnumMap[] = { { ::xmloff::token::XML_AVOID_OVERLAP, ::com::sun::star::chart::DataLabelPlacement::AVOID_OVERLAP }, { ::xmloff::token::XML_CENTER, ::com::sun::star::chart::DataLabelPlacement::CENTER }, @@ -316,7 +316,7 @@ SvXMLEnumMapEntry aXMLChartDataLabelPlacementEnumMap[] = { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXMLChartMissingValueTreatmentEnumMap[] = +const SvXMLEnumMapEntry aXMLChartMissingValueTreatmentEnumMap[] = { { ::xmloff::token::XML_LEAVE_GAP, ::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP }, { ::xmloff::token::XML_USE_ZERO, ::com::sun::star::chart::MissingValueTreatment::USE_ZERO }, diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index d6fe22513f0b..25149287e74a 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -364,7 +364,7 @@ const XMLPropertyMapEntry aXMLTableShapeAttributes[] = // implementation of factory for own graphic properties -SvXMLEnumMapEntry aXML_LineStyle_EnumMap[] = +static SvXMLEnumMapEntry const aXML_LineStyle_EnumMap[] = { { XML_NONE, drawing::LineStyle_NONE }, { XML_SOLID, drawing::LineStyle_SOLID }, @@ -372,7 +372,7 @@ SvXMLEnumMapEntry aXML_LineStyle_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_LineJoint_EnumMap[] = +static SvXMLEnumMapEntry const aXML_LineJoint_EnumMap[] = { { XML_NONE, drawing::LineJoint_NONE }, { XML_MITER, drawing::LineJoint_MITER }, @@ -382,7 +382,7 @@ SvXMLEnumMapEntry aXML_LineJoint_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_LineCap_EnumMap[] = +static SvXMLEnumMapEntry const aXML_LineCap_EnumMap[] = { { XML_BUTT, drawing::LineCap_BUTT }, { XML_ROUND, drawing::LineCap_ROUND }, @@ -391,7 +391,7 @@ SvXMLEnumMapEntry aXML_LineCap_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_FillStyle_EnumMap[] = +static SvXMLEnumMapEntry const aXML_FillStyle_EnumMap[] = { { XML_NONE, drawing::FillStyle_NONE }, { XML_SOLID, drawing::FillStyle_SOLID }, @@ -401,7 +401,7 @@ SvXMLEnumMapEntry aXML_FillStyle_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_PresChange_EnumMap[] = +static SvXMLEnumMapEntry const aXML_PresChange_EnumMap[] = { { XML_MANUAL, 0 }, { XML_AUTOMATIC, 1 }, @@ -409,7 +409,7 @@ SvXMLEnumMapEntry aXML_PresChange_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_TransSpeed_EnumMap[] = +static SvXMLEnumMapEntry const aXML_TransSpeed_EnumMap[] = { { XML_FAST, presentation::AnimationSpeed_FAST }, { XML_MEDIUM, presentation::AnimationSpeed_MEDIUM }, @@ -417,7 +417,7 @@ SvXMLEnumMapEntry aXML_TransSpeed_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_FadeEffect_EnumMap[] = +static SvXMLEnumMapEntry const aXML_FadeEffect_EnumMap[] = { { XML_NONE, presentation::FadeEffect_NONE }, { XML_FADE_FROM_LEFT, presentation::FadeEffect_FADE_FROM_LEFT }, @@ -479,7 +479,7 @@ SvXMLEnumMapEntry aXML_FadeEffect_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_ConnectionKind_EnumMap[] = +SvXMLEnumMapEntry const aXML_ConnectionKind_EnumMap[] = { { XML_STANDARD, drawing::ConnectorType_STANDARD }, { XML_CURVE, drawing::ConnectorType_CURVE }, @@ -488,7 +488,7 @@ SvXMLEnumMapEntry aXML_ConnectionKind_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_BitmapMode_EnumMap[] = +static SvXMLEnumMapEntry const aXML_BitmapMode_EnumMap[] = { { XML_REPEAT, drawing::BitmapMode_REPEAT }, { XML_STRETCH, drawing::BitmapMode_STRETCH }, @@ -498,7 +498,7 @@ SvXMLEnumMapEntry aXML_BitmapMode_EnumMap[] = // 3D EnumMaps -SvXMLEnumMapEntry aXML_NormalsKind_EnumMap[] = +static SvXMLEnumMapEntry const aXML_NormalsKind_EnumMap[] = { { XML_OBJECT, drawing::NormalsKind_SPECIFIC }, { XML_FLAT, drawing::NormalsKind_FLAT }, @@ -506,7 +506,7 @@ SvXMLEnumMapEntry aXML_NormalsKind_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_TexGenerationX_EnumMap[] = +static SvXMLEnumMapEntry const aXML_TexGenerationX_EnumMap[] = { { XML_OBJECT, drawing::TextureProjectionMode_OBJECTSPECIFIC }, { XML_PARALLEL, drawing::TextureProjectionMode_PARALLEL }, @@ -514,7 +514,7 @@ SvXMLEnumMapEntry aXML_TexGenerationX_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_TexGenerationY_EnumMap[] = +static SvXMLEnumMapEntry const aXML_TexGenerationY_EnumMap[] = { { XML_OBJECT, drawing::TextureProjectionMode_OBJECTSPECIFIC }, { XML_PARALLEL, drawing::TextureProjectionMode_PARALLEL }, @@ -522,14 +522,14 @@ SvXMLEnumMapEntry aXML_TexGenerationY_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_TexKind_EnumMap[] = +static SvXMLEnumMapEntry const aXML_TexKind_EnumMap[] = { { XML_LUMINANCE, drawing::TextureKind_LUMINANCE }, { XML_COLOR, drawing::TextureKind_COLOR }, { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_TexMode_EnumMap[] = +static SvXMLEnumMapEntry const aXML_TexMode_EnumMap[] = { { XML_REPLACE, drawing::TextureMode_REPLACE }, { XML_MODULATE, drawing::TextureMode_MODULATE }, @@ -537,7 +537,7 @@ SvXMLEnumMapEntry aXML_TexMode_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_RefPoint_EnumMap[] = +static SvXMLEnumMapEntry const aXML_RefPoint_EnumMap[] = { { XML_TOP_LEFT, drawing::RectanglePoint_LEFT_TOP }, { XML_TOP, drawing::RectanglePoint_MIDDLE_TOP }, @@ -551,7 +551,7 @@ SvXMLEnumMapEntry aXML_RefPoint_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_CircleKind_EnumMap[] = +SvXMLEnumMapEntry const aXML_CircleKind_EnumMap[] = { { XML_FULL, drawing::CircleKind_FULL }, { XML_SECTION, drawing::CircleKind_SECTION }, @@ -560,14 +560,14 @@ SvXMLEnumMapEntry aXML_CircleKind_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXML_WritingMode_EnumMap[] = +static SvXMLEnumMapEntry const aXML_WritingMode_EnumMap[] = { { XML_TB_RL, text::WritingMode_TB_RL }, { XML_LR_TB, text::WritingMode_LR_TB }, { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_TextAnimation_Enum[] = +static SvXMLEnumMapEntry const pXML_TextAnimation_Enum[] = { { XML_NONE, drawing::TextAnimationKind_NONE }, { XML_BLINKING, drawing::TextAnimationKind_BLINK }, // will be filtered @@ -577,7 +577,7 @@ SvXMLEnumMapEntry const pXML_TextAnimation_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_TextAnimation_Blinking_Enum[] = +static SvXMLEnumMapEntry const pXML_TextAnimation_Blinking_Enum[] = { { XML_FALSE, drawing::TextAnimationKind_NONE }, { XML_TRUE, drawing::TextAnimationKind_BLINK }, @@ -587,7 +587,7 @@ SvXMLEnumMapEntry const pXML_TextAnimation_Blinking_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_TextAnimationDirection_Enum[] = +static SvXMLEnumMapEntry const pXML_TextAnimationDirection_Enum[] = { { XML_LEFT, drawing::TextAnimationDirection_LEFT }, { XML_RIGHT, drawing::TextAnimationDirection_RIGHT }, // will be filtered @@ -596,7 +596,7 @@ SvXMLEnumMapEntry const pXML_TextAnimationDirection_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_TextAlign_Enum[] = +static SvXMLEnumMapEntry const pXML_TextAlign_Enum[] = { { XML_LEFT, drawing::TextHorizontalAdjust_LEFT }, { XML_CENTER, drawing::TextHorizontalAdjust_CENTER }, @@ -605,7 +605,7 @@ SvXMLEnumMapEntry const pXML_TextAlign_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] = +static SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] = { { XML_TOP, drawing::TextVerticalAdjust_TOP }, { XML_MIDDLE, drawing::TextVerticalAdjust_CENTER }, @@ -614,7 +614,7 @@ SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_FitToSize_Enum_Odf12[] = +static SvXMLEnumMapEntry const pXML_FitToSize_Enum_Odf12[] = { { XML_FALSE, drawing::TextFitToSizeType_NONE }, { XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL }, @@ -623,7 +623,7 @@ SvXMLEnumMapEntry const pXML_FitToSize_Enum_Odf12[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_FitToSize_Enum[] = +static SvXMLEnumMapEntry const pXML_FitToSize_Enum[] = { { XML_FALSE, drawing::TextFitToSizeType_NONE }, { XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL }, @@ -632,7 +632,7 @@ SvXMLEnumMapEntry const pXML_FitToSize_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_MeasureUnit_Enum[] = +static SvXMLEnumMapEntry const pXML_MeasureUnit_Enum[] = { { XML_AUTOMATIC, 0 }, { XML_UNIT_MM, 1 }, @@ -647,7 +647,7 @@ SvXMLEnumMapEntry const pXML_MeasureUnit_Enum[] = { XML_TOKEN_INVALID,0 } }; -SvXMLEnumMapEntry const pXML_Measure_HAlign_Enum[] = +static SvXMLEnumMapEntry const pXML_Measure_HAlign_Enum[] = { { XML_AUTOMATIC, drawing::MeasureTextHorzPos_AUTO }, { XML_LEFT_OUTSIDE, drawing::MeasureTextHorzPos_LEFTOUTSIDE }, @@ -656,7 +656,7 @@ SvXMLEnumMapEntry const pXML_Measure_HAlign_Enum[] = { XML_TOKEN_INVALID,0 } }; -SvXMLEnumMapEntry const pXML_Measure_VAlign_Enum[] = +static SvXMLEnumMapEntry const pXML_Measure_VAlign_Enum[] = { { XML_AUTOMATIC, drawing::MeasureTextVertPos_AUTO }, { XML_ABOVE, drawing::MeasureTextVertPos_EAST }, @@ -666,7 +666,7 @@ SvXMLEnumMapEntry const pXML_Measure_VAlign_Enum[] = }; // #FontWork# -SvXMLEnumMapEntry const pXML_Fontwork_Style_Enum[] = +static SvXMLEnumMapEntry const pXML_Fontwork_Style_Enum[] = { { XML_ROTATE, 0 }, //XFT_ROTATE, { XML_UPRIGHT, 1 }, //XFT_UPRIGHT, @@ -676,7 +676,7 @@ SvXMLEnumMapEntry const pXML_Fontwork_Style_Enum[] = { XML_TOKEN_INVALID,0 } }; -SvXMLEnumMapEntry const pXML_Fontwork_Adjust_Enum[] = +static SvXMLEnumMapEntry const pXML_Fontwork_Adjust_Enum[] = { { XML_LEFT, 0 }, //XFT_LEFT, { XML_RIGHT, 1 }, //XFT_RIGHT, @@ -685,7 +685,7 @@ SvXMLEnumMapEntry const pXML_Fontwork_Adjust_Enum[] = { XML_TOKEN_INVALID,0 } }; -SvXMLEnumMapEntry const pXML_Fontwork_Shadow_Enum[] = +static SvXMLEnumMapEntry const pXML_Fontwork_Shadow_Enum[] = { { XML_NORMAL, 0 }, //XFTSHADOW_NORMAL, { XML_SLANT, 1 }, //XFTSHADOW_SLANT, @@ -693,7 +693,7 @@ SvXMLEnumMapEntry const pXML_Fontwork_Shadow_Enum[] = { XML_TOKEN_INVALID,0 } }; -SvXMLEnumMapEntry const pXML_Fontwork_Form_Enum[] = +static SvXMLEnumMapEntry const pXML_Fontwork_Form_Enum[] = { { XML_NONE, 0 }, //XFTFORM_NONE, { XML_TOPCIRCLE, 1 }, //XFTFORM_TOPCIRC, @@ -711,7 +711,7 @@ SvXMLEnumMapEntry const pXML_Fontwork_Form_Enum[] = { XML_TOKEN_INVALID,0 } }; -SvXMLEnumMapEntry const pXML_Caption_Esc_Dir_Enum[] = +static SvXMLEnumMapEntry const pXML_Caption_Esc_Dir_Enum[] = { { XML_HORIZONTAL, 0 }, //SDRCAPT_ESCHORIZONTAL, { XML_VERTICAL, 1 }, //SDRCAPT_ESCVERTICAL, @@ -719,7 +719,7 @@ SvXMLEnumMapEntry const pXML_Caption_Esc_Dir_Enum[] = { XML_TOKEN_INVALID,0 } }; -SvXMLEnumMapEntry const pXML_Caption_Type_Enum[] = +static SvXMLEnumMapEntry const pXML_Caption_Type_Enum[] = { { XML_STRAIGHT_LINE, 0 }, //SDRCAPT_TYPE1, { XML_ANGLED_LINE, 1 }, //SDRCAPT_TYPE2, diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index eb1e9e91479c..413694a873eb 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -195,8 +195,8 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[]; // enum maps for attributes -extern SvXMLEnumMapEntry aXML_ConnectionKind_EnumMap[]; -extern SvXMLEnumMapEntry aXML_CircleKind_EnumMap[]; +extern SvXMLEnumMapEntry const aXML_ConnectionKind_EnumMap[]; +extern SvXMLEnumMapEntry const aXML_CircleKind_EnumMap[]; /** contains the attribute to property mapping for a drawing layer table */ extern const XMLPropertyMapEntry aXMLTableShapeAttributes[]; diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx index ca96939581b0..337103586c07 100644 --- a/xmloff/source/style/PageMasterPropHdlFactory.cxx +++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx @@ -31,7 +31,7 @@ using namespace ::xmloff::token; using namespace ::com::sun::star; -SvXMLEnumMapEntry aXML_TextGridMode_ConstantMap[] = +static SvXMLEnumMapEntry const aXML_TextGridMode_ConstantMap[] = { { XML_NONE, text::TextGridMode::NONE }, { XML_LINE, text::TextGridMode::LINES }, diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx index 3e9fd918f2f3..1851dc0e038a 100644 --- a/xmloff/source/style/prhdlfac.cxx +++ b/xmloff/source/style/prhdlfac.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -SvXMLEnumMapEntry aXML_ColorMode_EnumMap[] = +static SvXMLEnumMapEntry const aXML_ColorMode_EnumMap[] = { { XML_GREYSCALE, drawing::ColorMode_GREYS }, { XML_MONO, drawing::ColorMode_MONO }, @@ -64,7 +64,7 @@ SvXMLEnumMapEntry aXML_ColorMode_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const aXML_HorizontalAdjust_Enum[] = +static SvXMLEnumMapEntry const aXML_HorizontalAdjust_Enum[] = { { XML_LEFT, text::HorizontalAdjust_LEFT }, { XML_CENTER, text::HorizontalAdjust_CENTER }, @@ -75,7 +75,7 @@ SvXMLEnumMapEntry const aXML_HorizontalAdjust_Enum[] = // aXML_WritingDirection_Enum is used with and without 'page' // attribute, so you'll find uses of aXML_WritingDirection_Enum // directly, as well as &(aXML_WritingDirection_Enum[1]) -SvXMLEnumMapEntry const aXML_WritingDirection_Enum[] = +static SvXMLEnumMapEntry const aXML_WritingDirection_Enum[] = { // aXML_WritingDirection_Enum { XML_PAGE, text::WritingMode2::PAGE }, diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index 26276357a868..f6112e435bcb 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star::style; using namespace ::com::sun::star::text; using namespace ::xmloff::token; -SvXMLEnumMapEntry const pXML_HoriPos_Enum[] = +static SvXMLEnumMapEntry const pXML_HoriPos_Enum[] = { { XML_FROM_LEFT, HoriOrientation::NONE }, { XML_FROM_INSIDE, HoriOrientation::NONE }, // import only @@ -64,7 +64,7 @@ SvXMLEnumMapEntry const pXML_HoriPos_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_HoriPosMirrored_Enum[] = +static SvXMLEnumMapEntry const pXML_HoriPosMirrored_Enum[] = { { XML_FROM_INSIDE, HoriOrientation::NONE }, { XML_INSIDE, HoriOrientation::LEFT }, @@ -73,7 +73,7 @@ SvXMLEnumMapEntry const pXML_HoriPosMirrored_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_HoriRel_Enum[] = +static SvXMLEnumMapEntry const pXML_HoriRel_Enum[] = { { XML_PARAGRAPH, RelOrientation::FRAME }, { XML_PARAGRAPH_CONTENT, RelOrientation::PRINT_AREA }, @@ -91,7 +91,7 @@ SvXMLEnumMapEntry const pXML_HoriRel_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_HoriRelFrame_Enum[] = +static SvXMLEnumMapEntry const pXML_HoriRelFrame_Enum[] = { { XML_FRAME, RelOrientation::FRAME }, { XML_FRAME_CONTENT, RelOrientation::PRINT_AREA }, @@ -105,7 +105,7 @@ SvXMLEnumMapEntry const pXML_HoriRelFrame_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_HoriMirror_Enum[] = +static SvXMLEnumMapEntry const pXML_HoriMirror_Enum[] = { { XML_FROM_LEFT, sal_False }, { XML_FROM_INSIDE, sal_True }, @@ -117,7 +117,7 @@ SvXMLEnumMapEntry const pXML_HoriMirror_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_VertPos_Enum[] = +static SvXMLEnumMapEntry const pXML_VertPos_Enum[] = { { XML_FROM_TOP, VertOrientation::NONE }, { XML_TOP, VertOrientation::TOP }, @@ -133,7 +133,7 @@ SvXMLEnumMapEntry const pXML_VertPos_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_VertPosAtChar_Enum[] = +static SvXMLEnumMapEntry const pXML_VertPosAtChar_Enum[] = { { XML_FROM_TOP, VertOrientation::NONE }, { XML_TOP, VertOrientation::TOP }, @@ -148,7 +148,7 @@ SvXMLEnumMapEntry const pXML_VertPosAtChar_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_VertRel_Enum[] = +static SvXMLEnumMapEntry const pXML_VertRel_Enum[] = { { XML_PARAGRAPH, RelOrientation::FRAME }, { XML_PARAGRAPH_CONTENT, RelOrientation::PRINT_AREA }, @@ -163,7 +163,7 @@ SvXMLEnumMapEntry const pXML_VertRel_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_VertRelPage_Enum[] = +static SvXMLEnumMapEntry const pXML_VertRelPage_Enum[] = { { XML_PAGE, RelOrientation::FRAME }, { XML_PAGE_CONTENT, RelOrientation::PRINT_AREA }, @@ -172,14 +172,14 @@ SvXMLEnumMapEntry const pXML_VertRelPage_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_VertRelFrame_Enum[] = +static SvXMLEnumMapEntry const pXML_VertRelFrame_Enum[] = { { XML_FRAME, RelOrientation::FRAME }, { XML_FRAME_CONTENT, RelOrientation::PRINT_AREA }, { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_VertRelAsChar_Enum[] = +static SvXMLEnumMapEntry const pXML_VertRelAsChar_Enum[] = { { XML_BASELINE, VertOrientation::TOP }, { XML_BASELINE, VertOrientation::CENTER }, // export only @@ -193,7 +193,7 @@ SvXMLEnumMapEntry const pXML_VertRelAsChar_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_RubyAdjust_Enum[] = +static SvXMLEnumMapEntry const pXML_RubyAdjust_Enum[] = { { XML_LEFT, RubyAdjust_LEFT }, { XML_CENTER, RubyAdjust_CENTER }, @@ -203,7 +203,7 @@ SvXMLEnumMapEntry const pXML_RubyAdjust_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_FontRelief_Enum[] = +static SvXMLEnumMapEntry const pXML_FontRelief_Enum[] = { { XML_NONE, FontRelief::NONE }, { XML_ENGRAVED, FontRelief::ENGRAVED }, @@ -211,7 +211,7 @@ SvXMLEnumMapEntry const pXML_FontRelief_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] = +static SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] = { { XML_TOP, ParagraphVertAlign::TOP }, { XML_MIDDLE, ParagraphVertAlign::CENTER }, @@ -222,7 +222,7 @@ SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] = }; // OD 2004-05-05 #i28701# -SvXMLEnumMapEntry const pXML_WrapInfluenceOnPosition_Enum[] = +static SvXMLEnumMapEntry const pXML_WrapInfluenceOnPosition_Enum[] = { // Tokens have been renamed and <XML_ITERATIVE> has been added (#i35017#) { XML_ONCE_SUCCESSIVE, WrapInfluenceOnPosition::ONCE_SUCCESSIVE }, @@ -231,7 +231,7 @@ SvXMLEnumMapEntry const pXML_WrapInfluenceOnPosition_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry const pXML_FillStyle_Enum[] = +static SvXMLEnumMapEntry const pXML_FillStyle_Enum[] = { { XML_NONE, drawing::FillStyle_NONE }, { XML_SOLID, drawing::FillStyle_SOLID }, |