summaryrefslogtreecommitdiff
path: root/xmloff/source/style
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2013-07-18 22:16:42 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2013-07-18 22:18:25 +0900
commita2e599f16ba253c706aa84d0a17f2936f78c3892 (patch)
tree11c78b5b134392de9f27dc6f0d3ff8adb3a557f3 /xmloff/source/style
parent90e3d0fef329917218ffb121179e06ab73ff01a5 (diff)
Mark as static and/or const
Change-Id: I45a890bb793a6d92546c05bd75738d4dd753a01e
Diffstat (limited to 'xmloff/source/style')
-rw-r--r--xmloff/source/style/GradientStyle.cxx2
-rw-r--r--xmloff/source/style/HatchStyle.cxx2
-rw-r--r--xmloff/source/style/ImageStyle.cxx2
-rw-r--r--xmloff/source/style/TransGradientStyle.cxx2
-rw-r--r--xmloff/source/style/XMLBackgroundImageContext.cxx8
-rw-r--r--xmloff/source/style/XMLFontStylesContext.cxx2
-rw-r--r--xmloff/source/style/xmlnumfi.cxx18
-rw-r--r--xmloff/source/style/xmlnumi.cxx6
8 files changed, 21 insertions, 21 deletions
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index bc200d8ef6a2..435040f756ea 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -104,7 +104,7 @@ sal_Bool XMLGradientStyleImport::importXML(
aGradient.Border = 0;
{
- static SvXMLTokenMapEntry aGradientAttrTokenMap[] =
+ static const SvXMLTokenMapEntry aGradientAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_GRADIENT_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_GRADIENT_DISPLAY_NAME },
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index 5d852c952d9d..c42e6a3db026 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -93,7 +93,7 @@ sal_Bool XMLHatchStyleImport::importXML(
aHatch.Angle = 0;
{
- static SvXMLTokenMapEntry aHatchAttrTokenMap[] =
+ static const SvXMLTokenMapEntry aHatchAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_HATCH_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_HATCH_DISPLAY_NAME },
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index de3bfc8f3e8f..df8dd0ab7dde 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -119,7 +119,7 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute
OUString aDisplayName;
{
- static SvXMLTokenMapEntry aHatchAttrTokenMap[] =
+ static const SvXMLTokenMapEntry aHatchAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_IMAGE_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_IMAGE_DISPLAY_NAME },
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 41ab751b8b28..93a66e8dd77d 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -100,7 +100,7 @@ sal_Bool XMLTransGradientStyleImport::importXML(
aGradient.Border = 0;
{
- static SvXMLTokenMapEntry aTrGradientAttrTokenMap[] =
+ static const SvXMLTokenMapEntry aTrGradientAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_GRADIENT_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_GRADIENT_DISPLAY_NAME },
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx
index aba949681f76..7f63244ad23e 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -54,7 +54,7 @@ enum SvXMLTokenMapAttrs
};
static const SvXMLTokenMapEntry* lcl_getBGImgAttributesAttrTokenMap()
{
- static SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
+ static const SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF },
{ XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE },
@@ -71,14 +71,14 @@ static const SvXMLTokenMapEntry* lcl_getBGImgAttributesAttrTokenMap()
-static SvXMLEnumMapEntry psXML_BrushHoriPos[] =
+static const SvXMLEnumMapEntry psXML_BrushHoriPos[] =
{
{ XML_LEFT, GraphicLocation_LEFT_MIDDLE },
{ XML_RIGHT, GraphicLocation_RIGHT_MIDDLE },
{ XML_TOKEN_INVALID, 0 }
};
-static SvXMLEnumMapEntry psXML_BrushVertPos[] =
+static const SvXMLEnumMapEntry psXML_BrushVertPos[] =
{
{ XML_TOP, GraphicLocation_MIDDLE_TOP },
{ XML_BOTTOM, GraphicLocation_MIDDLE_BOTTOM },
@@ -287,7 +287,7 @@ void XMLBackgroundImageContext::ProcessAttrs(
case XML_TOK_BGIMG_REPEAT:
{
sal_uInt16 nPos = GraphicLocation_NONE;
- static SvXMLEnumMapEntry psXML_BrushRepeat[] =
+ static const SvXMLEnumMapEntry psXML_BrushRepeat[] =
{
{ XML_BACKGROUND_REPEAT, GraphicLocation_TILED },
{ XML_BACKGROUND_NO_REPEAT, GraphicLocation_MIDDLE_MIDDLE },
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index 4887f013940e..95b4a86f7f4b 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -61,7 +61,7 @@ enum XMLFontStyleAttrTokens
static const SvXMLTokenMapEntry* lcl_getFontStyleAttrTokenMap()
{
- static SvXMLTokenMapEntry aFontStyleAttrTokenMap[] =
+ static const SvXMLTokenMapEntry aFontStyleAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_FONT_FAMILY,
XML_TOK_FONT_STYLE_ATTR_FAMILY },
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 5d7a98cab75e..32ca705884f9 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -309,7 +309,7 @@ enum SvXMLStyleElemAttrTokens
#define XML_NUMF_COLORCOUNT 10
-static ColorData aNumFmtStdColors[XML_NUMF_COLORCOUNT] =
+static const ColorData aNumFmtStdColors[XML_NUMF_COLORCOUNT] =
{
COL_BLACK,
COL_LIGHTBLUE,
@@ -329,14 +329,14 @@ static ColorData aNumFmtStdColors[XML_NUMF_COLORCOUNT] =
// maps for SvXMLUnitConverter::convertEnum
-static SvXMLEnumMapEntry aStyleValueMap[] =
+static const SvXMLEnumMapEntry aStyleValueMap[] =
{
{ XML_SHORT, sal_False },
{ XML_LONG, sal_True },
{ XML_TOKEN_INVALID, 0 }
};
-static SvXMLEnumMapEntry aFormatSourceMap[] =
+static const SvXMLEnumMapEntry aFormatSourceMap[] =
{
{ XML_FIXED, sal_False },
{ XML_LANGUAGE, sal_True },
@@ -358,7 +358,7 @@ struct SvXMLDefaultDateFormat
sal_Bool bSystem;
};
-static SvXMLDefaultDateFormat aDefaultDateFormats[] =
+static const SvXMLDefaultDateFormat aDefaultDateFormats[] =
{
// format day-of-week day month year hours minutes seconds format-source
@@ -490,7 +490,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStylesElemTokenMap()
{
if( !pStylesElemTokenMap )
{
- static SvXMLTokenMapEntry aStylesElemMap[] =
+ static const SvXMLTokenMapEntry aStylesElemMap[] =
{
// style elements
{ XML_NAMESPACE_NUMBER, XML_NUMBER_STYLE, XML_TOK_STYLES_NUMBER_STYLE },
@@ -512,7 +512,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleElemTokenMap()
{
if( !pStyleElemTokenMap )
{
- static SvXMLTokenMapEntry aStyleElemMap[] =
+ static const SvXMLTokenMapEntry aStyleElemMap[] =
{
// elements in a style
{ XML_NAMESPACE_NUMBER, XML_TEXT, XML_TOK_STYLE_TEXT },
@@ -548,7 +548,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleAttrTokenMap()
{
if( !pStyleAttrTokenMap )
{
- static SvXMLTokenMapEntry aStyleAttrMap[] =
+ static const SvXMLTokenMapEntry aStyleAttrMap[] =
{
// attributes for a style
{ XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_STYLE_ATTR_NAME },
@@ -579,7 +579,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleElemAttrTokenMap()
{
if( !pStyleElemAttrTokenMap )
{
- static SvXMLTokenMapEntry aStyleElemAttrMap[] =
+ static const SvXMLTokenMapEntry aStyleElemAttrMap[] =
{
// attributes for an element within a style
{ XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES, XML_TOK_ELEM_ATTR_DECIMAL_PLACES },
@@ -1267,7 +1267,7 @@ sal_uInt16 SvXMLNumFmtDefaults::GetDefaultDateFormat( SvXMLDateElementAttributes
SvXMLDateElementAttributes eMins, SvXMLDateElementAttributes eSecs,
sal_Bool bSystem )
{
- const sal_uInt16 nCount = sizeof(aDefaultDateFormats) / sizeof(SvXMLDefaultDateFormat);
+ static const sal_uInt16 nCount = sizeof(aDefaultDateFormats) / sizeof(SvXMLDefaultDateFormat);
for (sal_uInt16 nPos=0; nPos<nCount; nPos++)
{
const SvXMLDefaultDateFormat& rEntry = aDefaultDateFormats[nPos];
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index b4ac805eda1e..88b65a18d4bf 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -126,7 +126,7 @@ enum SvxXMLTextListLevelStyleAttrTokens
static const SvXMLTokenMapEntry* lcl_getLevelAttrTokenMap()
{
- static SvXMLTokenMapEntry aLevelAttrTokenMap[] =
+ static const SvXMLTokenMapEntry aLevelAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_LEVEL, XML_TOK_TEXT_LEVEL_ATTR_LEVEL },
{ XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_TEXT_LEVEL_ATTR_STYLE_NAME },
@@ -626,7 +626,7 @@ enum SvxXMLStyleAttributesAttrTokens
};
static const SvXMLTokenMapEntry* lcl_getStyleAttributesAttrTokenMap()
{
- static SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] =
+ static const SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_SPACE_BEFORE,
XML_TOK_STYLE_ATTRIBUTES_ATTR_SPACE_BEFORE },
@@ -949,7 +949,7 @@ enum SvxXMLStyleAttributesLabelAlignmentAttrTokens
};
static const SvXMLTokenMapEntry* lcl_getStyleAlignmentAttributesAttrTokenMap()
{
- static SvXMLTokenMapEntry aStyleAlignmentAttributesAttrTokenMap[] =
+ static const SvXMLTokenMapEntry aStyleAlignmentAttributesAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_LABEL_FOLLOWED_BY,
XML_TOK_STYLE_ATTRIBUTES_ATTR_LABEL_FOLLOWED_BY },