summaryrefslogtreecommitdiff
path: root/include/oox/drawingml
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-03-11 13:43:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-03-12 07:31:08 +0100
commit31bf558349d9ab2634e9a866edf79bc115d649ce (patch)
tree5bf9c60d40144bb4454ba7f1179a973383f1ba3c /include/oox/drawingml
parent469aea3b3b76926112d7b6fce212be2906842dc9 (diff)
Revert "loplugin:constfields in oox"
This reverts commit a84e3df74eecc8778e3d5be5dd80ad4ddb511edf. Now that we know that making fields has negative side effects like disabling assignment operator generation. Change-Id: I7b45b7ead281cf3a9202ca6aabc55ee5033e5331 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90332 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/oox/drawingml')
-rw-r--r--include/oox/drawingml/graphicshapecontext.hxx4
-rw-r--r--include/oox/drawingml/shape.hxx2
-rw-r--r--include/oox/drawingml/shapepropertymap.hxx12
3 files changed, 9 insertions, 9 deletions
diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx
index 14b49f23615c..655e15a31ea3 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -51,8 +51,8 @@ public:
virtual void onEndElement() override;
private:
- bool const mbEmbedShapesInChart;
- ::oox::core::ContextHandler2Helper* const mpParent;
+ bool mbEmbedShapesInChart;
+ ::oox::core::ContextHandler2Helper* mpParent;
};
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index f2f95224cf61..53290f0cbbdb 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -84,7 +84,7 @@ typedef std::shared_ptr<DiagramData> DiagramDataPtr;
struct ChartShapeInfo
{
OUString maFragmentPath; ///< Path to related XML stream, e.g. for charts.
- bool const mbEmbedShapes; ///< True = load chart shapes into chart, false = load into parent drawpage.
+ bool mbEmbedShapes; ///< True = load chart shapes into chart, false = load into parent drawpage.
explicit ChartShapeInfo( bool bEmbedShapes ) : mbEmbedShapes( bEmbedShapes ) {}
};
diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx
index cc55b24e8ceb..143807175512 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -81,11 +81,11 @@ typedef o3tl::enumarray<ShapeProperty, sal_Int32> ShapePropertyIds;
struct OOX_DLLPUBLIC ShapePropertyInfo
{
const ShapePropertyIds& mrPropertyIds;
- bool const mbNamedLineMarker; /// True = use named line marker instead of explicit line marker.
- bool const mbNamedLineDash; /// True = use named line dash instead of explicit line dash.
- bool const mbNamedFillGradient; /// True = use named fill gradient instead of explicit fill gradient.
- bool const mbNamedFillBitmap; /// True = use named fill bitmap instead of explicit fill bitmap.
- bool const mbNamedFillHatch; /// True = use named fill hatch instead of explicit fill hatch.
+ bool mbNamedLineMarker; /// True = use named line marker instead of explicit line marker.
+ bool mbNamedLineDash; /// True = use named line dash instead of explicit line dash.
+ bool mbNamedFillGradient; /// True = use named fill gradient instead of explicit fill gradient.
+ bool mbNamedFillBitmap; /// True = use named fill bitmap instead of explicit fill bitmap.
+ bool mbNamedFillHatch; /// True = use named fill hatch instead of explicit fill hatch.
static ShapePropertyInfo DEFAULT; /// Default property info (used as default parameter of other methods).
@@ -155,7 +155,7 @@ private:
private:
ModelObjectHelper& mrModelObjHelper;
- ShapePropertyInfo const maShapePropInfo;
+ ShapePropertyInfo maShapePropInfo;
};