summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper
diff options
context:
space:
mode:
Diffstat (limited to 'writerfilter/source/dmapper')
-rw-r--r--writerfilter/source/dmapper/BorderHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.hxx4
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx6
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.hxx20
-rw-r--r--writerfilter/source/dmapper/FontTable.hxx2
-rw-r--r--writerfilter/source/dmapper/FormControlHelper.hxx2
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx6
-rw-r--r--writerfilter/source/dmapper/LoggedResources.hxx2
-rw-r--r--writerfilter/source/dmapper/ModelEventListener.hxx4
-rw-r--r--writerfilter/source/dmapper/NumberingManager.hxx2
-rw-r--r--writerfilter/source/dmapper/PropertyMap.cxx2
-rw-r--r--writerfilter/source/dmapper/PropertyMap.hxx6
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx10
-rw-r--r--writerfilter/source/dmapper/TableData.hxx2
-rw-r--r--writerfilter/source/dmapper/TblStylePrHandler.hxx2
15 files changed, 36 insertions, 36 deletions
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