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>

28 files changed, 67 insertions, 62 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
diff --git a/oox/qa/token/tokenmap-test.cxx b/oox/qa/token/tokenmap-test.cxx
index ce25d3f7a874..4f617189bbf4 100644
--- a/oox/qa/token/tokenmap-test.cxx
+++ b/oox/qa/token/tokenmap-test.cxx
@@ -31,7 +31,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
-    TokenMap const tokenMap;
+    TokenMap tokenMap;
 };
 
 void TokenmapTest::test_roundTrip()
diff --git a/oox/qa/unit/vba_compression.cxx b/oox/qa/unit/vba_compression.cxx
index 0ade756e363f..bfe241c5995c 100644
--- a/oox/qa/unit/vba_compression.cxx
+++ b/oox/qa/unit/vba_compression.cxx
@@ -67,7 +67,7 @@ private:
         return url.url;
     }
 
-    test::Directories const m_directories;
+    test::Directories m_directories;
 };
 
 namespace {
diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx
index 8268b9bb6277..34246a16548a 100644
--- a/oox/source/core/fastparser.cxx
+++ b/oox/source/core/fastparser.cxx
@@ -47,7 +47,7 @@ public:
                         ~InputStreamCloseGuard();
 private:
     Reference< XInputStream > mxInStream;
-    bool const          mbCloseStream;
+    bool                mbCloseStream;
 };
 
 InputStreamCloseGuard::InputStreamCloseGuard( const Reference< XInputStream >& rxInStream, bool bCloseStream ) :
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index d5a9a9866f13..6d9d7b4e6004 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -108,7 +108,7 @@ private:
     typedef ::std::pair< RecordInfo, ContextHandlerRef >    ContextInfo;
     typedef ::std::vector< ContextInfo >                    ContextInfoVec;
 
-    FragmentHandlerRef const mxHandler;
+    FragmentHandlerRef  mxHandler;
     ContextInfoVec      maStack;
 };
 
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index 8162e860f0dc..31b31083ab25 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -145,7 +145,7 @@ struct ConverterData
     XmlFilterBase&      mrFilter;
     ChartConverter&     mrConverter;
     Reference< XChartDocument > mxDoc;
-    awt::Size const          maSize;
+    awt::Size                maSize;
 
     explicit            ConverterData(
                             XmlFilterBase& rFilter,
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index a72652fdaf2b..1a43409dbea0 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -52,9 +52,9 @@ namespace {
 
 struct AutoFormatPatternEntry
 {
-    sal_Int32 const     mnColorToken;       /// Theme color token.
-    sal_Int32 const     mnModToken;         /// Color modification token.
-    sal_Int32 const     mnModValue;         /// Color modification value.
+    sal_Int32           mnColorToken;       /// Theme color token.
+    sal_Int32           mnModToken;         /// Color modification token.
+    sal_Int32           mnModValue;         /// Color modification value.
 };
 
 #define AUTOFORMAT_PATTERN_COLOR( color_token ) \
@@ -116,15 +116,15 @@ static const AutoFormatPatternEntry spAutoFormatPattern4[] =
 
 struct AutoFormatEntry
 {
-    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).
+    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).
     const AutoFormatPatternEntry* mpPattern;/// Color cycling pattern for data series.
-    bool const          mbFadedColor;       /// True = Faded color for data series.
+    bool                mbFadedColor;       /// True = Faded color for data series.
 };
 
 #define AUTOFORMAT_COLOR( first, last, themed_style, color_token ) \
@@ -393,13 +393,13 @@ const AutoFormatEntry* lclGetAutoFormatEntry( const AutoFormatEntry* pEntries, s
 
 struct AutoTextEntry
 {
-    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.
+    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.
 };
 
 #define AUTOTEXT_COLOR( first, last, themed_font, color_token, def_font_size, rel_font_size, bold ) \
@@ -508,7 +508,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 const          mbIsFrame;          /// True = object is a frame, false = object is a line.
+    bool                mbIsFrame;          /// True = object is a frame, false = object is a line.
     ObjectTypeFormatEntry(ObjectType eObjType, const ShapePropertyInfo& rPropInfo,
                                  const AutoFormatEntry* pAutoLines,
                                  const AutoFormatEntry* pAutoFills,
@@ -712,8 +712,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 const        maEnUsLocale;           /// Locale struct containing en-US.
-    Locale const        maFromLocale;           /// Empty locale struct.
+    Locale              maEnUsLocale;           /// Locale struct containing en-US.
+    Locale              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 202b30a619b2..6b391d7877a8 100644
--- a/oox/source/drawingml/clrscheme.cxx
+++ b/oox/source/drawingml/clrscheme.cxx
@@ -60,7 +60,7 @@ struct find_by_token
     }
 
 private:
-    sal_Int32 const m_token;
+    sal_Int32 m_token;
 };
 
 }
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index a0112ebc3da8..d77ae8a618d6 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -66,7 +66,7 @@ enum FormularCommand
 struct FormularCommandNameTable
 {
     const char*     pS;
-    FormularCommand const pE;
+    FormularCommand pE;
 };
 
 }
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index 73a72f4aef9a..3b5a5cc86ff1 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -37,7 +37,7 @@ public:
 
 private:
 
