summaryrefslogtreecommitdiff
path: root/oox/source/drawingml
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-12 17:12:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-15 07:56:21 +0200
commita84e3df74eecc8778e3d5be5dd80ad4ddb511edf (patch)
tree37c5f3584aab3fd520dbe0daf0950d7bbb3173c1 /oox/source/drawingml
parentfb1d3b580763a333bbbfe115d09e1b5cd8849675 (diff)
loplugin:constfields in oox
Change-Id: I1e110d193ebfa30ab1ab0d85bfb6dc409e341439 Reviewed-on: https://gerrit.libreoffice.org/61728 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox/source/drawingml')
-rw-r--r--oox/source/drawingml/chart/converterbase.cxx2
-rw-r--r--oox/source/drawingml/chart/objectformatter.cxx42
-rw-r--r--oox/source/drawingml/clrscheme.cxx2
-rw-r--r--oox/source/drawingml/customshapegeometry.cxx2
-rw-r--r--oox/source/drawingml/diagram/diagramfragmenthandler.hxx4
-rw-r--r--oox/source/drawingml/diagram/diagramlayoutatoms.hxx4
6 files changed, 28 insertions, 28 deletions
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index c5268af73a91..678c3a4ba630 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -146,7 +146,7 @@ struct ConverterData
XmlFilterBase& mrFilter;
ChartConverter& mrConverter;
Reference< XChartDocument > mxDoc;
- awt::Size maSize;
+ awt::Size const maSize;
explicit ConverterData(
XmlFilterBase& rFilter,
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 5b5f67b39d5b..2e13a0416e6a 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -53,9 +53,9 @@ namespace {
struct AutoFormatPatternEntry
{
- sal_Int32 mnColorToken; /// Theme color token.
- sal_Int32 mnModToken; /// Color modification token.
- sal_Int32 mnModValue; /// Color modification value.
+ sal_Int32 const mnColorToken; /// Theme color token.
+ sal_Int32 const mnModToken; /// Color modification token.
+ sal_Int32 const mnModValue; /// Color modification value.
};
#define AUTOFORMAT_PATTERN_COLOR( color_token ) \
@@ -117,15 +117,15 @@ static const AutoFormatPatternEntry spAutoFormatPattern4[] =
struct AutoFormatEntry
{
- sal_Int32 mnFirstStyleIdx; /// First chart style index.
- sal_Int32 mnLastStyleIdx; /// Last chart style index.
- sal_Int32 mnThemedIdx; /// Themed style index.
- sal_Int32 mnColorToken; /// Theme color token.
- sal_Int32 mnModToken; /// Color modification token.
- sal_Int32 mnModValue; /// Color modification value.
- sal_Int32 mnRelLineWidth; /// Relative line width (percent).
+ sal_Int32 const mnFirstStyleIdx; /// First chart style index.
+ sal_Int32 const mnLastStyleIdx; /// Last chart style index.
+ sal_Int32 const mnThemedIdx; /// Themed style index.
+ sal_Int32 const mnColorToken; /// Theme color token.
+ sal_Int32 const mnModToken; /// Color modification token.
+ sal_Int32 const mnModValue; /// Color modification value.
+ sal_Int32 const mnRelLineWidth; /// Relative line width (percent).
const AutoFormatPatternEntry* mpPattern;/// Color cycling pattern for data series.
- bool mbFadedColor; /// True = Faded color for data series.
+ bool const mbFadedColor; /// True = Faded color for data series.
};
#define AUTOFORMAT_COLOR( first, last, themed_style, color_token ) \
@@ -394,13 +394,13 @@ const AutoFormatEntry* lclGetAutoFormatEntry( const AutoFormatEntry* pEntries, s
struct AutoTextEntry
{
- sal_Int32 mnFirstStyleIdx; /// First chart style index.
- sal_Int32 mnLastStyleIdx; /// Last chart style index.
- sal_Int32 mnThemedFont; /// Themed font (minor/major).
- sal_Int32 mnColorToken; /// Theme color token.
- sal_Int32 mnDefFontSize; /// Default font size (1/100 points).
- sal_Int32 mnRelFontSize; /// Font size relative to chart global font (percent).
- bool mbBold; /// True = bold font.
+ sal_Int32 const mnFirstStyleIdx; /// First chart style index.
+ sal_Int32 const mnLastStyleIdx; /// Last chart style index.
+ sal_Int32 const mnThemedFont; /// Themed font (minor/major).
+ sal_Int32 const mnColorToken; /// Theme color token.
+ sal_Int32 const mnDefFontSize; /// Default font size (1/100 points).
+ sal_Int32 const mnRelFontSize; /// Font size relative to chart global font (percent).
+ bool const mbBold; /// True = bold font.
};
#define AUTOTEXT_COLOR( first, last, themed_font, color_token, def_font_size, rel_font_size, bold ) \
@@ -505,7 +505,7 @@ struct ObjectTypeFormatEntry
const AutoFormatEntry* mpAutoLines; /// Automatic line formatting for all chart styles.
const AutoFormatEntry* mpAutoFills; /// Automatic fill formatting for all chart styles.
const AutoTextEntry* mpAutoTexts; /// Automatic text attributes for all chart styles.
- bool mbIsFrame; /// True = object is a frame, false = object is a line.
+ bool const mbIsFrame; /// True = object is a frame, false = object is a line.
ObjectTypeFormatEntry(ObjectType eObjType, const ShapePropertyInfo& rPropInfo,
const AutoFormatEntry* pAutoLines,
const AutoFormatEntry* pAutoFills,
@@ -704,8 +704,8 @@ struct ObjectFormatterData
ModelObjectHelper maModelObjHelper; /// Helper for named drawing formatting (dashes, gradients, bitmaps).
Reference< XNumberFormats > mxNumFmts; /// Number formats collection of container document.
Reference< XNumberFormatTypes > mxNumTypes; /// Number format types collection of container document.
- Locale maEnUsLocale; /// Locale struct containing en-US.
- Locale maFromLocale; /// Empty locale struct.
+ Locale const maEnUsLocale; /// Locale struct containing en-US.
+ Locale const maFromLocale; /// Empty locale struct.
sal_Int32 mnMaxSeriesIdx; /// Maximum series index used for color cycling/fading.
explicit ObjectFormatterData(
diff --git a/oox/source/drawingml/clrscheme.cxx b/oox/source/drawingml/clrscheme.cxx
index 8e2272f0039b..47d9426e0646 100644
--- a/oox/source/drawingml/clrscheme.cxx
+++ b/oox/source/drawingml/clrscheme.cxx
@@ -58,7 +58,7 @@ struct find_by_token
}
private:
- sal_Int32 m_token;
+ sal_Int32 const m_token;
};
bool ClrScheme::getColor( sal_Int32 nSchemeClrToken, ::Color& rColor ) const
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index bc4582cb7276..deeff8ee4837 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -63,7 +63,7 @@ enum FormularCommand
struct FormularCommandNameTable
{
const char* pS;
- FormularCommand pE;
+ FormularCommand const pE;
};
static const FormularCommandNameTable pFormularCommandNameTable[] =
{
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index 7783fdfd8f3c..80537f5f7eac 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -36,7 +36,7 @@ public:
private:
- DiagramDataPtr mpDataPtr;
+ DiagramDataPtr const mpDataPtr;
};
class DiagramLayoutFragmentHandler : public ::oox::core::FragmentHandler2
@@ -50,7 +50,7 @@ public:
private:
- DiagramLayoutPtr mpDataPtr;
+ DiagramLayoutPtr const mpDataPtr;
};
class DiagramQStylesFragmentHandler : public ::oox::core::FragmentHandler2
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 5ab34b042c86..606e8794becc 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -184,7 +184,7 @@ private:
const dgm::Point* getPresNode() const;
sal_Int32 getNodeCount() const;
- bool mIsElse;
+ bool const mIsElse;
IteratorAttr maIter;
ConditionAttr maCond;
};
@@ -260,7 +260,7 @@ public:
{ return mpShapeTemplate; }
private:
- ShapePtr mpShapeTemplate;
+ ShapePtr const mpShapeTemplate;
};
typedef std::shared_ptr< ShapeAtom > ShapeAtomPtr;