Revert "loplugin:constfields in writerfilter"

This reverts commit e7c6c05ae5a62e1705ffda97c5405eecd1f62a1e.

Change-Id: I9072c4ef9c1a941ac3169e2b53dfd25ae7863770
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90545
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

25 files changed, 66 insertions, 66 deletions

diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 97bc7802973f..6eec32327a14 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -51,7 +51,7 @@ private:
     sal_Int32       m_nLineColor;
     sal_Int32       m_nLineDistance;
     bool            m_bShadow;
-    bool const      m_bOOXML;
+    bool            m_bOOXML;
 
     o3tl::enumarray<BorderPosition, bool> m_aFilledLines;
     o3tl::enumarray<BorderPosition, css::table::BorderLine2> m_aBorderLines;
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 9733a3fd908c..142b7817cc37 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -42,8 +42,8 @@ struct TableInfo;
 /// A horizontally merged cell is in fact a range of cells till its merge is performed.
 struct HorizontallyMergedCell
 {
-    sal_Int32 const m_nFirstRow;
-    sal_Int32 const m_nFirstCol;
+    sal_Int32 m_nFirstRow;
+    sal_Int32 m_nFirstCol;
     sal_Int32 m_nLastRow;
     sal_Int32 m_nLastCol;
     HorizontallyMergedCell(sal_Int32 nFirstRow, sal_Int32 nFirstCol)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 919ea9c195f7..3e87fcb0a2b5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -170,7 +170,7 @@ namespace {
 struct FieldConversion
 {
     const char*     cFieldServiceName;
-    FieldId const   eFieldId;
+    FieldId         eFieldId;
 };
 
 }
@@ -225,7 +225,7 @@ static bool IsFieldNestingAllowed(const FieldContextPtr& pOuter, const FieldCont
 
 uno::Any FloatingTableInfo::getPropertyValue(const OUString &propertyName)
 {
-    for( beans::PropertyValue const & propVal : m_aFrameProperties )
+    for( beans::PropertyValue const & propVal : std::as_const(m_aFrameProperties) )
         if( propVal.Name == propertyName )
             return propVal.Value ;
     return uno::Any() ;
@@ -3038,8 +3038,8 @@ static sal_Int16 lcl_ParseNumberingType( const OUString& rCommand )
         //todo: might make sense to hash this list, too
         struct NumberingPairs
         {
-            const char*     cWordName;
-            sal_Int16 const nType;
+            const sal_Char* cWordName;
+            sal_Int16 nType;
         };
         static const NumberingPairs aNumberingPairs[] =
         {
@@ -4071,9 +4071,9 @@ void DomainMapper_Impl::handleAuthor
     constexpr sal_uInt8 SET_DATE = 0x04;
     struct DocPropertyMap
     {
-        const char*     pDocPropertyName;
-        const char*     pServiceName;
-        sal_uInt8 const nFlags;
+        const sal_Char* pDocPropertyName;
+        const sal_Char* pServiceName;
+        sal_uInt8       nFlags;
     };
     static const DocPropertyMap aDocProperties[] =
     {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 154bd0bbc840..e6654a1ce0a1 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -132,7 +132,7 @@ enum class SkipFootnoteSeparator
  */
 class HeaderFooterContext
 {
-    bool const m_bTextInserted;
+    bool      m_bTextInserted;
     sal_Int32 m_nTableDepth;
 
 public:
@@ -283,7 +283,7 @@ struct DeletableTabStop : public css::style::TabStop
 /// helper to remember bookmark start position
 struct BookmarkInsertPosition
 {
-    bool const                                                       m_bIsStartOfText;
+    bool                                                             m_bIsStartOfText;
     OUString                                                         m_sBookmarkName;
     css::uno::Reference<css::text::XTextRange> m_xTextRange;
     BookmarkInsertPosition(bool bIsStartOfText, const OUString& rName, css::uno::Reference<css::text::XTextRange> const& xTextRange):
@@ -295,8 +295,8 @@ struct BookmarkInsertPosition
 
 struct PermInsertPosition
 {
-    bool const        m_bIsStartOfText;
-    sal_Int32 const   m_Id;
+    bool        m_bIsStartOfText;
+    sal_Int32   m_Id;
     OUString    m_Ed;
     OUString    m_EdGrp;
 
@@ -379,9 +379,9 @@ struct FloatingTableInfo
 {
     css::uno::Reference<css::text::XTextRange> m_xStart;
     css::uno::Reference<css::text::XTextRange> m_xEnd;
-    css::uno::Sequence<css::beans::PropertyValue> const m_aFrameProperties;
-    sal_Int32 const m_nTableWidth;
-    sal_Int32 const m_nTableWidthType;
+    css::uno::Sequence<css::beans::PropertyValue> m_aFrameProperties;
+    sal_Int32 m_nTableWidth;
+    sal_Int32 m_nTableWidthType;
     /// Break type of the section that contains this table.
     sal_Int32 m_nBreakType = -1;
 
@@ -431,7 +431,7 @@ public:
     typedef std::map < sal_Int32, PermInsertPosition >    PermMap_t;
 
 private:
-    SourceDocumentType const                                                        m_eDocumentType;
+    SourceDocumentType                                                              m_eDocumentType;
     DomainMapper&                                                                   m_rDMapper;
     OUString m_aBaseUrl;
     css::uno::Reference<css::text::XTextDocument> m_xTextDocument;
@@ -582,8 +582,8 @@ private:
 public:
     css::uno::Reference<css::text::XTextRange> m_xInsertTextRange;
 private:
-    bool const m_bIsNewDoc;
-    bool const m_bIsReadGlossaries;
+    bool m_bIsNewDoc;
+    bool m_bIsReadGlossaries;
 public:
     DomainMapper_Impl(
             DomainMapper& rDMapper,
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index 26b2fd027f7a..a2f03fff3b03 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -89,7 +89,7 @@ public:
 private:
     virtual void lcl_attribute( Id name, Value& val ) override;
     virtual void lcl_sprm( Sprm& rSprm ) override;
-    OUString const fontName;
+    OUString fontName;
     const char* const style;
     OUString fontKey;
     css::uno::Reference<css::io::XInputStream> inputStream;
diff --git a/writerfilter/source/dmapper/FormControlHelper.hxx b/writerfilter/source/dmapper/FormControlHelper.hxx
index b167a65df24f..dd7f7d38c3fa 100644
--- a/writerfilter/source/dmapper/FormControlHelper.hxx
+++ b/writerfilter/source/dmapper/FormControlHelper.hxx
@@ -41,7 +41,7 @@ public:
     void processField(css::uno::Reference<css::text::XFormField> const& xFormField);
     bool hasFFDataHandler() const { return (m_pFFData != nullptr); }
 private:
-    FFDataHandler::Pointer_t const m_pFFData;
+    FFDataHandler::Pointer_t m_pFFData;
     struct FormControlHelper_Impl;
     tools::SvRef<FormControlHelper_Impl> m_pImpl;
 
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 50b5d51733fb..ade6ee087e5a 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -190,7 +190,7 @@ private:
     bool      bYSizeValid;
 
 public:
-    GraphicImportType const eGraphicImportType;
+    GraphicImportType eGraphicImportType;
     DomainMapper&   rDomainMapper;
 
     sal_Int32 nLeftPosition;
diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx
index 44bb043c6117..0be0f2ba4f12 100644
--- a/writerfilter/source/dmapper/LoggedResources.hxx
+++ b/writerfilter/source/dmapper/LoggedResources.hxx
@@ -41,7 +41,7 @@ public:
     static void attribute(const std::string & rName, sal_uInt32 nValue);
 
 private:
-    std::string const msPrefix;
+    std::string msPrefix;
 };
 #endif
 
diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx
index 18a1208a19d6..3a5dab834a11 100644
--- a/writerfilter/source/dmapper/ModelEventListener.hxx
+++ b/writerfilter/source/dmapper/ModelEventListener.hxx
@@ -28,8 +28,8 @@ namespace dmapper{
 
 class ModelEventListener : public cppu::WeakImplHelper<css::document::XEventListener>
 {
-    bool const m_bIndexes;
-    bool const m_bControls;
+    bool m_bIndexes;
+    bool m_bControls;
 public:
     ModelEventListener(bool bIndexes, bool bControls);
     virtual ~ModelEventListener() override;
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 962e11a50efc..23c9aac40dc0 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1809,7 +1809,7 @@ namespace {
 class NamedPropertyValue
 {
 private:
-    OUString const m_aName;
+    OUString m_aName;
 
 public:
     explicit NamedPropertyValue( const OUString& i_aStr )
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 43a5beaa9ca5..6bfc1fed3a04 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -223,7 +223,7 @@ private:
     // 'temporarily' the section page settings are imported as page styles
     // empty strings mark page settings as not yet imported
 
-    bool const                                      m_bIsFirstSection;
+    bool                                            m_bIsFirstSection;
     css::uno::Reference< css::text::XTextRange >    m_xStartingRange;
 
     OUString                                        m_sFirstPageStyleName;
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 633e74cac3f8..e6e4b93acdf4 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -221,8 +221,8 @@ PropertyMapPtr TableStyleSheetEntry::GetLocalPropertiesFromMask( sal_Int32 nMask
 {
     // Order from right to left
     struct TblStyleTypeAndMask {
-        sal_Int32 const       mask;
-        TblStyleType const    type;
+        sal_Int32       mask;
+        TblStyleType    type;
     };
 
     static const TblStyleTypeAndMask aOrderedStyleTable[] =
@@ -256,8 +256,8 @@ namespace {
 
 struct ListCharStylePropertyMap_t
 {
-    OUString const         sCharStyleName;
-    PropertyValueVector_t const   aPropertyValues;
+    OUString         sCharStyleName;
+    PropertyValueVector_t   aPropertyValues;
 
     ListCharStylePropertyMap_t(const OUString& rCharStyleName, const PropertyValueVector_t& rPropertyValues):
         sCharStyleName( rCharStyleName ),
@@ -281,7 +281,7 @@ struct StyleSheetTable_Impl
     OUString                                m_sDefaultParaStyleName; //WW8 name
     ListCharStylePropertyVector_t           m_aListCharStylePropertyVector;
     bool                                    m_bHasImportedDefaultParaProps;
-    bool const                              m_bIsNewDoc;
+    bool                                    m_bIsNewDoc;
 
     StyleSheetTable_Impl(DomainMapper& rDMapper, uno::Reference< text::XTextDocument> const& xTextDocument, bool bIsNewDoc);
 
diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx
index 66bf4294158c..16be82444505 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -250,7 +250,7 @@ class TableData : public virtual SvRefBase
     /**
        depth of the current table in a hierarchy of tables
      */
-    unsigned int const mnDepth;
+    unsigned int mnDepth;
 
     /**
        initialize mpRow
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index ab31e8855cc1..578b3a98a333 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -57,7 +57,7 @@ private:
     std::unique_ptr<TablePropertiesHandler>  m_pTablePropsHandler;
 
     TblStyleType                m_nType;
-    PropertyMapPtr const        m_pProperties;
+    PropertyMapPtr              m_pProperties;
     std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
 
     // Properties
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 3bc039f5c9e2..b68d524f0c5e 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -52,7 +52,7 @@ class OOXMLDocumentImpl : public OOXMLDocument
     css::uno::Sequence < css::beans::PropertyValue > mxEmbeddingsList;
     std::vector<css::beans::PropertyValue> aEmbeddings;
     bool mbIsSubstream;
-    bool const mbSkipImages;
+    bool mbSkipImages;
     /// How many paragraphs equal to 1 percent?
     sal_Int32 mnPercentSize;
     /// Position progress when it was last updated, possibly not after every paragraph in case of large documents.
@@ -62,8 +62,8 @@ class OOXMLDocumentImpl : public OOXMLDocument
     /// End position, i.e. the estimated number of paragraphs.
     sal_Int32 mnProgressEndPos;
     /// DocumentBaseURL
-    OUString const m_rBaseURL;
-    css::uno::Sequence<css::beans::PropertyValue> const maMediaDescriptor;
+    OUString m_rBaseURL;
+    css::uno::Sequence<css::beans::PropertyValue> maMediaDescriptor;
 
 private:
     void resolveFastSubStream(Stream & rStream,
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx
index abcf9c425f8e..aa3c981c695d 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -55,9 +55,9 @@ enum class ResourceType {
 
 struct AttributeInfo
 {
-    Token_t const m_nToken;
-    ResourceType const m_nResource;
-    Id const m_nRef;
+    Token_t m_nToken;
+    ResourceType m_nResource;
+    Id m_nRef;
 };
 
 class OOXMLFactory_ns : public virtual SvRefBase {
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index e7f8225b13b1..b7839178f475 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -81,9 +81,9 @@ private:
 
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
-    Stream * const mpStream;
-    OOXMLDocumentImpl* const mpDocument;
-    sal_Int32 const mnXNoteId;
+    Stream * mpStream;
+    OOXMLDocumentImpl* mpDocument;
+    sal_Int32 mnXNoteId;
     mutable rtl::Reference<OOXMLFastContextHandler> mxContextHandler;
     rtl::Reference<OOXMLFastContextHandler> const & getContextHandler() const;
 };
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
index 482d8ddb6f21..f31d46fce232 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
@@ -58,9 +58,9 @@ public:
     typedef tools::SvRef<OOXMLProperty> Pointer_t;
     enum Type_t { SPRM, ATTRIBUTE };
 private:
-    Id const mId;
+    Id mId;
     mutable OOXMLValue::Pointer_t mpValue;
-    Type_t const meType;
+    Type_t meType;
 
 public:
     OOXMLProperty(Id id, const OOXMLValue::Pointer_t& pValue, Type_t eType);
@@ -79,7 +79,7 @@ public:
 
 class OOXMLBinaryValue : public OOXMLValue
 {
-    OOXMLBinaryObjectReference::Pointer_t const mpBinaryObj;
+    mutable OOXMLBinaryObjectReference::Pointer_t mpBinaryObj;
 public:
     explicit OOXMLBinaryValue(OOXMLBinaryObjectReference::Pointer_t const & pBinaryObj);
     virtual ~OOXMLBinaryValue() override;
@@ -93,7 +93,7 @@ public:
 
 class OOXMLBooleanValue : public OOXMLValue
 {
-    bool const mbValue;
+    bool mbValue;
     explicit OOXMLBooleanValue(bool bValue);
 public:
     static OOXMLValue::Pointer_t const & Create (bool bValue);
@@ -116,7 +116,7 @@ public:
 
 class OOXMLStringValue : public OOXMLValue
 {
-    OUString const mStr;
+    OUString mStr;
 public:
     explicit OOXMLStringValue(const OUString & rStr);
     virtual ~OOXMLStringValue() override;
@@ -205,7 +205,7 @@ private:
 
 class OOXMLPropertySetValue : public OOXMLValue
 {
-    OOXMLPropertySet::Pointer_t const mpPropertySet;
+    OOXMLPropertySet::Pointer_t mpPropertySet;
 public:
     explicit OOXMLPropertySetValue(const OOXMLPropertySet::Pointer_t& pPropertySet);
     virtual ~OOXMLPropertySetValue() override;
@@ -224,7 +224,7 @@ public:
 
 class OOXMLIntegerValue : public OOXMLValue
 {
-    sal_Int32 const mnValue;
+    sal_Int32 mnValue;
     explicit OOXMLIntegerValue(sal_Int32 nValue);
 public:
     static OOXMLValue::Pointer_t Create (sal_Int32 nValue);
@@ -353,7 +353,7 @@ public:
 
 class OOXMLPropertySetEntryToString : public Properties
 {
-    Id const mnId;
+    Id mnId;
     OUString mStr;
 
 public:
@@ -368,7 +368,7 @@ public:
 
 class OOXMLPropertySetEntryToInteger : public Properties
 {
-    Id const mnId;
+    Id mnId;
     int mnValue;
 public:
     explicit OOXMLPropertySetEntryToInteger(Id nId);
@@ -382,7 +382,7 @@ public:
 
 class OOXMLPropertySetEntryToBool : public Properties
 {
-    Id const mnId;
+    Id mnId;
     bool mValue;
 public:
     explicit OOXMLPropertySetEntryToBool(Id nId);
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
index 9401d82c2a1e..b7d5b4aaa7ed 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
@@ -43,9 +43,9 @@ class OOXMLStreamImpl : public OOXMLStream
     css::uno::Reference<css::xml::sax::XFastParser> mxFastParser;
     css::uno::Reference<css::xml::sax::XFastTokenHandler> mxFastTokenHandler;
 
-    StreamType_t const mnStreamType;
+    StreamType_t mnStreamType;
 
-    OUString const msId;
+    OUString msId;
     OUString msPath;
     OUString msTarget;
 
diff --git a/writerfilter/source/rtftok/rtfcharsets.hxx b/writerfilter/source/rtftok/rtfcharsets.hxx
index c0a024def83c..42ddccce2a49 100644
--- a/writerfilter/source/rtftok/rtfcharsets.hxx
+++ b/writerfilter/source/rtftok/rtfcharsets.hxx
@@ -17,8 +17,8 @@ namespace rtftok
 /// RTF legacy charsets
 struct RTFEncoding
 {
-    int const charset;
-    int const codepage;
+    int charset;
+    int codepage;
 };
 extern RTFEncoding const aRTFEncodings[];
 extern int nRTFEncodings;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 7901d6ee31c5..684231cdce1f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -130,7 +130,7 @@ class TableRowBuffer : public virtual SvRefBase
     RTFBuffer_t m_aBuffer;
     ::std::deque<RTFSprms> m_aCellsSprms;
     ::std::deque<RTFSprms> m_aCellsAttributes;
-    int const m_nCells;
+    int m_nCells;
     writerfilter::Reference<Properties>::Pointer_t m_pParaProperties;
     writerfilter::Reference<Properties>::Pointer_t m_pFrameProperties;
     writerfilter::Reference<Properties>::Pointer_t m_pRowProperties;
@@ -960,7 +960,7 @@ private:
     int m_nListPictureId;
 
     /// New document means not pasting into an existing one.
-    bool const m_bIsNewDoc;
+    bool m_bIsNewDoc;
     /// The media descriptor contains e.g. the base URL of the document.
     const utl::MediaDescriptor& m_rMediaDescriptor;
 
diff --git a/writerfilter/source/rtftok/rtffly.hxx b/writerfilter/source/rtftok/rtffly.hxx
index 7dff01d67a19..9f94720d0a85 100644
--- a/writerfilter/source/rtftok/rtffly.hxx
+++ b/writerfilter/source/rtftok/rtffly.hxx
@@ -73,7 +73,7 @@ public:
     }
 
 private:
-    sal_uInt16 const m_nVal;
+    sal_uInt16 m_nVal;
 };
 
 /// Stores the horizontal orientation properties of an RTF fly frame.
@@ -134,7 +134,7 @@ public:
     }
 
 private:
-    sal_uInt16 const m_nVal;
+    sal_uInt16 m_nVal;
 };
 } // namespace rtftok
 } // namespace writerfilter
diff --git a/writerfilter/source/rtftok/rtfreferencetable.hxx b/writerfilter/source/rtftok/rtfreferencetable.hxx
index 1f0dcfed5724..8c9595493373 100644
--- a/writerfilter/source/rtftok/rtfreferencetable.hxx
+++ b/writerfilter/source/rtftok/rtfreferencetable.hxx
@@ -28,7 +28,7 @@ public:
     void resolve(Table& rHandler) override;
 
 private:
-    Entries_t const m_aEntries;
+    Entries_t m_aEntries;
 };
 } // namespace rtftok
 } // namespace writerfilter
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx
index b2eb9f25102d..dd3e05cb8723 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -95,7 +95,7 @@ public:
     std::string toString() const override;
 #endif
 private:
-    Id const m_nKeyword;
+    Id m_nKeyword;
     RTFValue::Pointer_t& m_pValue;
 };
 } // namespace rtftok
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx
index 8fbd49bd0a8e..b1c22b0b999f 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -77,14 +77,14 @@ public:
     RTFValue& operator=(RTFValue const& rOther) = delete;
 
 private:
-    int const m_nValue = 0;
+    int m_nValue = 0;
     OUString m_sValue;
     tools::SvRef<RTFSprms> m_pAttributes;
     tools::SvRef<RTFSprms> m_pSprms;
     css::uno::Reference<css::drawing::XShape> m_xShape;
     css::uno::Reference<css::io::XInputStream> m_xStream;
     css::uno::Reference<css::embed::XEmbeddedObject> m_xObject;
-    bool const m_bForceString = false;
+    bool m_bForceString = false;
     tools::SvRef<RTFShape> m_pShape;
     tools::SvRef<RTFPicture> m_pPicture;
 };