-    DiagramDataPtr const mpDataPtr;
+    DiagramDataPtr  mpDataPtr;
 };
 
 class DiagramLayoutFragmentHandler : public ::oox::core::FragmentHandler2
@@ -51,7 +51,7 @@ public:
 
 private:
 
-    DiagramLayoutPtr const mpDataPtr;
+    DiagramLayoutPtr    mpDataPtr;
 };
 
 class DiagramQStylesFragmentHandler : public ::oox::core::FragmentHandler2
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 859b3bc2884b..35080ea19332 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -213,7 +213,7 @@ private:
     static bool compareResult(sal_Int32 nOperator, sal_Int32 nFirst, sal_Int32 nSecond);
     sal_Int32 getNodeCount(const dgm::Point* pPresPoint) const;
 
-    bool const    mIsElse;
+    bool          mIsElse;
     IteratorAttr  maIter;
     ConditionAttr maCond;
 };
@@ -285,7 +285,7 @@ public:
         { return mpShapeTemplate; }
 
 private:
-    ShapePtr const mpShapeTemplate;
+    ShapePtr mpShapeTemplate;
 };
 
 typedef std::shared_ptr< ShapeAtom > ShapeAtomPtr;
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index 0eeebfce394f..9c8acd82846c 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -157,10 +157,10 @@ enum class PropType { Binary };
 
 struct PropInfo
 {
-    OUString const      maName;
-    PropType const      meType;
-    sal_uInt16 const    mnId;
-    sal_uInt32 const    mnSize;
+    OUString            maName;
+    PropType            meType;
+    sal_uInt16          mnId;
+    sal_uInt32          mnSize;
     explicit     PropInfo( const OUString& rName, PropType eType, sal_uInt16 nId, sal_uInt32 nSize ) :
                             maName( rName ), meType( eType ), mnId( nId ), mnSize( nSize ) {}
 };
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index 5b3d71a6d422..84f7da6a72f8 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -47,7 +47,7 @@ protected:
     virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 
 private:
-    OUString const m_aColorPropName;
+    OUString m_aColorPropName;
     Property m_aColorProp;
 };
 
diff --git a/oox/source/export/ColorPropertySet.hxx b/oox/source/export/ColorPropertySet.hxx
index 1ac05f5cf823..e1734422ac8c 100644
--- a/oox/source/export/ColorPropertySet.hxx
+++ b/oox/source/export/ColorPropertySet.hxx
@@ -75,10 +75,10 @@ protected:
 
 private:
     css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo;
-    OUString const   m_aColorPropName;
+    OUString         m_aColorPropName;
     ::Color          m_nColor;
-    bool const       m_bIsFillColor;
-    ::Color const    m_nDefaultColor;
+    bool             m_bIsFillColor;
+    ::Color          m_nDefaultColor;
 };
 
 } //  namespace chart
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index aecfe3948d33..1d0aed9ef442 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -157,7 +157,7 @@ public:
     }
 
 private:
-    OUString const m_aRole;
+    OUString m_aRole;
 };
 
 }
diff --git a/oox/source/helper/progressbar.cxx b/oox/source/helper/progressbar.cxx
index 07e5b437a68f..86170b47e66a 100644
--- a/oox/source/helper/progressbar.cxx
+++ b/oox/source/helper/progressbar.cxx
@@ -87,8 +87,8 @@ public:
 
 private:
     IProgressBar&       mrParentProgress;
