[Libreoffice-commits] core.git: xmloff/source

[Takeshi Abe]

 xmloff/source/chart/SchXMLAxisContext.cxx        |    6 +++---
 xmloff/source/chart/SchXMLEnumConverter.cxx      |    4 ++--
 xmloff/source/chart/SchXMLLegendContext.cxx      |    2 +-
 xmloff/source/chart/SchXMLTools.cxx              |    4 ++--
 xmloff/source/chart/XMLSymbolImageContext.cxx    |    2 +-
 xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx |    4 ++--
 xmloff/source/core/ProgressBarHelper.cxx         |    2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 2ee4a04d61de32003d1895ac157ae97db7dd36c8
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Sun Sep 29 21:22:42 2013 +0900

    Mark as const / static
    
    Change-Id: Ib88b9e5533e56bb8b0b05c4e668299b033f17ffb

diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index 806b4a3..128ff2b 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -245,7 +245,7 @@ enum AxisAttributeTokens
     XML_TOK_AXIS_TYPE_EXT
 };
 
-SvXMLTokenMapEntry aAxisAttributeTokenMap[] =
+const SvXMLTokenMapEntry aAxisAttributeTokenMap[] =
 {
     { XML_NAMESPACE_CHART,      XML_DIMENSION,  XML_TOK_AXIS_DIMENSION      },
     { XML_NAMESPACE_CHART,      XML_NAME,       XML_TOK_AXIS_NAME           },
@@ -602,7 +602,7 @@ enum AxisChildTokens
     XML_TOK_AXIS_DATE_SCALE_EXT
 };
 
-SvXMLTokenMapEntry aAxisChildTokenMap[] =
+const SvXMLTokenMapEntry aAxisChildTokenMap[] =
 {
     { XML_NAMESPACE_CHART,      XML_TITLE,              XML_TOK_AXIS_TITLE          },
     { XML_NAMESPACE_CHART,      XML_CATEGORIES,         XML_TOK_AXIS_CATEGORIES     },
@@ -906,7 +906,7 @@ enum DateScaleAttributeTokens
     XML_TOK_DATESCALE_MINOR_INTERVAL_UNIT
 };
 
-SvXMLTokenMapEntry aDateScaleAttributeTokenMap[] =
+const SvXMLTokenMapEntry aDateScaleAttributeTokenMap[] =
 {
     { XML_NAMESPACE_CHART,  XML_BASE_TIME_UNIT,         XML_TOK_DATESCALE_BASE_TIME_UNIT  },
     { XML_NAMESPACE_CHART,  XML_MAJOR_INTERVAL_VALUE,   XML_TOK_DATESCALE_MAJOR_INTERVAL_VALUE  },
diff --git a/xmloff/source/chart/SchXMLEnumConverter.cxx b/xmloff/source/chart/SchXMLEnumConverter.cxx
index 8e1e5da..c526129 100644
--- a/xmloff/source/chart/SchXMLEnumConverter.cxx
+++ b/xmloff/source/chart/SchXMLEnumConverter.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star;
 namespace
 {
 
-SvXMLEnumMapEntry aXMLLegendPositionEnumMap[] =
+const SvXMLEnumMapEntry aXMLLegendPositionEnumMap[] =
 {
     { XML_START,    chart::ChartLegendPosition_LEFT     },
     { XML_TOP,      chart::ChartLegendPosition_TOP      },
@@ -53,7 +53,7 @@ struct TheLegendPositionPropertyHdl : public rtl::Static< XMLLegendPositionPrope
 {
 };
 
-SvXMLEnumMapEntry aXMLLegendExpansionEnumMap[] =
+const SvXMLEnumMapEntry aXMLLegendExpansionEnumMap[] =
 {
     { XML_WIDE,        chart::ChartLegendExpansion_WIDE },
     { XML_HIGH,        chart::ChartLegendExpansion_HIGH },
diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx
index 592167c..bfb122f 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -52,7 +52,7 @@ enum LegendAttributeTokens
     XML_TOK_LEGEND_HEIGHT_EXT
 };
 
-SvXMLTokenMapEntry aLegendAttributeTokenMap[] =
+const SvXMLTokenMapEntry aLegendAttributeTokenMap[] =
 {
     { XML_NAMESPACE_CHART,      XML_LEGEND_POSITION,    XML_TOK_LEGEND_POSITION     },
     { XML_NAMESPACE_SVG,        XML_X,                  XML_TOK_LEGEND_X            },
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index b3c8660..e6242d6 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -130,7 +130,7 @@ Reference< chart2::data::XDataSequence > lcl_createNewSequenceFromCachedXMLRange
 namespace SchXMLTools
 {
 
-static SvXMLEnumMapEntry aXMLChartClassMap[] =
+static const SvXMLEnumMapEntry aXMLChartClassMap[] =
 {
     { XML_LINE,         XML_CHART_CLASS_LINE    },
     { XML_AREA,         XML_CHART_CLASS_AREA    },
@@ -161,7 +161,7 @@ typedef ::comphelper::MakeMap< OUString, OUString > tMakeStringStringMap;
 const tMakeStringStringMap& lcl_getChartTypeNameMap()
 {
     //shape property -- chart model object property
-    static tMakeStringStringMap g_aChartTypeNameMap =
+    static const tMakeStringStringMap g_aChartTypeNameMap =
         tMakeStringStringMap
         ( OUString( "com.sun.star.chart.LineDiagram" )
         , OUString( "com.sun.star.chart2.LineChartType" ) )
diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx
index d57534f..1ee0458 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.cxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.cxx
@@ -39,7 +39,7 @@ enum SvXMLTokenMapAttrs
     XML_TOK_SYMBOL_IMAGE_END = XML_TOK_UNKNOWN
 };
 
-static SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] =
+static const SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] =
 {
     { XML_NAMESPACE_XLINK,  ::xmloff::token::XML_HREF,     XML_TOK_SYMBOL_IMAGE_HREF    },
     { XML_NAMESPACE_XLINK,  ::xmloff::token::XML_TYPE,     XML_TOK_SYMBOL_IMAGE_TYPE    },
diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
index 6d80ec8..7f6881e 100644
--- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
+++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
@@ -32,7 +32,7 @@ struct SvXMLSignedEnumMapEntry
     sal_Int32                       nValue;
 };
 
-SvXMLSignedEnumMapEntry aXMLChartSymbolTypeEnumMap[] =
+const SvXMLSignedEnumMapEntry aXMLChartSymbolTypeEnumMap[] =
 {
     { XML_NONE,                -3 },
     { XML_AUTOMATIC,           -2 },
@@ -40,7 +40,7 @@ SvXMLSignedEnumMapEntry aXMLChartSymbolTypeEnumMap[] =
     { XML_TOKEN_INVALID,        0 }
 };
 
-SvXMLSignedEnumMapEntry aXMLChartSymbolNameMap[] =
+const SvXMLSignedEnumMapEntry aXMLChartSymbolNameMap[] =
 {
     { XML_GRADIENTSTYLE_SQUARE, 0 },  // "square"
     { XML_DIAMOND,              1 },
diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx
index 4c7b8fd..e201351 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -25,7 +25,7 @@
 
 using namespace ::com::sun::star;
 
-const sal_Int32 nDefaultProgressBarRange = 1000000;
+static const sal_Int32 nDefaultProgressBarRange = 1000000;
 
 ProgressBarHelper::ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xTempStatusIndicator,
                                     const sal_Bool bTempStrict)