writerfilter/source/dmapper/BorderHandler.hxx | 2 -
writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 4 +--
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 6 ++--
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 20 +++++++--------
writerfilter/source/dmapper/FontTable.hxx | 2 -
writerfilter/source/dmapper/FormControlHelper.hxx | 2 -
writerfilter/source/dmapper/GraphicImport.cxx | 6 ++--
writerfilter/source/dmapper/LoggedResources.hxx | 2 -
writerfilter/source/dmapper/ModelEventListener.hxx | 4 +--
writerfilter/source/dmapper/NumberingManager.hxx | 2 -
writerfilter/source/dmapper/PropertyMap.cxx | 2 -
writerfilter/source/dmapper/PropertyMap.hxx | 6 ++--
writerfilter/source/dmapper/StyleSheetTable.cxx | 10 +++----
writerfilter/source/dmapper/TableData.hxx | 2 -
writerfilter/source/dmapper/TblStylePrHandler.hxx | 2 -
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 6 ++--
writerfilter/source/ooxml/OOXMLFactory.hxx | 6 ++--
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx | 6 ++--
writerfilter/source/ooxml/OOXMLPropertySet.hxx | 20 +++++++--------
writerfilter/source/ooxml/OOXMLStreamImpl.hxx | 4 +--
writerfilter/source/rtftok/rtfcharsets.hxx | 4 +--
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 4 +--
writerfilter/source/rtftok/rtffly.hxx | 4 +--
writerfilter/source/rtftok/rtfreferencetable.hxx | 2 -
writerfilter/source/rtftok/rtfsprm.hxx | 2 -
writerfilter/source/rtftok/rtfvalue.hxx | 4 +--
writerperfect/source/common/WPXSvInputStream.cxx | 6 ++--
27 files changed, 70 insertions(+), 70 deletions(-)
New commits:
commit e7c6c05ae5a62e1705ffda97c5405eecd1f62a1e
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Sep 13 11:13:36 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Sep 13 15:18:33 2018 +0200
loplugin:constfields in writerfilter
Change-Id: Ibe380e1fb35d9defc478d459a988f9f6df13bf35
Reviewed-on: https://gerrit.libreoffice.org/60427
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx
b/writerfilter/source/dmapper/BorderHandler.hxx
index 3e7a120c3907..b3d3ea7d0266 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 m_bOOXML;
+ bool const m_bOOXML;
bool m_aFilledLines[BORDER_COUNT];
css::table::BorderLine2 m_aBorderLines[BORDER_COUNT];
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 78517b3f9919..7a45afa5c0b9 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -43,8 +43,8 @@ struct TableInfo;
/// A horizontally merged cell is in fact a range of cells till its merge is
performed.
struct HorizontallyMergedCell
{
- sal_Int32 m_nFirstRow;
- sal_Int32 m_nFirstCol;
+ sal_Int32 const m_nFirstRow;
+ sal_Int32 const 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 c0eea15bdb95..8767256faa76 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -166,7 +166,7 @@ static void lcl_handleTextField( const uno::Reference<
beans::XPropertySet >& rx
struct FieldConversion
{
const sal_Char* cFieldServiceName;
- FieldId eFieldId;
+ FieldId const eFieldId;
};
typedef std::unordered_map<OUString, FieldConversion> FieldConversionMap_t;
@@ -2545,7 +2545,7 @@ static sal_Int16 lcl_ParseNumberingType( const OUString&
rCommand )
struct NumberingPairs
{
const sal_Char* cWordName;
- sal_Int16 nType;
+ sal_Int16 const nType;
};
static const NumberingPairs aNumberingPairs[] =
{
@@ -3539,7 +3539,7 @@ void DomainMapper_Impl::handleAuthor
{
const sal_Char* pDocPropertyName;
const sal_Char* pServiceName;
- sal_uInt8 nFlags;
+ sal_uInt8 const nFlags;
};
static const DocPropertyMap aDocProperties[] =
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 5547af6b8cde..fdf0e7b6e6bb 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -124,7 +124,7 @@ enum BreakType
*/
class HeaderFooterContext
{
- bool m_bTextInserted;
+ bool const m_bTextInserted;
public:
explicit HeaderFooterContext(bool bTextInserted);
bool getTextInserted();
@@ -264,7 +264,7 @@ struct DeletableTabStop : public css::style::TabStop
/// helper to remember bookmark start position
struct BookmarkInsertPosition
{
- bool
m_bIsStartOfText;
+ bool const
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):
@@ -276,8 +276,8 @@ struct BookmarkInsertPosition
struct PermInsertPosition
{
- bool m_bIsStartOfText;
- sal_Int32 m_Id;
+ bool const m_bIsStartOfText;
+ sal_Int32 const m_Id;
OUString m_Ed;
OUString m_EdGrp;
@@ -360,9 +360,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> m_aFrameProperties;
- sal_Int32 m_nTableWidth;
- sal_Int32 m_nTableWidthType;
+ css::uno::Sequence<css::beans::PropertyValue> const m_aFrameProperties;
+ sal_Int32 const m_nTableWidth;
+ sal_Int32 const m_nTableWidthType;
/// Break type of the section that contains this table.
sal_Int32 m_nBreakType = -1;
@@ -405,9 +405,9 @@ public:
typedef std::map < sal_Int32, PermInsertPosition > PermMap_t;
private:
- SourceDocumentType
m_eDocumentType;
+ SourceDocumentType const
m_eDocumentType;
DomainMapper&
m_rDMapper;
- SvtSaveOptions
m_aSaveOpt;
+ SvtSaveOptions const
m_aSaveOpt;
OUString m_aBaseUrl;
css::uno::Reference<css::text::XTextDocument> m_xTextDocument;
css::uno::Reference<css::beans::XPropertySet> m_xDocumentSettings;
@@ -541,7 +541,7 @@ private:
public:
css::uno::Reference<css::text::XTextRange> m_xInsertTextRange;
private:
- bool m_bIsNewDoc;
+ bool const m_bIsNewDoc;
public:
DomainMapper_Impl(
DomainMapper& rDMapper,
diff --git a/writerfilter/source/dmapper/FontTable.hxx
b/writerfilter/source/dmapper/FontTable.hxx
index fa922258dffc..ef2b3adbe79b 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -91,7 +91,7 @@ public:
private:
virtual void lcl_attribute( Id name, Value& val ) override;
virtual void lcl_sprm( Sprm& rSprm ) override;
- OUString fontName;
+ OUString const fontName;
const char* const style;
OUString id;
OUString fontKey;
diff --git a/writerfilter/source/dmapper/FormControlHelper.hxx
b/writerfilter/source/dmapper/FormControlHelper.hxx
index dd7f7d38c3fa..b167a65df24f 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 m_pFFData;
+ FFDataHandler::Pointer_t const 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 73f9746eb548..2df49c4dbe57 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -165,7 +165,7 @@ private:
bool bYSizeValid;
public:
- GraphicImportType eGraphicImportType;
+ GraphicImportType const eGraphicImportType;
DomainMapper& rDomainMapper;
sal_Int32 nLeftPosition;
@@ -198,9 +198,9 @@ public:
sal_Int32 nContrast;
sal_Int32 nBrightness;
- double fGamma;
+ double const fGamma;
- sal_Int32 nFillColor;
+ sal_Int32 const nFillColor;
drawing::ColorMode eColorMode;
diff --git a/writerfilter/source/dmapper/LoggedResources.hxx
b/writerfilter/source/dmapper/LoggedResources.hxx
index 5e86f552c93f..397fe099c09e 100644
--- a/writerfilter/source/dmapper/LoggedResources.hxx
+++ b/writerfilter/source/dmapper/LoggedResources.hxx
@@ -42,7 +42,7 @@ public:
static void attribute(const std::string & rName, sal_uInt32 nValue);
private:
- std::string msPrefix;
+ std::string const msPrefix;
};
#endif
diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx
b/writerfilter/source/dmapper/ModelEventListener.hxx
index 3a5dab834a11..18a1208a19d6 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 m_bIndexes;
- bool m_bControls;
+ bool const m_bIndexes;
+ bool const m_bControls;
public:
ModelEventListener(bool bIndexes, bool bControls);
virtual ~ModelEventListener() override;
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx
b/writerfilter/source/dmapper/NumberingManager.hxx
index ed4b1e4f6ffe..c99379226311 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -44,7 +44,7 @@ class ListLevel : public PropertyMap
{
sal_Int32 m_nIStartAt;
//LN_CT_Lvl_start
sal_Int32 m_nNFC;
//LN_CT_Lvl_numFmt
- sal_Int32 m_nJC; //LN_JC
+ sal_Int32 const m_nJC; //LN_JC
sal_Int16 m_nXChFollow;
//LN_IXCHFOLLOW
OUString m_sBulletChar;
css::awt::Size m_aGraphicSize;
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 83d384844602..e788d2c95a45 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1643,7 +1643,7 @@ void SectionPropertyMap::ClearHeaderFooterLinkToPrevious(
bool bHeader, PageType
class NamedPropertyValue
{
private:
- OUString m_aName;
+ OUString const m_aName;
public:
explicit NamedPropertyValue( const OUString& i_aStr )
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx
b/writerfilter/source/dmapper/PropertyMap.hxx
index 660983a9eebe..32ba4f419ece 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -200,7 +200,7 @@ private:
// 'temporarily' the section page settings are imported as page styles
// empty strings mark page settings as not yet imported
- bool m_bIsFirstSection;
+ bool const m_bIsFirstSection;
css::uno::Reference< css::text::XTextRange > m_xStartingRange;
OUString m_sFirstPageStyleName;
@@ -228,8 +228,8 @@ private:
// Page number type is a value from css::style::NumberingType.
sal_Int16 m_nPageNumberType;
sal_Int32 m_nBreakType;
- sal_Int32 m_nPaperBin;
- sal_Int32 m_nFirstPaperBin;
+ sal_Int32 const m_nPaperBin;
+ sal_Int32 const m_nFirstPaperBin;
sal_Int32 m_nLeftMargin;
sal_Int32 m_nRightMargin;
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 813c8772716d..34066eeca780 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -220,8 +220,8 @@ PropertyMapPtr
TableStyleSheetEntry::GetLocalPropertiesFromMask( sal_Int32 nMask
{
// Order from right to left
struct TblStyleTypeAndMask {
- sal_Int32 mask;
- TblStyleType type;
+ sal_Int32 const mask;
+ TblStyleType const type;
};
static const TblStyleTypeAndMask aOrderedStyleTable[] =
@@ -254,8 +254,8 @@ PropertyMapPtr
TableStyleSheetEntry::GetLocalPropertiesFromMask( sal_Int32 nMask
struct ListCharStylePropertyMap_t
{
- OUString sCharStyleName;
- PropertyValueVector_t aPropertyValues;
+ OUString const sCharStyleName;
+ PropertyValueVector_t const aPropertyValues;
ListCharStylePropertyMap_t(const OUString& rCharStyleName, const
PropertyValueVector_t& rPropertyValues):
sCharStyleName( rCharStyleName ),
@@ -279,7 +279,7 @@ struct StyleSheetTable_Impl
OUString m_sDefaultParaStyleName; //WW8 name
ListCharStylePropertyVector_t m_aListCharStylePropertyVector;
bool m_bHasImportedDefaultParaProps;
- bool m_bIsNewDoc;
+ bool const 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 44805a070d75..92cbbcc218c4 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -253,7 +253,7 @@ class TableData : public virtual SvRefBase
/**
depth of the current table in a hierarchy of tables
*/
- unsigned int mnDepth;
+ unsigned int const mnDepth;
/**
initialize mpRow
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx
b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index 283f94b41403..06325f06b1ae 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 m_pProperties;
+ PropertyMapPtr const 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 968b16dea3e9..1ad317a204d3 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -53,7 +53,7 @@ class OOXMLDocumentImpl : public OOXMLDocument
css::uno::Sequence < css::beans::PropertyValue > mxEmbeddingsList;
std::vector<css::beans::PropertyValue> aEmbeddings;
bool mbIsSubstream;
- bool mbSkipImages;
+ bool const 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.
@@ -63,8 +63,8 @@ class OOXMLDocumentImpl : public OOXMLDocument
/// End position, i.e. the estimated number of paragraphs.
sal_Int32 mnProgressEndPos;
/// DocumentBaseURL
- OUString m_rBaseURL;
- css::uno::Sequence<css::beans::PropertyValue> maMediaDescriptor;
+ OUString const m_rBaseURL;
+ css::uno::Sequence<css::beans::PropertyValue> const maMediaDescriptor;
private:
void resolveFastSubStream(Stream & rStream,
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx
b/writerfilter/source/ooxml/OOXMLFactory.hxx
index f4513ea6bdf3..f1432869f4e2 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -59,9 +59,9 @@ enum class ResourceType {
struct AttributeInfo
{
- Token_t m_nToken;
- ResourceType m_nResource;
- Id m_nRef;
+ Token_t const m_nToken;
+ ResourceType const m_nResource;
+ Id const m_nRef;
};
class OOXMLFactory_ns : public virtual SvRefBase {
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index 1251203fb792..0757cb90ea19 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -82,9 +82,9 @@ private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- Stream * mpStream;
- OOXMLDocumentImpl* mpDocument;
- sal_Int32 mnXNoteId;
+ Stream * const mpStream;
+ OOXMLDocumentImpl* const mpDocument;
+ sal_Int32 const 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 5d744015eb3f..ecaeadb21014 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 mId;
+ Id const mId;
mutable OOXMLValue::Pointer_t mpValue;
- Type_t meType;
+ Type_t const meType;
public:
OOXMLProperty(Id id, const OOXMLValue::Pointer_t& pValue, Type_t eType);
@@ -79,7 +79,7 @@ public:
class OOXMLBinaryValue : public OOXMLValue
{
- mutable OOXMLBinaryObjectReference::Pointer_t mpBinaryObj;
+ OOXMLBinaryObjectReference::Pointer_t const mpBinaryObj;
public:
explicit OOXMLBinaryValue(OOXMLBinaryObjectReference::Pointer_t const &
pBinaryObj);
virtual ~OOXMLBinaryValue() override;
@@ -93,7 +93,7 @@ public:
class OOXMLBooleanValue : public OOXMLValue
{
- bool mbValue;
+ bool const mbValue;
explicit OOXMLBooleanValue(bool bValue);
public:
static OOXMLValue::Pointer_t const & Create (bool bValue);
@@ -116,7 +116,7 @@ public:
class OOXMLStringValue : public OOXMLValue
{
- OUString mStr;
+ OUString const mStr;
public:
explicit OOXMLStringValue(const OUString & rStr);
virtual ~OOXMLStringValue() override;
@@ -205,7 +205,7 @@ private:
class OOXMLPropertySetValue : public OOXMLValue
{
- OOXMLPropertySet::Pointer_t mpPropertySet;
+ OOXMLPropertySet::Pointer_t const mpPropertySet;
public:
explicit OOXMLPropertySetValue(const OOXMLPropertySet::Pointer_t&
pPropertySet);
virtual ~OOXMLPropertySetValue() override;
@@ -224,7 +224,7 @@ public:
class OOXMLIntegerValue : public OOXMLValue
{
- sal_Int32 mnValue;
+ sal_Int32 const 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 mnId;
+ Id const mnId;
OUString mStr;
public:
@@ -368,7 +368,7 @@ public:
class OOXMLPropertySetEntryToInteger : public Properties
{
- Id mnId;
+ Id const mnId;
int mnValue;
public:
explicit OOXMLPropertySetEntryToInteger(Id nId);
@@ -382,7 +382,7 @@ public:
class OOXMLPropertySetEntryToBool : public Properties
{
- Id mnId;
+ Id const mnId;
bool mValue;
public:
explicit OOXMLPropertySetEntryToBool(Id nId);
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
index b7d5b4aaa7ed..9401d82c2a1e 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 mnStreamType;
+ StreamType_t const mnStreamType;
- OUString msId;
+ OUString const msId;
OUString msPath;
OUString msTarget;
diff --git a/writerfilter/source/rtftok/rtfcharsets.hxx
b/writerfilter/source/rtftok/rtfcharsets.hxx
index bf993f4e204c..d2d21aaa8ac5 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 charset;
- int codepage;
+ int const charset;
+ int const codepage;
};
extern RTFEncoding aRTFEncodings[];
extern int nRTFEncodings;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index a5a04781ebf6..65ae6dab3457 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -127,7 +127,7 @@ struct TableRowBuffer : public virtual SvRefBase
RTFBuffer_t buffer;
::std::deque<RTFSprms> cellsSprms;
::std::deque<RTFSprms> cellsAttributes;
- int nCells;
+ int const nCells;
writerfilter::Reference<Properties>::Pointer_t pParaProperties;
writerfilter::Reference<Properties>::Pointer_t pFrameProperties;
writerfilter::Reference<Properties>::Pointer_t pRowProperties;
@@ -706,7 +706,7 @@ private:
int m_nListPictureId;
/// New document means not pasting into an existing one.
- bool m_bIsNewDoc;
+ bool const 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 252b6ec3e3b6..9b40332fea93 100644
--- a/writerfilter/source/rtftok/rtffly.hxx
+++ b/writerfilter/source/rtftok/rtffly.hxx
@@ -72,7 +72,7 @@ public:
}
private:
- sal_uInt16 m_nVal;
+ sal_uInt16 const m_nVal;
};
/// Stores the horizontal orientation properties of an RTF fly frame.
@@ -133,7 +133,7 @@ public:
}
private:
- sal_uInt16 m_nVal;
+ sal_uInt16 const m_nVal;
};
} // namespace rtftok
} // namespace writerfilter
diff --git a/writerfilter/source/rtftok/rtfreferencetable.hxx
b/writerfilter/source/rtftok/rtfreferencetable.hxx
index 8c9595493373..1f0dcfed5724 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 m_aEntries;
+ Entries_t const m_aEntries;
};
} // namespace rtftok
} // namespace writerfilter
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx
b/writerfilter/source/rtftok/rtfsprm.hxx
index f8bbed3a0f69..65d4eda68d05 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -92,7 +92,7 @@ public:
std::string toString() const override;
#endif
private:
- Id m_nKeyword;
+ Id const m_nKeyword;
RTFValue::Pointer_t& m_pValue;
};
} // namespace rtftok
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx
b/writerfilter/source/rtftok/rtfvalue.hxx
index 4913162aea81..5944c87cf1fe 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 m_nValue = 0;
+ int const 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 m_bForceString = false;
+ bool const m_bForceString = false;
tools::SvRef<RTFShape> m_pShape;
tools::SvRef<RTFPicture> m_pPicture;
};
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx
b/writerperfect/source/common/WPXSvInputStream.cxx
index a2692bcea395..206d3b0d27ce 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -113,13 +113,13 @@ struct OLEStreamData
* This is not @c rtl::OUString, because we need to be able to
* produce const char* from it.
*/
- rtl::OString name;
+ rtl::OString const name;
/** librevenge name of the stream.
*
* This is not @c rtl::OUString, because we need to be able to
* produce const char* from it.
*/
- rtl::OString RVNGname;
+ rtl::OString const RVNGname;
};
typedef std::unordered_map<rtl::OUString, std::size_t> NameMap_t;
@@ -287,7 +287,7 @@ struct ZipStreamData
* This is not @c rtl::OUString, because we need to be able to
* produce const char* from it.
*/
- rtl::OString aName;
+ rtl::OString const aName;
};
/** Representation of a Zip storage.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