-    double const        mfStartPos;
-    double const        mfLength;
+    double              mfStartPos;
+    double              mfLength;
     double              mfPosition;
     double              mfFreeStart;
 };
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 8ce93ea1ffa5..ebdf845310e5 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -661,7 +661,9 @@ ComCtlModelBase::ComCtlModelBase( sal_uInt32 nDataPartId5, sal_uInt32 nDataPartI
     mnFlags( 0 ),
     mnVersion( nVersion ),
     mnDataPartId5( nDataPartId5 ),
-    mnDataPartId6( nDataPartId6 )
+    mnDataPartId6( nDataPartId6 ),
+    mbCommonPart( true ),
+    mbComplexPart( true )
 {
 }
 
@@ -671,13 +673,15 @@ bool ComCtlModelBase::importBinaryModel( BinaryInputStream& rInStrm )
     if( importSizePart( rInStrm ) && readPartHeader( rInStrm, getDataPartId(), mnVersion ) )
     {
         // if flags part exists, the first int32 of the data part contains its size
-        sal_uInt32 nCommonPartSize = rInStrm.readuInt32();
+        sal_uInt32 nCommonPartSize = 0;
+        if (mbCommonPart)
+            nCommonPartSize = rInStrm.readuInt32();
         // implementations must read the exact amount of data, stream must point to its end afterwards
         importControlData( rInStrm );
         // read following parts
         if( !rInStrm.isEof() &&
-            importCommonPart( rInStrm, nCommonPartSize ) &&
-            importComplexPart( rInStrm ) )
+            (!mbCommonPart || importCommonPart( rInStrm, nCommonPartSize )) &&
+            (!mbComplexPart || importComplexPart( rInStrm )) )
         {
             return !rInStrm.isEof();
         }
@@ -687,7 +691,8 @@ bool ComCtlModelBase::importBinaryModel( BinaryInputStream& rInStrm )
 
 void ComCtlModelBase::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const
 {
-    rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, COMCTL_COMMON_ENABLED ) );
+    if( mbCommonPart )
+        rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, COMCTL_COMMON_ENABLED ) );
     ControlModelBase::convertProperties( rPropMap, rConv );
 }
 
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 93de727d5097..ec7dad6c181f 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -96,7 +96,7 @@ struct GUIDCNamePair
 struct IdCntrlData
 {
     sal_Int16 nId;
-    GUIDCNamePair const aData;
+    GUIDCNamePair aData;
 };
 
 const sal_Int16 TOGGLEBUTTON = -1;
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index f9fd84a8c44e..0eec7ad679bf 100644
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -79,7 +79,7 @@ private:
     Reference< XStream > mxTempFile;
     Reference< XOutputStream > mxOutStrm;
     Reference< XSeekable > mxSeekable;
-    OUString const      maElementName;
+    OUString            maElementName;
 };
 
 OleOutputStream::OleOutputStream( const Reference< XComponentContext >& rxContext,
diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx
index 9f02e709665a..03eac37b92ba 100644
--- a/oox/source/ppt/animvariantcontext.hxx
+++ b/oox/source/ppt/animvariantcontext.hxx
@@ -38,7 +38,7 @@ namespace oox { namespace ppt {
         virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
 
     private:
-        ::sal_Int32 const           mnElement;
+        ::sal_Int32                 mnElement;
         css::uno::Any&              maValue;
         ::oox::drawingml::Color     maColor;
     };
diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx
index 2ea704f5f1e5..61c00b92862e 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.hxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.hxx
@@ -30,7 +30,7 @@ public:
 private:
         const oox::ppt::SlidePersistPtr mpSlidePersistPtr;
         const oox::ppt::ShapeLocation   meShapeLocation;
-        oox::drawingml::ShapePtr const  mpGroupShapePtr;
+        oox::drawingml::ShapePtr        mpGroupShapePtr;
         oox::drawingml::ShapePtr        mpShapePtr;
 };
 
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 52e23b27aee9..361a6a68e72f 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -510,8 +510,8 @@ namespace oox::ppt {
             }
 
     private:
-        sal_Int32 const mnColorSpace;
-        sal_Int32 const mnDir;
+        sal_Int32 mnColorSpace;
+        sal_Int32 mnDir;
         bool mbHasByColor;
         AnimColor m_byColor;
         oox::drawingml::Color maToClr;
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
index abf4800172b6..7675a3be67a8 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
@@ -25,7 +25,7 @@ public:
     virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const AttributeList& rAttribs ) override;
 
 private:
-        oox::drawingml::ShapePtr const  mpGroupShapePtr;
+        oox::drawingml::ShapePtr        mpGroupShapePtr;
 };
 
 } }