diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-11 13:43:39 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-12 07:31:08 +0100 |
commit | 31bf558349d9ab2634e9a866edf79bc115d649ce (patch) | |
tree | 5bf9c60d40144bb4454ba7f1179a973383f1ba3c /oox/inc | |
parent | 469aea3b3b76926112d7b6fce212be2906842dc9 (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 'oox/inc')
-rw-r--r-- | oox/inc/drawingml/chart/axismodel.hxx | 2 | ||||
-rw-r--r-- | oox/inc/drawingml/chart/chartdrawingfragment.hxx | 4 | ||||
-rw-r--r-- | oox/inc/drawingml/chart/titlemodel.hxx | 2 | ||||
-rw-r--r-- | oox/inc/drawingml/chart/typegroupmodel.hxx | 2 | ||||
-rw-r--r-- | oox/inc/drawingml/clrschemecontext.hxx | 2 | ||||
-rw-r--r-- | oox/inc/drawingml/transform2dcontext.hxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/oox/inc/drawingml/chart/axismodel.hxx b/oox/inc/drawingml/chart/axismodel.hxx index 8f1f9046aed8..afa097d72e11 100644 --- a/oox/inc/drawingml/chart/axismodel.hxx +++ b/oox/inc/drawingml/chart/axismodel.hxx @@ -81,7 +81,7 @@ struct AxisModel sal_Int32 mnTickLabelPos; /// Position of tick mark labels relative to the axis. sal_Int32 mnTickLabelSkip; /// Number of tick mark labels to skip. sal_Int32 mnTickMarkSkip; /// Number of tick marks to skip. - sal_Int32 const mnTypeId; /// Type identifier of this axis. + sal_Int32 mnTypeId; /// Type identifier of this axis. bool mbAuto; /// True = automatic selection of text/date axis type. bool mbDeleted; /// True = axis has been deleted manually. bool mbNoMultiLevel; /// True = no multi-level categories supported. diff --git a/oox/inc/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/drawingml/chart/chartdrawingfragment.hxx index bc030a78d574..8392999fa798 100644 --- a/oox/inc/drawingml/chart/chartdrawingfragment.hxx +++ b/oox/inc/drawingml/chart/chartdrawingfragment.hxx @@ -67,7 +67,7 @@ private: AnchorPosModel maFrom; /// Top-left position relative to chart object. AnchorPosModel maTo; /// Bottom-right position relative to chart object. AnchorSizeModel maSize; /// Shape size, if anchor has absolute size. - bool const mbRelSize; /// True = relative size, false = absolute size. + bool mbRelSize; /// True = relative size, false = absolute size. }; /** Handler for a chart drawing fragment (c:userShapes root element). @@ -94,7 +94,7 @@ private: ::oox::drawingml::ShapePtr mxShape; /// Current top-level shape. std::shared_ptr< ShapeAnchor > mxAnchor; /// Current anchor of top-level shape. EmuRectangle maChartRectEmu; /// Position and size of the chart object for embedded shapes (in EMUs). - bool const mbOleSupport; /// True = allow to insert OLE objects into the drawing page. + bool mbOleSupport; /// True = allow to insert OLE objects into the drawing page. }; diff --git a/oox/inc/drawingml/chart/titlemodel.hxx b/oox/inc/drawingml/chart/titlemodel.hxx index f069c7697a60..c31b8d34ba73 100644 --- a/oox/inc/drawingml/chart/titlemodel.hxx +++ b/oox/inc/drawingml/chart/titlemodel.hxx @@ -51,7 +51,7 @@ struct TitleModel LayoutRef mxLayout; /// Layout/position of the frame. TextRef mxText; /// Text source of the title. bool mbOverlay; /// True = title may overlay other objects. - sal_Int32 const mnDefaultRotation; + sal_Int32 mnDefaultRotation; explicit TitleModel(sal_Int32 nDefaultRotation = 0); ~TitleModel(); diff --git a/oox/inc/drawingml/chart/typegroupmodel.hxx b/oox/inc/drawingml/chart/typegroupmodel.hxx index 0803bf4e7a82..7da97c39e578 100644 --- a/oox/inc/drawingml/chart/typegroupmodel.hxx +++ b/oox/inc/drawingml/chart/typegroupmodel.hxx @@ -69,7 +69,7 @@ struct TypeGroupModel sal_Int32 mnShape; /// 3D bar shape type. sal_Int32 mnSizeRepresents; /// Bubble size represents area or width. sal_Int32 mnSplitType; /// Split type in pie-to charts. - sal_Int32 const mnTypeId; /// Chart type identifier. + sal_Int32 mnTypeId; /// Chart type identifier. bool mbBubble3d; /// True = show bubbles with 3D shade. bool mbShowMarker; /// True = show point markers in line charts. bool mbShowNegBubbles; /// True = show absolute value of negative bubbles. diff --git a/oox/inc/drawingml/clrschemecontext.hxx b/oox/inc/drawingml/clrschemecontext.hxx index 0525dc45b71f..d6cc3f350536 100644 --- a/oox/inc/drawingml/clrschemecontext.hxx +++ b/oox/inc/drawingml/clrschemecontext.hxx @@ -42,7 +42,7 @@ public: private: ClrScheme& mrClrScheme; - sal_Int32 const mnColorToken; + sal_Int32 mnColorToken; }; class clrSchemeContext final : public oox::core::ContextHandler2 diff --git a/oox/inc/drawingml/transform2dcontext.hxx b/oox/inc/drawingml/transform2dcontext.hxx index a4b3ac9d32b3..eb772ee7419e 100644 --- a/oox/inc/drawingml/transform2dcontext.hxx +++ b/oox/inc/drawingml/transform2dcontext.hxx @@ -37,7 +37,7 @@ public: private: Shape& mrShape; - bool const mbtxXfrm; + bool mbtxXfrm; }; } // namespace drawingml |