summaryrefslogtreecommitdiff
path: root/writerfilter/source/rtftok
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-03-16 09:21:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-03-16 10:59:41 +0100
commit7d02e8995404d3d7a6df7766567cc295b974b654 (patch)
tree7a449dee0c02ef7ecf5a5d6bc67934eead4b7069 /writerfilter/source/rtftok
parent729927f7609b5753757d8c53f954958f067431aa (diff)
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>
Diffstat (limited to 'writerfilter/source/rtftok')
-rw-r--r--writerfilter/source/rtftok/rtfcharsets.hxx4
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.hxx4
-rw-r--r--writerfilter/source/rtftok/rtffly.hxx4
-rw-r--r--writerfilter/source/rtftok/rtfreferencetable.hxx2
-rw-r--r--writerfilter/source/rtftok/rtfsprm.hxx2
-rw-r--r--writerfilter/source/rtftok/rtfvalue.hxx4
6 files changed, 10 insertions, 10 deletions
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;
};