loplugin:constparams in lotuswordpro

Change-Id: I2ad14fa797c99d26975dc472c1db115d94160eee Reviewed-on: https://gerrit.libreoffice.org/40615 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
author: Noel Grandin <noel.grandin@collabora.co.uk> 2017-08-01 09:29:37 +0200
committer: Noel Grandin <noel.grandin@collabora.co.uk> 2017-08-01 10:18:35 +0200
commit: 8c64b2e06b7495e50c0a8d46d639316283da6a9c (patch)
tree: 531a8078c97f076f7d0170016f539e8e28d2dc4c /lotuswordpro
parent: aaa6a5202a447fb4e86d5f016d8e79fbc34a3ed7 (diff)
125 files changed, 350 insertions, 352 deletions
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx
index 8bd6ab2331df..1ee75763e94e 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -133,7 +133,7 @@ LtcBenContainer::RegisterPropertyName(const char * sPropertyName,
 }
 
 CBenObject *
-LtcBenContainer::GetNextObject(CBenObject * pCurrObject)
+LtcBenContainer::GetNextObject(CBenObject const * pCurrObject)
 {
     return static_cast<CBenObject *>(cObjects.GetNextOrNULL(pCurrObject));
 }
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index 53fce5379622..51e379c4c731 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -201,7 +201,7 @@ public:
       CBenPropertyName ** ppPropertyName);
     // Pass NULL to begin iteration.  Done when returns NULL.
     // Objects are returned in order of increasing ID
-    CBenObject * GetNextObject(CBenObject * pCurrObject);
+    CBenObject * GetNextObject(CBenObject const * pCurrObject);
     CBenObject * FindNextObjectWithProperty(CBenObject * pCurrObject,
       BenObjectID PropertyID);
 
@@ -271,7 +271,7 @@ public: // Internal methods
         cpProperty = pProperty;
     }
 
-    inline CBenValueSegment * GetNextValueSegment(CBenValueSegment *
+    inline CBenValueSegment * GetNextValueSegment(CBenValueSegment const *
       pCurrValueSegment);
     CUtList& GetValueSegments() { return cValueSegments; }
 
@@ -332,7 +332,7 @@ private: // Data
     unsigned long cSize;
 };
 
-inline CBenValueSegment * CBenValue::GetNextValueSegment(CBenValueSegment *
+inline CBenValueSegment * CBenValue::GetNextValueSegment(CBenValueSegment const *
   pCurrValueSegment)
 { return static_cast<CBenValueSegment *>( cValueSegments.GetNextOrNULL(pCurrValueSegment) ); }
 
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 2366b319153e..1e6861680e85 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -93,7 +93,7 @@ LwpBulletStyleMgr::~LwpBulletStyleMgr()
  * @param   pIndent pointer to the indentoverride of current paragraph.
  */
 OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver,
-    LwpIndentOverride* pIndent)
+    LwpIndentOverride const * pIndent)
 {
     if(!pPara || !pIndent || !pBullOver)
     {
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
index c424386a6238..6fbe22d704b3 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
@@ -81,7 +81,7 @@ public:
     LwpBulletStyleMgr();
     ~LwpBulletStyleMgr();
     OUString RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver,
-        LwpIndentOverride* pIndent);
+        LwpIndentOverride const * pIndent);
     inline void SetFoundry(LwpFoundry* pFoundry);
     inline void SetContinueFlag(bool bFlag);
     XFContentContainer* AddBulletList(XFContentContainer* pCont, bool bIsOrdered,
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index dbec3ce35eb1..c4647943778d 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -74,7 +74,7 @@
 #include "xfilter/xfcellstyle.hxx"
 #include "xfilter/xfcolstyle.hxx"
 
-LwpCellLayout::LwpCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpCellLayout::LwpCellLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpMiddleLayout(objHdr, pStrm)
     , crowid(0)
     , ccolid(0)
@@ -672,7 +672,7 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, LwpObjectID aTableID)
     pCell->SetProtect(bProtected);
 }
 
-LwpConnectedCellLayout::LwpConnectedCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpConnectedCellLayout::LwpConnectedCellLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpCellLayout(objHdr, pStrm)
     , cnumrows(0)
     , cnumcols(0)
@@ -840,7 +840,7 @@ void LwpConnectedCellLayout::Parse(IXFStream* /*pOutputStream*/)
 {
 }
 
-LwpHiddenCellLayout::LwpHiddenCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpHiddenCellLayout::LwpHiddenCellLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpCellLayout(objHdr, pStrm)
 {}
 
@@ -913,7 +913,7 @@ rtl::Reference<XFCell> LwpHiddenCellLayout::ConvertCell(LwpObjectID aTableID, sa
 {
 }
 
-LwpParallelColumnsBlock::LwpParallelColumnsBlock(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpCellLayout(objHdr, pStrm)
+LwpParallelColumnsBlock::LwpParallelColumnsBlock(LwpObjectHeader const &objHdr, LwpSvStream* pStrm):LwpCellLayout(objHdr, pStrm)
 {}
 
 LwpParallelColumnsBlock::~LwpParallelColumnsBlock()
diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx
index 7ad790747189..848302a1ea80 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.hxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.hxx
@@ -86,7 +86,7 @@ class LwpTableLayout;
 class LwpCellLayout : public LwpMiddleLayout
 {
 public:
-    LwpCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpCellLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpCellLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_CELL_LAYOUT;}
     virtual rtl::Reference<XFCell> ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol);
@@ -143,7 +143,7 @@ protected:
 class LwpHiddenCellLayout : public LwpCellLayout
 {
 public:
-    LwpHiddenCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpHiddenCellLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpHiddenCellLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_HIDDEN_CELL_LAYOUT;}
     virtual void Parse(IXFStream* pOutputStream) override;
@@ -162,7 +162,7 @@ protected:
 class LwpConnectedCellLayout : public LwpCellLayout
 {
 public:
-    LwpConnectedCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpConnectedCellLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpConnectedCellLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_CONNECTED_CELL_LAYOUT;}
     virtual void Parse(IXFStream* pOutputStream) override;
@@ -188,7 +188,7 @@ protected:
 class LwpParallelColumnsBlock : public LwpCellLayout
 {
 public:
-    LwpParallelColumnsBlock(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpParallelColumnsBlock(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpParallelColumnsBlock() override;
 protected:
     void Read() override;
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.cxx b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
index a100423377bd..aa66c2899724 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.cxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
@@ -71,7 +71,7 @@
 
 
 /*class LwpTextStyle*/
-LwpTextStyle::LwpTextStyle(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpTextStyle::LwpTextStyle(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpDLNFPVList(objHdr, pStrm),
     m_nFontID(0), m_nFinalFontID(0), m_nCSFlags(0), m_nUseCount(0),
     m_nStyleDefinition(0), m_nKey(0)
@@ -165,7 +165,7 @@ void LwpTextStyle::RegisterStyle()
 }
 
 /*class LwpCharacterStyle*/
-LwpCharacterStyle::LwpCharacterStyle(LwpObjectHeader& objHdr, LwpSvStream* pStrm) :
+LwpCharacterStyle::LwpCharacterStyle(LwpObjectHeader const & objHdr, LwpSvStream* pStrm) :
 LwpTextStyle(objHdr, pStrm)
 {
 }
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.hxx b/lotuswordpro/source/filter/lwpcharacterstyle.hxx
index 449408803f9e..bc2a265ac830 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.hxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.hxx
@@ -75,7 +75,7 @@ class LwpAmikakeOverride;
 class LwpTextStyle : public LwpDLNFPVList
 {
 public:
-    LwpTextStyle(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpTextStyle(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
 
     virtual ~LwpTextStyle() override;
 
@@ -125,7 +125,7 @@ inline sal_uInt32 LwpTextStyle::GetFinalFontID() const
 class LwpCharacterStyle : public LwpTextStyle
 {
 public:
-    LwpCharacterStyle(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpCharacterStyle(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
 
     void Read() override;
 
diff --git a/lotuswordpro/source/filter/lwpcontent.cxx b/lotuswordpro/source/filter/lwpcontent.cxx
index 9e4bbc2e7619..85b6de3dd478 100644
--- a/lotuswordpro/source/filter/lwpcontent.cxx
+++ b/lotuswordpro/source/filter/lwpcontent.cxx
@@ -62,7 +62,7 @@
 #include "lwpfilehdr.hxx"
 #include "lwpholder.hxx"
 
-LwpHeadContent::LwpHeadContent(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpHeadContent::LwpHeadContent(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpContent(objHdr, pStrm)
 {}
 
@@ -72,7 +72,7 @@ void LwpHeadContent::Read()
     m_pObjStrm->SkipExtra();
 }
 
-LwpContent::LwpContent(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpContent::LwpContent(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpDLNFVList(objHdr, pStrm)
     , m_nFlags(0)
 {
@@ -121,7 +121,7 @@ void LwpContent::Read()
     pStrm->SkipExtra();
 }
 
-rtl::Reference<LwpVirtualLayout> LwpContent::GetLayout(LwpVirtualLayout* pStartLayout)
+rtl::Reference<LwpVirtualLayout> LwpContent::GetLayout(LwpVirtualLayout const * pStartLayout)
 {
     return m_LayoutsWithMe.GetLayout(pStartLayout);
 }
diff --git a/lotuswordpro/source/filter/lwpcontent.hxx b/lotuswordpro/source/filter/lwpcontent.hxx
index 2dd6cb6b8258..8b6956907b6b 100644
--- a/lotuswordpro/source/filter/lwpcontent.hxx
+++ b/lotuswordpro/source/filter/lwpcontent.hxx
@@ -73,7 +73,7 @@
 class LwpContent : public LwpDLNFVList
 {
 public:
-    LwpContent(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpContent(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
 protected:
     LwpAssociatedLayouts m_LayoutsWithMe;
     sal_uInt16 m_nFlags;
@@ -105,7 +105,7 @@ protected:
     void Read() override;
 public:
     inline LwpAssociatedLayouts& GetLayoutsWithMe();
-    rtl::Reference<LwpVirtualLayout> GetLayout(LwpVirtualLayout* pStartLayout);
+    rtl::Reference<LwpVirtualLayout> GetLayout(LwpVirtualLayout const * pStartLayout);
     inline bool IsActive();
     virtual bool IsTable();
     inline OUString GetClassName();
@@ -145,7 +145,7 @@ inline LwpContent* LwpContent::GetNextEnumerated()
 class LwpHeadContent : public LwpContent
 {
 public:
-    LwpHeadContent(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpHeadContent(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
 protected:
     void Read() override;
 };
diff --git a/lotuswordpro/source/filter/lwpdivinfo.cxx b/lotuswordpro/source/filter/lwpdivinfo.cxx
index e98139587f98..29c81935f5c1 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.cxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.cxx
@@ -64,7 +64,7 @@
 #include "lwpholder.hxx"
 #include "lwppagehint.hxx"
 
-LwpDivInfo::LwpDivInfo(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpDivInfo::LwpDivInfo(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpObject(objHdr, pStrm)
     , m_nFlags(0)
     , m_nPageNoStyle(0)
diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx
index 2fdd96dc67e7..8c18d64edbc1 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.hxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.hxx
@@ -73,7 +73,7 @@
 class LwpDivInfo : public LwpObject
 {
 public:
-    LwpDivInfo(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpDivInfo(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     LwpObjectID& GetInitialLayoutID() { return m_InitialLayoutID; }
     LwpObjectID& GetFillerPageTextID() { return m_FillerPageTextID; }
     OUString GetDivName() { return m_Name.str(); }
diff --git a/lotuswordpro/source/filter/lwpdivopts.cxx b/lotuswordpro/source/filter/lwpdivopts.cxx
index 7e0f18600255..9d8ed3d74067 100644
--- a/lotuswordpro/source/filter/lwpdivopts.cxx
+++ b/lotuswordpro/source/filter/lwpdivopts.cxx
@@ -121,7 +121,7 @@ sal_uInt16 LwpTextLanguage::ConvertFrom96(sal_uInt16 orgLang)
     return orgLang;
 }
 
-LwpDivisionOptions::LwpDivisionOptions(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpDivisionOptions::LwpDivisionOptions(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpObject(objHdr, pStrm)
     , m_nOptionFlag(0)
 {
diff --git a/lotuswordpro/source/filter/lwpdivopts.hxx b/lotuswordpro/source/filter/lwpdivopts.hxx
index d2d3fa8c1efa..2c611e842d96 100644
--- a/lotuswordpro/source/filter/lwpdivopts.hxx
+++ b/lotuswordpro/source/filter/lwpdivopts.hxx
@@ -103,7 +103,7 @@ private:
 class LwpDivisionOptions : public LwpObject
 {
 public:
-    LwpDivisionOptions(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpDivisionOptions(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
 protected:
     void Read() override;
 private:
diff --git a/lotuswordpro/source/filter/lwpdlvlist.cxx b/lotuswordpro/source/filter/lwpdlvlist.cxx
index 2e2ea5886d1c..6adc1ddb4de2 100644
--- a/lotuswordpro/source/filter/lwpdlvlist.cxx
+++ b/lotuswordpro/source/filter/lwpdlvlist.cxx
@@ -62,7 +62,7 @@
 #include "lwpfilehdr.hxx"
 #include "lwpproplist.hxx"
 
-LwpDLVList::LwpDLVList(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpDLVList::LwpDLVList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpObject(objHdr, pStrm)
 {}
 /**
@@ -80,7 +80,7 @@ void LwpDLVList::Read()
         pObjStrm->SkipExtra();
 
 }
-LwpDLNFVList::LwpDLNFVList(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpDLNFVList::LwpDLNFVList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
         : LwpDLVList(objHdr, pStrm)
 {}
 /**
@@ -117,7 +117,7 @@ void LwpDLNFVList::ReadName(LwpObjectStream* pObjStrm)
  * @descr       ctor of LwpDLNFPVList from object stream
  *          Note that m_bHasProperties is initialized to true
  **/
-LwpDLNFPVList::LwpDLNFPVList(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpDLNFPVList::LwpDLNFPVList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpDLNFVList(objHdr, pStrm),
     m_bHasProperties(true),m_pPropList(nullptr)
 {}
diff --git a/lotuswordpro/source/filter/lwpdlvlist.hxx b/lotuswordpro/source/filter/lwpdlvlist.hxx
index 54a5b5d24030..d3c1f3c05994 100644
--- a/lotuswordpro/source/filter/lwpdlvlist.hxx
+++ b/lotuswordpro/source/filter/lwpdlvlist.hxx
@@ -71,7 +71,7 @@
 class LwpDLVList : public LwpObject
 {
 public:
-    LwpDLVList(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpDLVList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
 protected:
     virtual ~LwpDLVList() override {}
 
@@ -90,7 +90,7 @@ public:
 class LwpDLNFVList : public LwpDLVList
 {
 public:
-    LwpDLNFVList(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpDLNFVList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
 protected:
     virtual ~LwpDLNFVList() override {}
 
@@ -116,7 +116,7 @@ class LwpPropList;
 class LwpDLNFPVList : public LwpDLNFVList
 {
 public:
-    LwpDLNFPVList(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpDLNFPVList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpDLNFPVList() override;
 protected:
     bool m_bHasProperties;
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index 9455c6b91854..3b5ebcb9193c 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -69,7 +69,7 @@
 #include "xfilter/xfstylemanager.hxx"
 #include <osl/thread.h>
 
-LwpDocument::LwpDocument(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpDocument::LwpDocument(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpDLNFPVList(objHdr, pStrm)
     , m_pOwnedFoundry(nullptr)
     , m_bGettingFirstDivisionWithContentsThatIsNotOLE(false)
@@ -767,7 +767,7 @@ void LwpDocument::ChangeStyleName()
         pStyle->SetStyleName("Placeholder");
     }
 }
-LwpDocSock::LwpDocSock(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpDocSock::LwpDocSock(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     :LwpDLNFVList(objHdr, pStrm)
 {}
 
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx b/lotuswordpro/source/filter/lwpdoc.hxx
index ff7f838576a8..fe8dc80e95cb 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -79,7 +79,7 @@ class LwpVirtualLayout;
 class LwpDocument : public LwpDLNFPVList
 {
 public:
-    LwpDocument(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpDocument(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpDocument() override;
 
 private:
@@ -225,7 +225,7 @@ inline LwpObjectID& LwpDocument::GetVerDoc()
 class LwpDocSock : public LwpDLNFVList
 {
 public:
-    LwpDocSock(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpDocSock(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
 private:
     LwpObjectID m_Doc;
 protected:
diff --git a/lotuswordpro/source/filter/lwpdocdata.cxx b/lotuswordpro/source/filter/lwpdocdata.cxx
index 6ef841bb1f82..6a0c50ca941c 100644
--- a/lotuswordpro/source/filter/lwpdocdata.cxx
+++ b/lotuswordpro/source/filter/lwpdocdata.cxx
@@ -61,7 +61,7 @@
 #include "lwpfilehdr.hxx"
 #include "lwpglobalmgr.hxx"
 
-LwpDocData::LwpDocData(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpDocData::LwpDocData(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     :LwpObject(objHdr, pStrm)//m_pEditorAttrList(0)
 {}
 
diff --git a/lotuswordpro/source/filter/lwpdocdata.hxx b/lotuswordpro/source/filter/lwpdocdata.hxx
index 7067b8b81dd4..6c1a24992274 100644
--- a/lotuswordpro/source/filter/lwpdocdata.hxx
+++ b/lotuswordpro/source/filter/lwpdocdata.hxx
@@ -156,7 +156,7 @@ struct LwpEditorAttr
 class LwpDocData : public LwpObject
 {
 public:
-    LwpDocData(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpDocData(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
 private:
     virtual ~LwpDocData() override;
 
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index e226ed6c0459..11e7ea6bf470 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -181,7 +181,7 @@ bool Decompress(SvStream *pCompressed, SvStream * & pOutDecompressed)
     }
     return bCompressed;
 }
-int ReadWordproFile(SvStream &rStream, uno::Reference<css::xml::sax::XDocumentHandler>& xHandler)
+int ReadWordproFile(SvStream &rStream, uno::Reference<css::xml::sax::XDocumentHandler> const & xHandler)
 {
     try
     {
diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx
index d976f3d6f9eb..66e62b565785 100644
--- a/lotuswordpro/source/filter/lwpfilter.hxx
+++ b/lotuswordpro/source/filter/lwpfilter.hxx
@@ -61,7 +61,7 @@
 class SvStream;
 
 //test code
-int ReadWordproFile(SvStream &rStream, css::uno::Reference<css::xml::sax::XDocumentHandler>& XDoc);
+int ReadWordproFile(SvStream &rStream, css::uno::Reference<css::xml::sax::XDocumentHandler> const & XDoc);
 
 #endif
 
diff --git a/lotuswordpro/source/filter/lwpfnlayout.cxx b/lotuswordpro/source/filter/lwpfnlayout.cxx
index 13c505d98373..7183d5fde286 100644
--- a/lotuswordpro/source/filter/lwpfnlayout.cxx
+++ b/lotuswordpro/source/filter/lwpfnlayout.cxx
@@ -60,7 +60,7 @@
 
 #include "lwpfnlayout.hxx"
 
-LwpFootnoteLayout::LwpFootnoteLayout(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpFootnoteLayout::LwpFootnoteLayout(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     :LwpTableLayout(objHdr, pStrm)
 {
 }
@@ -91,7 +91,7 @@ void LwpFootnoteLayout::XFConvert(XFContentContainer * /*pCont*/)
 {
 }
 
-LwpFnRowLayout::LwpFnRowLayout(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpFnRowLayout::LwpFnRowLayout(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     :LwpRowLayout(objHdr, pStrm)
 {
 }
@@ -133,7 +133,7 @@ void LwpFnRowLayout::XFConvert(XFContentContainer * /*pCont*/)
 {
 }
 
-LwpFnCellLayout::LwpFnCellLayout(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpFnCellLayout::LwpFnCellLayout(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     :LwpCellLayout(objHdr, pStrm)
 {
 }
@@ -171,7 +171,7 @@ void LwpFnCellLayout::XFConvert(XFContentContainer * /*pCont*/)
 {
 }
 
-LwpEndnoteLayout::LwpEndnoteLayout(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpEndnoteLayout::LwpEndnoteLayout(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     :LwpTableLayout(objHdr, pStrm)
 {
 }
@@ -213,7 +213,7 @@ void LwpEndnoteLayout::XFConvert(XFContentContainer * /*pCont*/)
 {
 }
 
-LwpEnSuperTableLayout::LwpEnSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpEnSuperTableLayout::LwpEnSuperTableLayout(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     :LwpSuperTableLayout(objHdr, pStrm)
 {
 }
@@ -273,7 +273,7 @@ void LwpEnSuperTableLayout::XFConvert(XFContentContainer * /*pCont*/)
     return nullptr;
 }
 
-LwpFnSuperTableLayout::LwpFnSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpFnSuperTableLayout::LwpFnSuperTableLayout(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     :LwpEnSuperTableLayout(objHdr, pStrm)
 {
 }
@@ -329,7 +329,7 @@ LwpVirtualLayout* LwpFnSuperTableLayout::GetMainTableLayout()
     return nullptr;
 }
 
-LwpContFromLayout::LwpContFromLayout(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpContFromLayout::LwpContFromLayout(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     :LwpPlacableLayout(objHdr, pStrm)
 {
 }
@@ -360,7 +360,7 @@ void LwpContFromLayout::XFConvert(XFContentContainer * /*pCont*/)
 {
 }
 
-LwpContOnLayout::LwpContOnLayout(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpContOnLayout::LwpContOnLayout(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     :LwpPlacableLayout(objHdr, pStrm)
 {
 }
diff --git a/lotuswordpro/source/filter/lwpfnlayout.hxx b/lotuswordpro/source/filter/lwpfnlayout.hxx
index e0a7c7980c87..24c0920caf8a 100644
--- a/lotuswordpro/source/filter/lwpfnlayout.hxx
+++ b/lotuswordpro/source/filter/lwpfnlayout.hxx
@@ -70,7 +70,7 @@
 class LwpFootnoteLayout : public LwpTableLayout
 {
 public:
-    LwpFootnoteLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpFootnoteLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFootnoteLayout() override;
     void RegisterStyle() override;
     virtual void XFConvert(XFContentContainer * pCont) override;
@@ -86,7 +86,7 @@ protected:
 class LwpFnRowLayout : public LwpRowLayout
 {
 public:
-    LwpFnRowLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpFnRowLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFnRowLayout() override;
     void RegisterStyle() override;
     virtual void XFConvert(XFContentContainer * pCont) override;
@@ -102,7 +102,7 @@ protected:
 class LwpFnCellLayout : public LwpCellLayout
 {
 public:
-    LwpFnCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpFnCellLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFnCellLayout() override;
     void RegisterStyle() override;
     virtual void XFConvert(XFContentContainer * pCont) override;
@@ -118,7 +118,7 @@ protected:
 class LwpEndnoteLayout : public LwpTableLayout
 {
 public:
-    LwpEndnoteLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpEndnoteLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpEndnoteLayout() override;
     void RegisterStyle() override;
     virtual void XFConvert(XFContentContainer * pCont) override;
@@ -134,7 +134,7 @@ protected:
 class LwpEnSuperTableLayout : public LwpSuperTableLayout
 {
 public:
-    LwpEnSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpEnSuperTableLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpEnSuperTableLayout() override;
     void RegisterStyle() override;
     void XFConvert(XFContentContainer* pCont) override;
@@ -151,7 +151,7 @@ protected:
 class LwpFnSuperTableLayout : public LwpEnSuperTableLayout
 {
 public:
-    LwpFnSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpFnSuperTableLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFnSuperTableLayout() override;
     void RegisterStyle() override;
     void XFConvert(XFContentContainer* pCont) override;
@@ -168,7 +168,7 @@ protected:
 class LwpContFromLayout : public LwpPlacableLayout
 {
 public:
-    LwpContFromLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpContFromLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpContFromLayout() override;
     void RegisterStyle() override;
     void XFConvert(XFContentContainer* pCont) override;
@@ -183,7 +183,7 @@ protected:
 class LwpContOnLayout : public LwpPlacableLayout
 {
 public:
-    LwpContOnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpContOnLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpContOnLayout() override;
     void RegisterStyle() override;
     void XFConvert(XFContentContainer* pCont) override;
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx
index 5ed5611b1c2f..23a72f24dad4 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -138,7 +138,7 @@ LwpFootnote* LwpFribFootnote::GetFootnote()
     return dynamic_cast<LwpFootnote*>(m_Footnote.obj().get());
 }
 
-LwpFootnote::LwpFootnote(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpFootnote::LwpFootnote(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     : LwpOrderedObject(objHdr, pStrm)
     , m_nType(0)
     , m_nRow(0)
@@ -394,7 +394,7 @@ LwpContent* LwpFootnote::FindFootnoteContent()
     return pContent;
 }
 
-LwpFootnoteTable::LwpFootnoteTable(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpFootnoteTable::LwpFootnoteTable(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     : LwpTable(objHdr, pStrm)
 {
 }
@@ -431,7 +431,7 @@ void LwpFootnoteSeparatorOptions::Read(LwpObjectStream *pObjStrm)
     pObjStrm->SkipExtra();
 }
 
-LwpFootnoteOptions::LwpFootnoteOptions(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpFootnoteOptions::LwpFootnoteOptions(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     : LwpObject(objHdr, pStrm)
     , m_nFlag(0)
 {
diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx b/lotuswordpro/source/filter/lwpfootnote.hxx
index 58dfc2622f52..1857489f0410 100644
--- a/lotuswordpro/source/filter/lwpfootnote.hxx
+++ b/lotuswordpro/source/filter/lwpfootnote.hxx
@@ -123,7 +123,7 @@ class LwpTable;
 class LwpFootnote : public LwpOrderedObject
 {
 public:
-    LwpFootnote(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpFootnote(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFootnote() override;
     void RegisterStyle() override;
     void XFConvert(XFContentContainer * pCont) override;
@@ -150,7 +150,7 @@ private:
 class LwpFootnoteTable : public LwpTable
 {
 public:
-    LwpFootnoteTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpFootnoteTable(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
 protected:
     void Read() override;
 };
@@ -234,7 +234,7 @@ public:
 class LwpFootnoteOptions : public LwpObject
 {
 public:
-    LwpFootnoteOptions(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpFootnoteOptions(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     void RegisterStyle() override;
 protected:
     void Read() override;
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx
index 0a01e9bcccc9..a4d7f0be796d 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -759,7 +759,7 @@ void LwpFrameLink::Read(LwpObjectStream* pStrm)
     pStrm->SkipExtra();
 }
 
-LwpFrameLayout::LwpFrameLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpFrameLayout::LwpFrameLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpPlacableLayout(objHdr, pStrm), m_pFrame(nullptr), m_bGettingMaxWidth(false)
 {
 }
@@ -1019,7 +1019,7 @@ void LwpFrameLayout::ApplyGraphicSize(XFFrame * pXFFrame)
     }
 }
 
-LwpGroupLayout::LwpGroupLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpGroupLayout::LwpGroupLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpPlacableLayout(objHdr, pStrm)
     , m_pFrame(nullptr)
 {
@@ -1111,7 +1111,7 @@ void LwpGroupLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart
     }
 }
 
-LwpGroupFrame::LwpGroupFrame(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpGroupFrame::LwpGroupFrame(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     :LwpContent(objHdr, pStrm)
 {}
 
@@ -1133,7 +1133,7 @@ void LwpGroupFrame::XFConvert(XFContentContainer* /*pCont*/)
 {
 }
 
-LwpDropcapLayout::LwpDropcapLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpDropcapLayout::LwpDropcapLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpFrameLayout(objHdr, pStrm)
 {
     m_nChars = 1;
@@ -1196,7 +1196,7 @@ void LwpDropcapLayout::RegisterStyle()
 {
 }
 
-LwpRubyLayout::LwpRubyLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpRubyLayout::LwpRubyLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpFrameLayout(objHdr, pStrm)
     , m_nPlacement(0)
     , m_nAlignment(0)
diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx b/lotuswordpro/source/filter/lwpframelayout.hxx
index 52cbc8decf31..342770a2ea5e 100644
--- a/lotuswordpro/source/filter/lwpframelayout.hxx
+++ b/lotuswordpro/source/filter/lwpframelayout.hxx
@@ -123,7 +123,7 @@ private:
 class LwpFrameLayout: public LwpPlacableLayout
 {
 public:
-    LwpFrameLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpFrameLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFrameLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_FRAME_LAYOUT;}
     virtual void RegisterStyle() override;
@@ -152,7 +152,7 @@ private:
 class LwpGroupLayout: public LwpPlacableLayout
 {
 public:
-    LwpGroupLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpGroupLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpGroupLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_GROUP_LAYOUT;}
     virtual void RegisterStyle() override;
@@ -172,7 +172,7 @@ private:
 class LwpGroupFrame: public LwpContent
 {
 public:
-    LwpGroupFrame(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpGroupFrame(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpGroupFrame() override;
     virtual void RegisterStyle() override;
     virtual void XFConvert(XFContentContainer* pCont) override;
@@ -185,7 +185,7 @@ class LwpFoundry;
 class LwpDropcapLayout : public LwpFrameLayout
 {
 public:
-    LwpDropcapLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpDropcapLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_DROPCAP_LAYOUT;}
     virtual void Parse(IXFStream* pOutputStream) override;
     virtual void XFConvert(XFContentContainer* pCont) override;
@@ -204,7 +204,7 @@ private:
 class LwpRubyLayout : public LwpFrameLayout
 {
 public:
-    LwpRubyLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpRubyLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     LwpRubyMarker* GetMarker();
     void ConvertContentText();
     LwpStory* GetContentStory();
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx
index e02c58950037..604408e82fb1 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -613,7 +613,7 @@ void LwpFribPtr::ProcessDropcap(LwpStory* pStory,LwpFrib* pFrib,sal_uInt32 nLen)
  * @descr:  If the position of pPreLayout is earlier than pNextLayout, return true, or return false, default return true
  *
 */
-bool LwpFribPtr::ComparePagePosition(LwpVirtualLayout* pPreLayout, LwpVirtualLayout* pNextLayout)
+bool LwpFribPtr::ComparePagePosition(LwpVirtualLayout const * pPreLayout, LwpVirtualLayout const * pNextLayout)
 {
     if(!pPreLayout || !pNextLayout)
         return true;
diff --git a/lotuswordpro/source/filter/lwpfribptr.hxx b/lotuswordpro/source/filter/lwpfribptr.hxx
index bd19a5e6d391..d70878783dbb 100644
--- a/lotuswordpro/source/filter/lwpfribptr.hxx
+++ b/lotuswordpro/source/filter/lwpfribptr.hxx
@@ -87,7 +87,7 @@ public:
     void FindLayouts();// for register pagelayout
     LwpFrib* GetFribs(){return m_pFribs;}
     LwpFrib* HasFrib(sal_uInt8 nType);
-    bool ComparePagePosition(LwpVirtualLayout* pPreLayout, LwpVirtualLayout* pNextLayout);
+    bool ComparePagePosition(LwpVirtualLayout const * pPreLayout, LwpVirtualLayout const * pNextLayout);
     void GatherAllText();
 };
 
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 10efc6981962..97b034a32e6c 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -85,7 +85,7 @@
 #define EF_NONE 0x0000
 #define EF_ODMA 0x0002
 
-LwpGraphicObject::LwpGraphicObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpGraphicObject::LwpGraphicObject(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpGraphicOleObject(objHdr, pStrm)
     , m_nCachedBaseLine(0)
     , m_bIsLinked(0)
@@ -326,7 +326,7 @@ void LwpGraphicObject::CreateDrawObjects()
 /**
  * @descr   create drawing object.
  */
-void LwpGraphicObject::GetBentoNamebyID(LwpObjectID& rMyID, std::string& rName)
+void LwpGraphicObject::GetBentoNamebyID(LwpObjectID const & rMyID, std::string& rName)
 {
     sal_uInt16 nHigh = rMyID.GetHigh();
     sal_uInt16 nLow = rMyID.GetLow();
diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx
index 5669b1d3bc6c..bfe771c61684 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.hxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.hxx
@@ -91,7 +91,7 @@ class XFFrame;
 class LwpGraphicObject : public LwpGraphicOleObject
 {
 public:
-    LwpGraphicObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpGraphicObject(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpGraphicObject() override;
 private:
     unsigned char m_sDataFormat[AFID_MAX_FILE_FORMAT_SIZE];
@@ -117,7 +117,7 @@ public:
 
     void CreateDrawObjects();
     void CreateGrafObject();
-    static void GetBentoNamebyID(LwpObjectID& rMyID, std::string& rName);
+    static void GetBentoNamebyID(LwpObjectID const & rMyID, std::string& rName);
     sal_uInt32 GetRawGrafData(sal_uInt8*& pGrafData);
     sal_uInt32 GetGrafData(sal_uInt8*& pGrafData);
     void GetGrafOrgSize(long& rWidth, long& rHeight) { rWidth = m_Cache.Width; rHeight = m_Cache.Height; }
diff --git a/lotuswordpro/source/filter/lwpholder.cxx b/lotuswordpro/source/filter/lwpholder.cxx
index 7e6afc4dd457..1d46fd81a4b0 100644
--- a/lotuswordpro/source/filter/lwpholder.cxx
+++ b/lotuswordpro/source/filter/lwpholder.cxx
@@ -61,7 +61,7 @@
 #include "lwpholder.hxx"
 #include "lwpfilehdr.hxx"
 
-LwpDLVListHeadHolder::LwpDLVListHeadHolder(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpDLVListHeadHolder::LwpDLVListHeadHolder(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpObject(objHdr, pStrm)
 {}
 /**
@@ -73,7 +73,7 @@ void LwpDLVListHeadHolder::Read()
     m_pObjStrm->SkipExtra();
 }
 
-LwpDLVListHeadTailHolder::LwpDLVListHeadTailHolder(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpDLVListHeadTailHolder::LwpDLVListHeadTailHolder(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpObject(objHdr, pStrm)
 {}
 /**
@@ -85,7 +85,7 @@ void LwpDLVListHeadTailHolder::Read()
     //m_pObjStrm->SkipExtra();
 }
 
-LwpObjectHolder::LwpObjectHolder(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpObjectHolder::LwpObjectHolder(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     :LwpDLVList(objHdr, pStrm)
 {}
 /**
@@ -100,7 +100,7 @@ void LwpObjectHolder::Read()
         m_pObjStrm->SkipExtra();
 }
 
-LwpListList::LwpListList(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpListList::LwpListList(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     :LwpObjectHolder(objHdr, pStrm)
 {}
 /**
diff --git a/lotuswordpro/source/filter/lwpholder.hxx b/lotuswordpro/source/filter/lwpholder.hxx
index a5df323bdefb..f9f1065073ae 100644
--- a/lotuswordpro/source/filter/lwpholder.hxx
+++ b/lotuswordpro/source/filter/lwpholder.hxx
@@ -70,7 +70,7 @@
 class LwpDLVListHeadHolder : public LwpObject
 {
 public:
-    LwpDLVListHeadHolder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpDLVListHeadHolder(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     void Read() override;
     LwpObjectID& GetHeadID() { return m_DLVHead;}
 private:
@@ -85,7 +85,7 @@ private:
 class LwpDLVListHeadTailHolder : public LwpObject
 {
 public:
-    LwpDLVListHeadTailHolder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpDLVListHeadTailHolder(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     void Read() override;
     LwpObjectID& GetHead(){ return m_HeadTail.GetHead();}
     LwpObjectID& GetTail(){ return m_HeadTail.GetTail();}
@@ -101,7 +101,7 @@ private:
 class LwpObjectHolder : public LwpDLVList
 {
 public:
-    LwpObjectHolder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpObjectHolder(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     void Read() override;
     LwpObjectID& GetObject() { return m_Object; }
 protected:
@@ -117,7 +117,7 @@ protected:
 class LwpListList : public LwpObjectHolder
 {
 public:
-    LwpListList(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpListList(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     void Read() override;
     LwpObjectID& GetHead(){ return m_HeadTail.GetHead();}
 protected:
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 651cf2e1ee4d..7f34c284b2e5 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -73,7 +73,7 @@
 #include "lwpgrfobj.hxx"
 #include <osl/thread.h>
 
-LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpDLNFPVList(objHdr, pStrm)
     , m_bGettingHonorProtection(false)
     , m_bGettingMarginsSameAsParent(false)
@@ -430,7 +430,7 @@ void LwpAssociatedLayouts::Read(LwpObjectStream* pStrm)
 * @descr:   Looking for the layout which follows the pStartLayout
 * @param:   pStartLayout - the layout which is used for looking for its following layout
 */
-rtl::Reference<LwpVirtualLayout> LwpAssociatedLayouts::GetLayout(LwpVirtualLayout *pStartLayout)
+rtl::Reference<LwpVirtualLayout> LwpAssociatedLayouts::GetLayout(LwpVirtualLayout const *pStartLayout)
 {
     if (!pStartLayout && !m_OnlyLayout.IsNull())
         /* Looking for the first layout and there's only one layout in  the list.*/
@@ -466,7 +466,7 @@ rtl::Reference<LwpVirtualLayout> LwpAssociatedLayouts::GetLayout(LwpVirtualLayou
     return rtl::Reference<LwpVirtualLayout>();
 }
 
-LwpHeadLayout::LwpHeadLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpHeadLayout::LwpHeadLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpVirtualLayout(objHdr, pStrm)
 {}
 
@@ -563,7 +563,7 @@ void LwpLayoutMisc::Read(LwpObjectStream* pStrm)
     pStrm->SkipExtra();
 }
 
-LwpMiddleLayout::LwpMiddleLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm )
+LwpMiddleLayout::LwpMiddleLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm )
     : LwpVirtualLayout(objHdr, pStrm)
     , m_bGettingGeometry(false)
 {
@@ -1459,7 +1459,7 @@ bool LwpMiddleLayout::HasContent()
     return content.is();
 }
 
-LwpLayout::LwpLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm ) :
+LwpLayout::LwpLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm ) :
     LwpMiddleLayout(objHdr, pStrm)
 {}
 
@@ -1936,7 +1936,7 @@ rtl::Reference<LwpVirtualLayout> LwpLayout::GetContainerLayout()
     return GetParentLayout();
 }
 
-LwpPlacableLayout::LwpPlacableLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm )
+LwpPlacableLayout::LwpPlacableLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm )
     : LwpLayout(objHdr, pStrm)
     , m_nWrapType(0)
     , m_nBuoyancy(0)
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index bfd9dc097aa3..349fa7818f83 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -97,7 +97,7 @@ class LwpPara;
 class LwpVirtualLayout : public LwpDLNFPVList
 {
 public:
-    LwpVirtualLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpVirtualLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual sal_uInt16 GetNumCols(){return 1;}
     virtual double GetColWidth(sal_uInt16 nIndex);
     virtual double GetColGap(sal_uInt16 nIndex);
@@ -286,7 +286,7 @@ public:
     LwpAssociatedLayouts(){}
     void Read(LwpObjectStream* pStrm);
     LwpObjectID& GetOnlyLayout() { return m_OnlyLayout;}
-    rtl::Reference<LwpVirtualLayout> GetLayout(LwpVirtualLayout* pStartLayout);
+    rtl::Reference<LwpVirtualLayout> GetLayout(LwpVirtualLayout const * pStartLayout);
 protected:
     LwpObjectID m_OnlyLayout; //LwpVirtualLayout
     LwpDLVListHeadTail m_Layouts;
@@ -295,7 +295,7 @@ protected:
 class LwpHeadLayout : public LwpVirtualLayout
 {
 public:
-    LwpHeadLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpHeadLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     void RegisterStyle() override;
     rtl::Reference<LwpVirtualLayout> FindEnSuperTableLayout();
 protected:
@@ -330,7 +330,7 @@ private:
 class LwpMiddleLayout : public LwpVirtualLayout
 {
 public:
-    LwpMiddleLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm );
+    LwpMiddleLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm );
     virtual ~LwpMiddleLayout() override;
     LwpLayoutGeometry* GetGeometry()
     {
@@ -418,7 +418,7 @@ public:
 class LwpLayout : public LwpMiddleLayout
 {
 public:
-    LwpLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm );
+    LwpLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm );
     virtual ~LwpLayout() override;
     XFColumns* GetXFColumns();
     XFColumnSep* GetColumnSep();
@@ -463,7 +463,7 @@ public:
 class LwpPlacableLayout : public LwpLayout
 {
 public:
-    LwpPlacableLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm );
+    LwpPlacableLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm );
     virtual ~LwpPlacableLayout() override;
     sal_uInt8 GetWrapType();
     LwpLayoutRelativity* GetRelativityPiece();
diff --git a/lotuswordpro/source/filter/lwplaypiece.cxx b/lotuswordpro/source/filter/lwplaypiece.cxx
index 507d0be787f0..fcc7a8aa1f4c 100644
--- a/lotuswordpro/source/filter/lwplaypiece.cxx
+++ b/lotuswordpro/source/filter/lwplaypiece.cxx
@@ -75,7 +75,7 @@ void LwpRotor:: Read(LwpObjectStream *pStrm)
     m_nRotation = pStrm->QuickReadInt16();
 }
 
-LwpLayoutGeometry::LwpLayoutGeometry(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpLayoutGeometry::LwpLayoutGeometry(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpVirtualPiece(objHdr, pStrm)
     , m_nWidth(0)
     , m_nHeight(0)
@@ -103,7 +103,7 @@ void LwpLayoutGeometry::Read()
 void LwpLayoutGeometry::Parse(IXFStream* /*pOutputStream*/)
 {}
 
-LwpLayoutScale::LwpLayoutScale(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpLayoutScale::LwpLayoutScale(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpVirtualPiece(objHdr, pStrm)
     , m_nScaleMode(0)
     , m_nScalePercentage(0)
@@ -137,7 +137,7 @@ void LwpLayoutScale::Read()
 void LwpLayoutScale::Parse(IXFStream* /*pOutputStream*/)
 {}
 
-LwpLayoutMargins::LwpLayoutMargins(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpLayoutMargins::LwpLayoutMargins(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpVirtualPiece(objHdr, pStrm)
 {}
 
@@ -160,7 +160,7 @@ void LwpLayoutMargins::Read()
 void LwpLayoutMargins::Parse(IXFStream* /*pOutputStream*/)
 {}
 
-LwpLayoutBorder::LwpLayoutBorder(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpLayoutBorder::LwpLayoutBorder(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpVirtualPiece(objHdr, pStrm)
 {}
 
@@ -181,7 +181,7 @@ void LwpLayoutBorder::Read()
 void LwpLayoutBorder::Parse(IXFStream* /*pOutputStream*/)
 {}
 
-LwpLayoutBackground::LwpLayoutBackground(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpLayoutBackground::LwpLayoutBackground(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpVirtualPiece(objHdr, pStrm)
 {}
 
@@ -226,7 +226,7 @@ void LwpExternalBorder:: Read(LwpObjectStream *pStrm)
     }
 }
 
-LwpLayoutExternalBorder::LwpLayoutExternalBorder(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpLayoutExternalBorder::LwpLayoutExternalBorder(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpVirtualPiece(objHdr, pStrm)
 {}
 
@@ -261,7 +261,7 @@ void LwpColumnInfo:: Read(LwpObjectStream *pStrm)
     m_nGap = pStrm->QuickReadInt32();
 }
 
-LwpLayoutColumns::LwpLayoutColumns(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpLayoutColumns::LwpLayoutColumns(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpVirtualPiece(objHdr, pStrm)
     , m_nNumCols(0)
     , m_pColumns(nullptr)
@@ -314,7 +314,7 @@ double LwpLayoutColumns::GetColGap(sal_uInt16 nIndex)
 void LwpLayoutColumns::Parse(IXFStream* /*pOutputStream*/)
 {}
 
-LwpLayoutGutters::LwpLayoutGutters(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpLayoutGutters::LwpLayoutGutters(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpVirtualPiece(objHdr, pStrm)
 {}
 
@@ -367,7 +367,7 @@ void LwpJoinStuff:: Read(LwpObjectStream *pStrm)
     }
 }
 
-LwpLayoutJoins::LwpLayoutJoins(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpLayoutJoins::LwpLayoutJoins(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpVirtualPiece(objHdr, pStrm)
 {}
 
@@ -388,7 +388,7 @@ void LwpLayoutJoins::Read()
 void LwpLayoutJoins::Parse(IXFStream* /*pOutputStream*/)
 {}
 
-LwpLayoutShadow::LwpLayoutShadow(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpLayoutShadow::LwpLayoutShadow(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpVirtualPiece(objHdr, pStrm)
 {}
 
@@ -439,7 +439,7 @@ void LwpLayoutRelativityGuts::Read(LwpObjectStream *pStrm)
     }
 }
 
-LwpLayoutRelativity::LwpLayoutRelativity(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpLayoutRelativity::LwpLayoutRelativity(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     : LwpVirtualPiece(objHdr, pStrm)
 {
 }
diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx
index 86b62a6a2624..2f028d57c8f6 100644
--- a/lotuswordpro/source/filter/lwplaypiece.hxx
+++ b/lotuswordpro/source/filter/lwplaypiece.hxx
@@ -81,7 +81,7 @@ private:
 class LwpLayoutGeometry : public LwpVirtualPiece
 {
 public:
-    LwpLayoutGeometry(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpLayoutGeometry(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     virtual void Parse(IXFStream* pOutputStream) override;
     sal_Int32 GetWidth() { return m_nWidth; }
     sal_Int32 GetHeight() { return m_nHeight; }
@@ -109,7 +109,7 @@ public:
              CUSTOM = 8, MAINTAIN_ASPECT_RATIO = 16};
 
     enum    {CENTERED = 1, TILED = 2};
-    LwpLayoutScale(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpLayoutScale(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     virtual void Parse(IXFStream* pOutputStream) override;
     sal_uInt16 GetScaleMode(){return m_nScaleMode;}
     sal_uInt32 GetScalePercentage(){return m_nScalePercentage;}
@@ -134,7 +134,7 @@ private:
 class LwpLayoutMargins : public LwpVirtualPiece
 {
 public:
-    LwpLayoutMargins(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpLayoutMargins(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     virtual void Parse(IXFStream* pOutputStream) override;
     LwpMargins& GetMargins() { return m_Margins; }
     LwpMargins& GetExtMargins(){ return m_ExtMargins;}
@@ -151,7 +151,7 @@ private:
 class LwpLayoutBorder : public LwpVirtualPiece
 {
 public:
-    LwpLayoutBorder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpLayoutBorder(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     virtual void Parse(IXFStream* pOutputStream) override;
     LwpBorderStuff& GetBorderStuff(){ return m_BorderStuff;}
 protected:
@@ -165,7 +165,7 @@ private:
 class LwpLayoutBackground : public LwpVirtualPiece
 {
 public:
-    LwpLayoutBackground(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpLayoutBackground(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     virtual void Parse(IXFStream* pOutputStream) override;
     LwpBackgroundStuff& GetBackgoudStuff(){return m_BackgroundStuff;}
 protected:
@@ -193,7 +193,7 @@ private:
 class LwpLayoutExternalBorder : public LwpVirtualPiece
 {
 public:
-    LwpLayoutExternalBorder(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpLayoutExternalBorder(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     virtual void Parse(IXFStream* pOutputStream) override;
 protected:
     virtual void Read() override;
@@ -219,7 +219,7 @@ private:
 class LwpLayoutColumns : public LwpVirtualPiece
 {
 public:
-    LwpLayoutColumns(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpLayoutColumns(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     virtual void Parse(IXFStream* pOutputStream) override;
     sal_uInt16 GetNumCols(){return m_nNumCols;}
     double GetColWidth(sal_uInt16 nIndex);
@@ -236,7 +236,7 @@ private:
 class LwpLayoutGutters : public LwpVirtualPiece
 {
 public:
-    LwpLayoutGutters(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpLayoutGutters(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     virtual void Parse(IXFStream* pOutputStream) override;
     LwpBorderStuff& GetBorderStuff() { return m_BorderBuffer; }
 protected:
@@ -296,7 +296,7 @@ private:
 class LwpLayoutJoins : public LwpVirtualPiece
 {
 public:
-    LwpLayoutJoins(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpLayoutJoins(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     virtual void Parse(IXFStream* pOutputStream) override;
 protected:
     virtual void Read() override;
@@ -309,7 +309,7 @@ private:
 class LwpLayoutShadow : public LwpVirtualPiece
 {
 public:
-    LwpLayoutShadow(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpLayoutShadow(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     virtual void Parse(IXFStream* pOutputStream) override;
     LwpShadow& GetShadow() { return m_Shadow; }
 protected:
@@ -365,7 +365,7 @@ private:
 class LwpLayoutRelativity: public LwpVirtualPiece
 {
 public:
-    LwpLayoutRelativity(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpLayoutRelativity(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     virtual void Parse(IXFStream* pOutputStream) override;
     LwpLayoutRelativityGuts& GetRelGuts() { return m_RelGuts; }
 protected:
diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx
index 5743daae7ebc..1c83c150f587 100644
--- a/lotuswordpro/source/filter/lwpmarker.cxx
+++ b/lotuswordpro/source/filter/lwpmarker.cxx
@@ -67,7 +67,7 @@
 #include "xfilter/xfplaceholder.hxx"
 #include "xfilter/xfinputlist.hxx"
 
-LwpMarker::LwpMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpMarker::LwpMarker(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     : LwpDLNFPVList(objHdr,pStrm)
     , m_nFlag(0)
     , m_nPageNumber(0)
@@ -97,7 +97,7 @@ OUString LwpMarker::GetNamedProperty(const OUString& name)
         return OUString();
 }
 
-LwpStoryMarker::LwpStoryMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpStoryMarker::LwpStoryMarker(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     : LwpMarker(objHdr,pStrm)
     , m_nFlag(0)
 {
@@ -117,7 +117,7 @@ void LwpFribRange::Read(LwpObjectStream* pObjStrm)
     m_EndPara.ReadIndexed(pObjStrm);
 }
 
-LwpCHBlkMarker::LwpCHBlkMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpCHBlkMarker::LwpCHBlkMarker(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     : LwpStoryMarker(objHdr, pStrm)
     , m_nTab(0)
     , m_nFlag(0)
@@ -317,7 +317,7 @@ void LwpCHBlkMarker::EnumAllKeywords()
     }
 }
 
-LwpBookMark::LwpBookMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpBookMark::LwpBookMark(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     : LwpDLNFVList(objHdr,pStrm)
     , m_nFlag(0)
 {
@@ -347,7 +347,7 @@ OUString LwpBookMark::GetName()
     return LwpDLNFVList::GetName().str();
 }
 
-LwpFieldMark::LwpFieldMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpFieldMark::LwpFieldMark(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     : LwpStoryMarker(objHdr,pStrm)
     , m_nFlag(0)
     , m_nFieldType(0)
@@ -526,7 +526,7 @@ bool LwpFieldMark::IsDocPowerField(sal_uInt8& nType,OUString& sFormula)
     }
 }
 
-LwpRubyMarker::LwpRubyMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm):LwpStoryMarker(objHdr,pStrm)
+LwpRubyMarker::LwpRubyMarker(LwpObjectHeader const &objHdr, LwpSvStream *pStrm):LwpStoryMarker(objHdr,pStrm)
 {
 }
 
diff --git a/lotuswordpro/source/filter/lwpmarker.hxx b/lotuswordpro/source/filter/lwpmarker.hxx
index b0117b3298b4..acea7b387c9c 100644
--- a/lotuswordpro/source/filter/lwpmarker.hxx
+++ b/lotuswordpro/source/filter/lwpmarker.hxx
@@ -70,7 +70,7 @@
 class LwpMarker : public LwpDLNFPVList
 {
 public:
-    LwpMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
+    LwpMarker(LwpObjectHeader const &objHdr, LwpSvStream *pStrm);
     void Read() override;
     OUString GetNamedProperty(const OUString& name);
 protected:
@@ -101,7 +101,7 @@ private:
 class LwpStoryMarker : public LwpMarker
 {
 public:
-    LwpStoryMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
+    LwpStoryMarker(LwpObjectHeader const &objHdr, LwpSvStream *pStrm);
     void Read() override;
 private:
     LwpFribRange m_Range;
@@ -111,7 +111,7 @@ private:
 class LwpCHBlkMarker : public LwpStoryMarker
 {
 public:
-    LwpCHBlkMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
+    LwpCHBlkMarker(LwpObjectHeader const &objHdr, LwpSvStream *pStrm);
     void Read() override;
     sal_uInt16 GetAction(){return m_nAction;}
     void ConvertCHBlock(XFContentContainer* pXFPara,sal_uInt8 nType);
@@ -168,7 +168,7 @@ private:
 class LwpBookMark : public LwpDLNFVList
 {
 public:
-    LwpBookMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
+    LwpBookMark(LwpObjectHeader const &objHdr, LwpSvStream *pStrm);
 protected:
     void Read() override;
 public:
@@ -185,7 +185,7 @@ private:
 class LwpFieldMark : public LwpStoryMarker
 {
 public:
-    LwpFieldMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
+    LwpFieldMark(LwpObjectHeader const &objHdr, LwpSvStream *pStrm);
     void Read() override;
     void ParseIndex(OUString& sKey1,OUString& sKey2);
     void ParseTOC(OUString& sLevel,OUString& sText);
@@ -248,7 +248,7 @@ private:
 class LwpRubyMarker : public LwpStoryMarker
 {
 public:
-    LwpRubyMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
+    LwpRubyMarker(LwpObjectHeader const &objHdr, LwpSvStream *pStrm);
     void Read() override;
     const OUString& GetRubyText(){return m_strRubyText;}
     void SetRubyText(const OUString& sText){m_strRubyText = sText;}
diff --git a/lotuswordpro/source/filter/lwpnotes.cxx b/lotuswordpro/source/filter/lwpnotes.cxx
index 87cf4147ae48..00efaa4c91f1 100644
--- a/lotuswordpro/source/filter/lwpnotes.cxx
+++ b/lotuswordpro/source/filter/lwpnotes.cxx
@@ -126,7 +126,7 @@ void LwpFribNote::XFConvert(XFContentContainer* pCont)
 
 }
 
-LwpNoteLayout::LwpNoteLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpNoteLayout::LwpNoteLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpFrameLayout(objHdr, pStrm)
     , m_nTime(0)
 {
@@ -226,7 +226,7 @@ OUString LwpNoteLayout::GetAuthor()
     return m_UserName.str();
 }
 
-LwpNoteHeaderLayout::LwpNoteHeaderLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpNoteHeaderLayout::LwpNoteHeaderLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpFrameLayout(objHdr, pStrm)
 {
 }
@@ -253,7 +253,7 @@ void LwpNoteHeaderLayout::XFConvert(XFContentContainer * /*pCont*/)
 {
 }
 
-LwpNoteTextLayout::LwpNoteTextLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpNoteTextLayout::LwpNoteTextLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpFrameLayout(objHdr, pStrm)
 {
 }
@@ -294,7 +294,7 @@ void LwpNoteTextLayout::XFConvert(XFContentContainer * pCont)
     }
 }
 
-LwpViewportLayout::LwpViewportLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpViewportLayout::LwpViewportLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpPlacableLayout(objHdr, pStrm)
 {
 }
diff --git a/lotuswordpro/source/filter/lwpnotes.hxx b/lotuswordpro/source/filter/lwpnotes.hxx
index 9cd0fbdb30f5..b85102ecfc2b 100644
--- a/lotuswordpro/source/filter/lwpnotes.hxx
+++ b/lotuswordpro/source/filter/lwpnotes.hxx
@@ -86,7 +86,7 @@ private:
 class LwpNoteLayout: public LwpFrameLayout
 {
 public:
-    LwpNoteLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpNoteLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpNoteLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_NOTE_LAYOUT;}
     virtual void RegisterStyle() override;
@@ -110,7 +110,7 @@ private:
 class LwpNoteHeaderLayout: public LwpFrameLayout
 {
 public:
-    LwpNoteHeaderLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpNoteHeaderLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpNoteHeaderLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_NOTEHEADER_LAYOUT;}
     virtual void RegisterStyle() override;
@@ -127,7 +127,7 @@ protected:
 class LwpNoteTextLayout: public LwpFrameLayout
 {
 public:
-    LwpNoteTextLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpNoteTextLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpNoteTextLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_NOTETEXT_LAYOUT;}
     virtual void RegisterStyle() override;
@@ -144,7 +144,7 @@ protected:
 class LwpViewportLayout: public LwpPlacableLayout
 {
 public:
-    LwpViewportLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpViewportLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpViewportLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_VIEWPORT_LAYOUT;}
     virtual void RegisterStyle() override;
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx
index 5340b511feec..a0783ec0dd19 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.hxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx
@@ -298,7 +298,7 @@ LwpNumericFormat::IsNegativeOverridden()
 class LwpLayoutNumerics : public LwpVirtualPiece
 {
 public:
-    LwpLayoutNumerics(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+    LwpLayoutNumerics(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     :LwpVirtualPiece(objHdr, pStrm),cNumerics(m_pObjStrm.get()){}
     XFStyle* Convert();
     virtual void Read() override;
diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx
index d9f844066738..2cfc9148f373 100644
--- a/lotuswordpro/source/filter/lwpobjid.cxx
+++ b/lotuswordpro/source/filter/lwpobjid.cxx
@@ -153,7 +153,7 @@ sal_uInt32 LwpObjectID::ReadIndexed(LwpObjectStream *pStrm)
  *          else    lowid equals to the lowid of previous low id
  *              and high id = the high id of previous id + diff +1
 */
-void LwpObjectID::ReadCompressed( LwpObjectStream* pObj, LwpObjectID &prev )
+void LwpObjectID::ReadCompressed( LwpObjectStream* pObj, LwpObjectID const &prev )
 {
     sal_uInt8 diff = pObj->QuickReaduInt8();
 
diff --git a/lotuswordpro/source/filter/lwpobjid.hxx b/lotuswordpro/source/filter/lwpobjid.hxx
index ec276d329615..5a165d240be7 100644
--- a/lotuswordpro/source/filter/lwpobjid.hxx
+++ b/lotuswordpro/source/filter/lwpobjid.hxx
@@ -88,7 +88,7 @@ public:
     sal_uInt32 Read( LwpObjectStream *pStrm );
     void ReadIndexed( LwpSvStream* pStrm );
     sal_uInt32 ReadIndexed( LwpObjectStream *pStrm );
-    void ReadCompressed( LwpObjectStream* pObj, LwpObjectID& prev );
+    void ReadCompressed( LwpObjectStream* pObj, LwpObjectID const & prev );
 
     /**
      * @descr       return the size of object id with format: low(4bytes)+high(2bytes)
diff --git a/lotuswordpro/source/filter/lwpoleobject.cxx b/lotuswordpro/source/filter/lwpoleobject.cxx
index 60953be37fb3..85e3a33b2525 100644
--- a/lotuswordpro/source/filter/lwpoleobject.cxx
+++ b/lotuswordpro/source/filter/lwpoleobject.cxx
@@ -74,7 +74,7 @@
  * @param:  objHdr - object header, read before entering this function
  * @param: pStrm - file stream
  */
-LwpGraphicOleObject::LwpGraphicOleObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpGraphicOleObject::LwpGraphicOleObject(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpContent(objHdr, pStrm)
 {}
 /**
@@ -185,7 +185,7 @@ void LwpGraphicOleObject::GetGrafScaledSize(double & fWidth, double & fHeight)
  * @param:  objHdr - object header, read before entering this function
  * @param: pStrm - file stream
  */
-LwpOleObject::LwpOleObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpOleObject::LwpOleObject(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpGraphicOleObject(objHdr, pStrm)
     , cPersistentFlags(0)
     , m_SizeRect(0,0,5,5)
diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx
index bd514035a34c..c8283c886236 100644
--- a/lotuswordpro/source/filter/lwpoleobject.hxx
+++ b/lotuswordpro/source/filter/lwpoleobject.hxx
@@ -97,7 +97,7 @@ typedef struct tagAFID_CACHE
 class LwpGraphicOleObject : public LwpContent
 {
 public:
-    LwpGraphicOleObject(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpGraphicOleObject(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     virtual void Read() override;
     void         GetGrafScaledSize(double& fWidth, double& fHeight);
     virtual void GetGrafOrgSize(double& rWidth, double& rHeight);
@@ -115,7 +115,7 @@ protected:
 class LwpOleObject : public LwpGraphicOleObject
 {
 public:
-    LwpOleObject(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpOleObject(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     virtual void Read() override;
     virtual void Parse(IXFStream* pOutputStream) override;
     virtual void XFConvert(XFContentContainer * pCont) override;
diff --git a/lotuswordpro/source/filter/lwppagehint.cxx b/lotuswordpro/source/filter/lwppagehint.cxx
index 08a0182cb764..a164f48d4281 100644
--- a/lotuswordpro/source/filter/lwppagehint.cxx
+++ b/lotuswordpro/source/filter/lwppagehint.cxx
@@ -78,7 +78,7 @@ void LwpFootnoteSeenHead::Read(LwpObjectStream* pObjStrm)
     pObjStrm->SkipExtra();
 }
 
-LwpPageHint::LwpPageHint(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpPageHint::LwpPageHint(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     : LwpDLVList(objHdr,pStrm)
     , m_nLastFootnoteSeen(0)
     , m_nLastFootnoteProcessed(0)
diff --git a/lotuswordpro/source/filter/lwppagehint.hxx b/lotuswordpro/source/filter/lwppagehint.hxx
index 25a31a6a2c64..43490c29c4f7 100644
--- a/lotuswordpro/source/filter/lwppagehint.hxx
+++ b/lotuswordpro/source/filter/lwppagehint.hxx
@@ -96,7 +96,7 @@ private:
 class LwpPageHint : public LwpDLVList
 {
 public:
-    LwpPageHint(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpPageHint(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     void Read() override;
     void Parse(IXFStream* pOutputStream) override;
     sal_uInt16 GetPageNumber(){return m_nPageNumber;}
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx
index d4313c9e0e17..4074f1a9a752 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -74,7 +74,7 @@
 #include "lwpchangemgr.hxx"
 #include "lwpglobalmgr.hxx"
 
-LwpPageLayout::LwpPageLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpPageLayout::LwpPageLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpLayout(objHdr, pStrm)
     , m_nPrinterBin(0)
     , m_nBdroffset(0)
@@ -422,7 +422,7 @@ bool LwpPageLayout::HasColumns()
 * @descr:   Whether has filler page text in current page layout
 *
 */
-bool LwpPageLayout::HasFillerPageText(LwpFoundry* pFoundry)
+bool LwpPageLayout::HasFillerPageText(LwpFoundry const * pFoundry)
 {
     if(!pFoundry) return false;
 
@@ -727,7 +727,7 @@ LwpPara* LwpPageLayout::GetPagePosition()
 
     return nullptr;
 }
-LwpHeaderLayout::LwpHeaderLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm )
+LwpHeaderLayout::LwpHeaderLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm )
     : LwpPlacableLayout(objHdr, pStrm)
     , m_nBorderOffset(0)
 {
@@ -891,7 +891,7 @@ void LwpHeaderLayout::RegisterStyle(XFMasterPage* mp1)
     mp1->SetHeader(xHeader);
 }
 
-LwpFooterLayout::LwpFooterLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm )
+LwpFooterLayout::LwpFooterLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm )
     : LwpPlacableLayout( objHdr, pStrm )
     , m_nBorderOffset(0)
 {
diff --git a/lotuswordpro/source/filter/lwppagelayout.hxx b/lotuswordpro/source/filter/lwppagelayout.hxx
index 9ced5a80f856..13e4740f78e4 100644
--- a/lotuswordpro/source/filter/lwppagelayout.hxx
+++ b/lotuswordpro/source/filter/lwppagelayout.hxx
@@ -67,7 +67,7 @@ class LwpFooterLayout;
 class LwpPageLayout: public LwpLayout
 {
 public:
-    LwpPageLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpPageLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpPageLayout() override;
     virtual void RegisterStyle() override;
     OUString RegisterEndnoteStyle();
@@ -99,7 +99,7 @@ protected:
     XFPageMaster*   m_pXFPageMaster;
 public:
     bool HasColumns();
-    bool HasFillerPageText(LwpFoundry* pFoundry);
+    bool HasFillerPageText(LwpFoundry const * pFoundry);
     void ConvertFillerPageText(XFContentContainer* pCont);
     void ResetXFColumns();
     LwpPageLayout* GetOddChildLayout();
@@ -111,7 +111,7 @@ public:
 class LwpHeaderLayout: public LwpPlacableLayout
 {
 public:
-    LwpHeaderLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpHeaderLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpHeaderLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_HEADER_LAYOUT;}
     using LwpPlacableLayout::RegisterStyle;
@@ -134,7 +134,7 @@ private:
 class LwpFooterLayout: public LwpPlacableLayout
 {
 public:
-    LwpFooterLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpFooterLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpFooterLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_FOOTER_LAYOUT;}
     using LwpPlacableLayout::RegisterStyle;
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index eabeb993cb57..3b5f4957ceba 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -97,7 +97,7 @@
 #include "lwptable.hxx"
 #include <memory>
 
-LwpPara::LwpPara(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpPara::LwpPara(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpDLVList(objHdr, pStrm)
     , m_nOrdinal(0)
     , m_nFlags(0)
@@ -302,7 +302,7 @@ void LwpPara::XFConvert(XFContentContainer* pCont)
         AddBreakAfter(m_pXFContainer);
 }
 
-void LwpPara::RegisterMasterPage(XFParaStyle* pBaseStyle)
+void LwpPara::RegisterMasterPage(XFParaStyle const * pBaseStyle)
 {
     //get story
     LwpStory* pStory = dynamic_cast<LwpStory*>(m_Story.obj().get());
diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx
index d96b50f37023..8cbac2f5a324 100644
--- a/lotuswordpro/source/filter/lwppara.hxx
+++ b/lotuswordpro/source/filter/lwppara.hxx
@@ -139,7 +139,7 @@ class LwpDropcapLayout;
 class LwpPara : public LwpDLVList
 {
 public:
-    LwpPara(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpPara(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
 
     void Read() override;
     void RegisterStyle() override;
@@ -184,8 +184,8 @@ public:
     void RegisterTabStyle(XFParaStyle* pXFParaStyle);
 
     LwpBulletStyleMgr* GetBulletStyleMgr();
-    bool operator <(LwpPara& Other);
-    bool ComparePagePosition(LwpVirtualLayout* pPreLayout, LwpVirtualLayout* pNextLayout);
+    bool operator <(LwpPara const & Other);
+    bool ComparePagePosition(LwpVirtualLayout const * pPreLayout, LwpVirtualLayout const * pNextLayout);
 
     bool IsInCell();
 
@@ -266,9 +266,9 @@ private:
     void OverrideParaBreaks(LwpParaProperty* pProps, XFParaStyle* pOverStyle);
 
     void OverrideParaBullet(LwpParaProperty* pProps);
-    void OverrideParaNumbering(LwpParaProperty* pProps);
+    void OverrideParaNumbering(LwpParaProperty const * pProps);
 
-    void RegisterMasterPage(XFParaStyle* pBaseStyle);
+    void RegisterMasterPage(XFParaStyle const * pBaseStyle);
     void RegisterNewSectionStyle(LwpPageLayout* pLayout);
 
     void ParseDropcapContent();
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index ef1a6cdc2c7a..4af676192b1f 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -511,7 +511,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
  * @short:   Override paranumbering properties.
  * @param:   pProps pointer to the LwpParaProperty and we can get local paranumbering through it.
  */
-void LwpPara::OverrideParaNumbering(LwpParaProperty* pProps)
+void LwpPara::OverrideParaNumbering(LwpParaProperty const * pProps)
 {
     // get numbering override in parastyle
     LwpParaStyle* pParaStyle = GetParaStyle();
@@ -525,7 +525,7 @@ void LwpPara::OverrideParaNumbering(LwpParaProperty* pProps)
     //Override with the local numbering, if any
     if (pProps)
     {
-        LwpNumberingOverride* pPropNumbering = static_cast<LwpParaNumberingProperty*>(pProps)->GetLocalNumbering();
+        LwpNumberingOverride* pPropNumbering = static_cast<LwpParaNumberingProperty const *>(pProps)->GetLocalNumbering();
         if (pPropNumbering)
         {
             pOver.reset(pPropNumbering->clone());
@@ -593,7 +593,7 @@ LwpTabOverride* LwpPara::GetLocalTabOverride()
 * @descr:   Determined which para is earlier in position
 *
 */
-bool LwpPara::operator< (LwpPara& Other)
+bool LwpPara::operator< (LwpPara const & Other)
 {
     return m_nOrdinal < Other.m_nOrdinal;
 }
@@ -602,7 +602,7 @@ bool LwpPara::operator< (LwpPara& Other)
 * @descr:  If the two layouts in the same para, compare which layout is earlied according to frib order
 *
 */
-bool LwpPara::ComparePagePosition(LwpVirtualLayout * pPreLayout, LwpVirtualLayout * pNextLayout)
+bool LwpPara::ComparePagePosition(LwpVirtualLayout const * pPreLayout, LwpVirtualLayout const * pNextLayout)
 {
     m_Fribs.SetPara(this);
     return m_Fribs.ComparePagePosition(pPreLayout, pNextLayout);
diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.cxx b/lotuswordpro/source/filter/lwpparaborderoverride.cxx
index 7f0873a13125..2b1e15f1f0f3 100644
--- a/lotuswordpro/source/filter/lwpparaborderoverride.cxx
+++ b/lotuswordpro/source/filter/lwpparaborderoverride.cxx
@@ -331,22 +331,22 @@ void LwpParaBorderOverride::Override(LwpParaBorderOverride* pOther)
     }
 }
 
-void LwpParaBorderOverride::OverrideBorderStuff(LwpBorderStuff* pBorderStuff)
+void LwpParaBorderOverride::OverrideBorderStuff(LwpBorderStuff const * pBorderStuff)
 {
     *m_pBorderStuff = *pBorderStuff;
     LwpOverride::Override(PBO_STUFF, STATE_ON);
 }
-void LwpParaBorderOverride::OverrideBetweenStuff(LwpBorderStuff* pBorderStuff)
+void LwpParaBorderOverride::OverrideBetweenStuff(LwpBorderStuff const * pBorderStuff)
 {
     *m_pBetweenStuff = *pBorderStuff;
     LwpOverride::Override(PBO_BETWEENSTUFF, STATE_ON);
 }
-void LwpParaBorderOverride::OverrideShadow(LwpShadow* pShadow)
+void LwpParaBorderOverride::OverrideShadow(LwpShadow const * pShadow)
 {
     *m_pShadow = *pShadow;
     LwpOverride::Override(PBO_SHADOW, STATE_ON);
 }
-void LwpParaBorderOverride::OverrideMargins(LwpMargins* pMargins)
+void LwpParaBorderOverride::OverrideMargins(LwpMargins const * pMargins)
 {
     *m_pMargins = *pMargins;
     LwpOverride::Override(PBO_MARGINS, STATE_ON);
diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.hxx b/lotuswordpro/source/filter/lwpparaborderoverride.hxx
index 2a3eaf452c6b..2fa6fa717ba6 100644
--- a/lotuswordpro/source/filter/lwpparaborderoverride.hxx
+++ b/lotuswordpro/source/filter/lwpparaborderoverride.hxx
@@ -104,10 +104,10 @@ public:
     inline bool IsRightWidthOverridden();
     inline bool IsBetweenMarginOverridden();
 
-    void OverrideBorderStuff(LwpBorderStuff* pBorderStuff);
-    void OverrideBetweenStuff(LwpBorderStuff* pBorderStuff);
-    void OverrideShadow(LwpShadow* pShadow);
-    void OverrideMargins(LwpMargins* pMargins);
+    void OverrideBorderStuff(LwpBorderStuff const * pBorderStuff);
+    void OverrideBetweenStuff(LwpBorderStuff const * pBorderStuff);
+    void OverrideShadow(LwpShadow const * pShadow);
+    void OverrideMargins(LwpMargins const * pMargins);
     void OverrideAboveType(BorderWidthType eNewType);
     void OverrideBelowType(BorderWidthType eNewType);
     void OverrideRightType(BorderWidthType eNewType);
diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx
index e5186e8f946c..c5054ee16458 100644
--- a/lotuswordpro/source/filter/lwpparastyle.cxx
+++ b/lotuswordpro/source/filter/lwpparastyle.cxx
@@ -81,7 +81,7 @@
 
 #include "lwpsilverbullet.hxx"
 
-LwpParaStyle::LwpParaStyle(LwpObjectHeader& objHdr, LwpSvStream* pStrm) :
+LwpParaStyle::LwpParaStyle(LwpObjectHeader const & objHdr, LwpSvStream* pStrm) :
 LwpTextStyle(objHdr, pStrm)
 {
 }
diff --git a/lotuswordpro/source/filter/lwpparastyle.hxx b/lotuswordpro/source/filter/lwpparastyle.hxx
index 7f3a88a6f23f..8ffa26af9a7f 100644
--- a/lotuswordpro/source/filter/lwpparastyle.hxx
+++ b/lotuswordpro/source/filter/lwpparastyle.hxx
@@ -74,7 +74,7 @@ class XFBorders;
 class LwpParaStyle : public LwpTextStyle
 {
 public:
-    LwpParaStyle(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpParaStyle(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
 
     virtual ~LwpParaStyle() override;
 
diff --git a/lotuswordpro/source/filter/lwppiece.hxx b/lotuswordpro/source/filter/lwppiece.hxx
index 8c24fb40a13d..b1a190fbb8d1 100644
--- a/lotuswordpro/source/filter/lwppiece.hxx
+++ b/lotuswordpro/source/filter/lwppiece.hxx
@@ -78,7 +78,7 @@ class LwpDLVList;
 class LwpVirtualPiece : public LwpDLVList
 {
 public:
-    LwpVirtualPiece(LwpObjectHeader& objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm)
+    LwpVirtualPiece(LwpObjectHeader const & objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm)
     {
         m_pOverride = nullptr;
     }
@@ -107,7 +107,7 @@ protected:
 class LwpParaBorderPiece : public LwpVirtualPiece
 {
 public:
-    LwpParaBorderPiece(LwpObjectHeader& objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
+    LwpParaBorderPiece(LwpObjectHeader const & objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
     {
         m_pOverride = new LwpParaBorderOverride();
     }
@@ -119,7 +119,7 @@ private:
 class LwpBreaksPiece : public LwpVirtualPiece
 {
 public:
-    LwpBreaksPiece(LwpObjectHeader& objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
+    LwpBreaksPiece(LwpObjectHeader const & objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
     {
         m_pOverride = new LwpBreaksOverride();
     }
@@ -131,7 +131,7 @@ private:
 class LwpNumberingPiece : public LwpVirtualPiece
 {
 public:
-    LwpNumberingPiece(LwpObjectHeader& objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
+    LwpNumberingPiece(LwpObjectHeader const & objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
     {
         m_pOverride = new LwpNumberingOverride();
     }
@@ -143,7 +143,7 @@ private:
 class LwpTabPiece : public LwpVirtualPiece
 {
 public:
-    LwpTabPiece(LwpObjectHeader& objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
+    LwpTabPiece(LwpObjectHeader const & objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
     {
         m_pOverride = new LwpTabOverride();
     }
@@ -155,7 +155,7 @@ private:
 class LwpBackgroundPiece : public LwpVirtualPiece
 {
 public:
-    LwpBackgroundPiece(LwpObjectHeader& objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
+    LwpBackgroundPiece(LwpObjectHeader const & objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
     {
         m_pOverride = new LwpBackgroundOverride();
     }
@@ -167,7 +167,7 @@ private:
 class LwpAlignmentPiece : public LwpVirtualPiece
 {
 public:
-    LwpAlignmentPiece(LwpObjectHeader& objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
+    LwpAlignmentPiece(LwpObjectHeader const & objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
     {
         m_pOverride = new LwpAlignmentOverride();
     }
@@ -179,7 +179,7 @@ private:
 class LwpIndentPiece : public LwpVirtualPiece
 {
 public:
-    LwpIndentPiece(LwpObjectHeader& objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
+    LwpIndentPiece(LwpObjectHeader const & objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
     {
         m_pOverride = new LwpIndentOverride();
     }
@@ -191,7 +191,7 @@ private:
 class LwpSpacingPiece : public LwpVirtualPiece
 {
 public:
-    LwpSpacingPiece(LwpObjectHeader& objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
+    LwpSpacingPiece(LwpObjectHeader const & objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
     {
         m_pOverride = new LwpSpacingOverride();
     }
@@ -203,7 +203,7 @@ private:
 class LwpAmikakePiece : public LwpVirtualPiece
 {
 public:
-    LwpAmikakePiece(LwpObjectHeader& objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
+    LwpAmikakePiece(LwpObjectHeader const & objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
     {
         m_pOverride = new LwpAmikakeOverride();
     }
@@ -215,7 +215,7 @@ private:
 class LwpCharacterBorderPiece : public LwpVirtualPiece
 {
 public:
-    LwpCharacterBorderPiece(LwpObjectHeader& objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
+    LwpCharacterBorderPiece(LwpObjectHeader const & objHdr, LwpSvStream* pStrm):LwpVirtualPiece(objHdr, pStrm)
     {
         m_pOverride = new LwpCharacterBorderOverride();
     }
diff --git a/lotuswordpro/source/filter/lwpproplist.cxx b/lotuswordpro/source/filter/lwpproplist.cxx
index 69587e80e936..9e4f6df2877f 100644
--- a/lotuswordpro/source/filter/lwpproplist.cxx
+++ b/lotuswordpro/source/filter/lwpproplist.cxx
@@ -60,7 +60,7 @@
 
 #include "lwpproplist.hxx"
 
-LwpPropListElement::LwpPropListElement(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpPropListElement::LwpPropListElement(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
 :LwpDLVList(objHdr,pStrm)
 {
 }
diff --git a/lotuswordpro/source/filter/lwpproplist.hxx b/lotuswordpro/source/filter/lwpproplist.hxx
index d326ba733ec9..94fe01d8afad 100644
--- a/lotuswordpro/source/filter/lwpproplist.hxx
+++ b/lotuswordpro/source/filter/lwpproplist.hxx
@@ -68,7 +68,7 @@
 class LwpPropListElement : public LwpDLVList
 {
 public:
-    LwpPropListElement(LwpObjectHeader &objHdr, LwpSvStream *pStrm);
+    LwpPropListElement(LwpObjectHeader const &objHdr, LwpSvStream *pStrm);
     void Read() override;
     bool IsNamed(const OUString& name);
     LwpPropListElement* GetNext();
diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx
index 8ddff0a5c7b0..f51c0e17cb29 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/lotuswordpro/source/filter/lwprowlayout.cxx
@@ -69,7 +69,7 @@
 #include "xfilter/xfcell.hxx"
 #include "xfilter/xfcellstyle.hxx"
 
-LwpRowLayout::LwpRowLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpRowLayout::LwpRowLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpVirtualLayout(objHdr, pStrm)
     , crowid(0)
     , cheight(0)
@@ -462,7 +462,7 @@ bool LwpRowLayout::GetMergeCellFlag()
     return !m_ConnCellList.empty();
 }
 
-LwpRowHeadingLayout::LwpRowHeadingLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpRowHeadingLayout::LwpRowHeadingLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpRowLayout(objHdr, pStrm)
 {}
 
diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx
index 08e79c7abe36..6b6aadbe8351 100644
--- a/lotuswordpro/source/filter/lwprowlayout.hxx
+++ b/lotuswordpro/source/filter/lwprowlayout.hxx
@@ -75,7 +75,7 @@ class LwpTableLayout;
 class LwpRowLayout : public LwpVirtualLayout
 {
 public:
-    LwpRowLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpRowLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpRowLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_ROW_LAYOUT;}
     sal_uInt16 GetRowID() { return crowid;}
@@ -117,7 +117,7 @@ public:
 class LwpRowHeadingLayout : public LwpRowLayout
 {
 public:
-    LwpRowHeadingLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpRowHeadingLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpRowHeadingLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_ROW_HEADING_LAYOUT;}
 protected:
diff --git a/lotuswordpro/source/filter/lwpsection.cxx b/lotuswordpro/source/filter/lwpsection.cxx
index ea44aff7bd0e..49c5174ba784 100644
--- a/lotuswordpro/source/filter/lwpsection.cxx
+++ b/lotuswordpro/source/filter/lwpsection.cxx
@@ -66,7 +66,7 @@
 #include "lwpsection.hxx"
 #include "xfilter/xfsection.hxx"
 
-LwpOrderedObject::LwpOrderedObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpOrderedObject::LwpOrderedObject(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpDLNFVList(objHdr, pStrm)
 {}
 
@@ -83,7 +83,7 @@ void LwpOrderedObject::Read()
     m_pObjStrm->SkipExtra();
 }
 
-LwpSection::LwpSection(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpSection::LwpSection(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     : LwpOrderedObject(objHdr, pStrm)
     , m_Flags(0)
 {}
@@ -116,7 +116,7 @@ void LwpSection::Parse(IXFStream * /*pOutputStream*/)
 
 }
 
-LwpIndexSection::LwpIndexSection(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
+LwpIndexSection::LwpIndexSection(LwpObjectHeader const &objHdr, LwpSvStream *pStrm)
     : LwpSection(objHdr, pStrm)
     , m_nForm(0)
     , m_nFlags(0)
diff --git a/lotuswordpro/source/filter/lwpsection.hxx b/lotuswordpro/source/filter/lwpsection.hxx
index dccb88795c62..0cbdfb0c2f87 100644
--- a/lotuswordpro/source/filter/lwpsection.hxx
+++ b/lotuswordpro/source/filter/lwpsection.hxx
@@ -70,7 +70,7 @@ class LwpDLNFVList;
 class LwpOrderedObject : public LwpDLNFVList
 {
 public:
-    LwpOrderedObject(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpOrderedObject(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     void Read() override;
     LwpObjectID& GetPosition(){ return m_Para;}
     LwpObjectID& GetListList(){ return m_ListList;}
@@ -88,7 +88,7 @@ class LwpAtomHolder;
 class LwpSection : public LwpOrderedObject
 {
 public:
-    LwpSection(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpSection(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpSection() override;
     inline LwpPageLayout* GetPageLayout();
     void Parse(IXFStream* pOutputStream) override;
@@ -116,7 +116,7 @@ inline LwpPageLayout* LwpSection::GetPageLayout()
 class LwpIndexSection : public LwpSection
 {
 public:
-    LwpIndexSection(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpIndexSection(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpIndexSection() override;
     bool IsFormatRunin();
     bool IsFormatSeparator();
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index b84eec40b62a..ff3cbafc9e9c 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -69,7 +69,7 @@
 #include "xfilter/xfliststyle.hxx"
 #include "xfilter/xfstylemanager.hxx"
 
-LwpSilverBullet::LwpSilverBullet(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpSilverBullet::LwpSilverBullet(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpDLNFVList(objHdr, pStrm)
     , m_nFlags(0)
     , m_nUseCount(0)
@@ -246,7 +246,7 @@ LwpPara* LwpSilverBullet::GetBulletPara()
  *          includes numbering prefix, format and suffix.
  * @return:  An OUString object which store the numbering character.
  */
-OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumber)
+OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber const * pParaNumber)
 {
     if (!pParaNumber)
     {
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.hxx b/lotuswordpro/source/filter/lwpsilverbullet.hxx
index f130d46c6a75..790a1a6ab675 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.hxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.hxx
@@ -90,7 +90,7 @@ class LwpFribParaNumber;
 class LwpSilverBullet : public LwpDLNFVList
 {
 public:
-    LwpSilverBullet(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpSilverBullet(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
 
     virtual ~LwpSilverBullet() override;
 
@@ -112,11 +112,9 @@ public:
 
     bool HasName();
 
-    static OUString GetNumCharByStyleID(LwpFribParaNumber* pParaNumber);
+    static OUString GetNumCharByStyleID(LwpFribParaNumber const * pParaNumber);
 
-    ;
     inline bool IsLesserLevel(sal_uInt16 nPos);
-    ;
 
     LwpPara* GetBulletPara();
 
diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx
index d6921ef0e341..ff08a7e1f910 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -68,7 +68,7 @@
 #include "lwppagelayout.hxx"
 
 
-LwpStory::LwpStory(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpStory::LwpStory(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpContent(objHdr, pStrm)
     , m_bPMModified(false)
     , m_pCurrentLayout(nullptr)
diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx
index e8006c4266e2..fc3426de9b33 100644
--- a/lotuswordpro/source/filter/lwpstory.hxx
+++ b/lotuswordpro/source/filter/lwpstory.hxx
@@ -70,7 +70,7 @@ class LwpPageLayout;
 class LwpStory: public LwpContent
 {
 public:
-    LwpStory(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpStory(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpStory() override;
 private:
     //File format members:
diff --git a/lotuswordpro/source/filter/lwptable.cxx b/lotuswordpro/source/filter/lwptable.cxx
index a7e0d3d63802..d6c1cb17cd43 100644
--- a/lotuswordpro/source/filter/lwptable.cxx
+++ b/lotuswordpro/source/filter/lwptable.cxx
@@ -60,7 +60,7 @@
 
  #include "lwptable.hxx"
 
- LwpSuperTable::LwpSuperTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpContent(objHdr, pStrm)
+ LwpSuperTable::LwpSuperTable(LwpObjectHeader const &objHdr, LwpSvStream* pStrm):LwpContent(objHdr, pStrm)
 {}
 
 LwpSuperTable::~LwpSuperTable()
@@ -82,7 +82,7 @@ void LwpSuperTable::XFConvert(XFContentContainer* /*pCont*/)
 }
 
 /*****************************************************************************/
- LwpTable::LwpTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+ LwpTable::LwpTable(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
      : LwpContent(objHdr, pStrm)
      , m_nRow(0)
      , m_nColumn(0)
@@ -142,7 +142,7 @@ void  LwpTable::Parse(IXFStream* /*pOutputStream*/)
 }
 
  /*****************************************************************************/
- LwpTableHeading::LwpTableHeading(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpTable(objHdr, pStrm)
+ LwpTableHeading::LwpTableHeading(LwpObjectHeader const &objHdr, LwpSvStream* pStrm):LwpTable(objHdr, pStrm)
 {}
 
 LwpTableHeading::~LwpTableHeading()
@@ -158,7 +158,7 @@ void  LwpTableHeading::Parse(IXFStream* /*pOutputStream*/)
 }
 
  /*****************************************************************************/
-LwpParallelColumns::LwpParallelColumns(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpTable(objHdr, pStrm)
+LwpParallelColumns::LwpParallelColumns(LwpObjectHeader const &objHdr, LwpSvStream* pStrm):LwpTable(objHdr, pStrm)
 {
 }
 
@@ -175,7 +175,7 @@ void LwpParallelColumns::Read()
     m_pObjStrm->SkipExtra();
 }
  /*****************************************************************************/
-LwpGlossary::LwpGlossary(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpParallelColumns(objHdr, pStrm)
+LwpGlossary::LwpGlossary(LwpObjectHeader const &objHdr, LwpSvStream* pStrm):LwpParallelColumns(objHdr, pStrm)
 {
 }
 
diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx
index fce2172e1e3b..19c65c31710b 100644
--- a/lotuswordpro/source/filter/lwptable.hxx
+++ b/lotuswordpro/source/filter/lwptable.hxx
@@ -78,7 +78,7 @@ class LwpTableLayout;
 class LwpSuperTable: public LwpContent
 {
 public:
-    LwpSuperTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpSuperTable(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpSuperTable() override;
 
     virtual void Parse(IXFStream* pOutputStream) override;
@@ -109,7 +109,7 @@ protected:
 class LwpTable: public LwpContent
 {
 public:
-    LwpTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpTable(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpTable() override;
 
     virtual void Parse(IXFStream* pOutputStream) override;
@@ -152,7 +152,7 @@ protected:
 class LwpTableHeading : public LwpTable
 {
 public:
-    LwpTableHeading(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpTableHeading(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpTableHeading() override;
 
     virtual void Parse(IXFStream* pOutputStream) override;
@@ -163,7 +163,7 @@ protected:
 class LwpParallelColumns : public LwpTable
 {
 public:
-    LwpParallelColumns(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpParallelColumns(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpParallelColumns() override;
 protected:
     void Read() override;
@@ -177,7 +177,7 @@ protected:
 class LwpGlossary : public LwpParallelColumns
 {
 public:
-    LwpGlossary(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpGlossary(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpGlossary() override;
 protected:
     void Read() override;
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index 5b63e64cac59..7e57f1a50f1e 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -84,7 +84,7 @@
 #include "xfilter/xfparastyle.hxx"
 #include <memory>
 
-LwpSuperTableLayout::LwpSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpSuperTableLayout::LwpSuperTableLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpPlacableLayout(objHdr, pStrm)
 {
     m_pFrame.reset(new LwpFrame(this) );
@@ -410,7 +410,7 @@ void  LwpSuperTableLayout::RegisterFrameStyle()
     m_pFrame->RegisterStyle(xFrameStyle);
 }
 
-LwpTableLayout::LwpTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpTableLayout::LwpTableLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpLayout(objHdr, pStrm)
     , m_nRows(0)
     , m_nCols(0)
@@ -1407,7 +1407,7 @@ XFCell* LwpTableLayout::GetCellsMap(sal_uInt16 nRow,sal_uInt8 nCol)
 }
 
 //add end by
-LwpColumnLayout::LwpColumnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpColumnLayout::LwpColumnLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpVirtualLayout(objHdr, pStrm)
     , ccolid(0)
     , cwidth(0)
@@ -1438,7 +1438,7 @@ void LwpColumnLayout::RegisterStyle(double dCalculatedWidth)
     m_StyleName = pXFStyleManager->AddStyle(pColStyle).m_pStyle->GetStyleName();
 }
 
-LwpTableHeadingLayout::LwpTableHeadingLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpTableHeadingLayout::LwpTableHeadingLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpTableLayout(objHdr, pStrm)
     , cStartRow(0)
     , cEndRow(0)
@@ -1473,7 +1473,7 @@ void LwpTableHeadingLayout::GetStartEndRow(sal_uInt16& nStartRow, sal_uInt16& nE
     nEndRow = cEndRow;
 }
 
-LwpSuperParallelColumnLayout::LwpSuperParallelColumnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpSuperTableLayout(objHdr, pStrm)
+LwpSuperParallelColumnLayout::LwpSuperParallelColumnLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm):LwpSuperTableLayout(objHdr, pStrm)
 {
 }
 LwpSuperParallelColumnLayout::~LwpSuperParallelColumnLayout()
@@ -1486,7 +1486,7 @@ void LwpSuperParallelColumnLayout::Read()
 
 }
 
-LwpSuperGlossaryLayout::LwpSuperGlossaryLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpSuperTableLayout(objHdr, pStrm)
+LwpSuperGlossaryLayout::LwpSuperGlossaryLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm):LwpSuperTableLayout(objHdr, pStrm)
 {
 }
 
@@ -1500,7 +1500,7 @@ void LwpSuperGlossaryLayout::Read()
     m_pObjStrm->SkipExtra();
 }
 
-LwpParallelColumnsLayout::LwpParallelColumnsLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpTableLayout(objHdr, pStrm)
+LwpParallelColumnsLayout::LwpParallelColumnsLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm):LwpTableLayout(objHdr, pStrm)
 {
 }
 
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx
index 7237df9591fc..ef80dd5ac0e6 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/lotuswordpro/source/filter/lwptablelayout.hxx
@@ -87,7 +87,7 @@ class LwpColumnLayout;
 class LwpTableLayout: public LwpLayout
 {
 public:
-    LwpTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpTableLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpTableLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_TABLE_LAYOUT;}
     LwpObjectID& GetColumnLayoutHead(){return m_ColumnLayout;}
@@ -159,7 +159,7 @@ private:
 class LwpSuperTableLayout: public LwpPlacableLayout
 {
 public:
-    LwpSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpSuperTableLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpSuperTableLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_SUPERTABLE_LAYOUT;}
     void RegisterNewStyle();
@@ -193,7 +193,7 @@ protected:
 class LwpColumnLayout : public LwpVirtualLayout
 {
 public:
-    LwpColumnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpColumnLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpColumnLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_COLUMN_LAYOUT;}
     sal_uInt32 GetColumnID(){return ccolid;}
@@ -214,7 +214,7 @@ protected:
 class LwpTableHeadingLayout : public LwpTableLayout
 {
 public:
-    LwpTableHeadingLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpTableHeadingLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpTableHeadingLayout() override;
     virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_TABLE_HEADING_LAYOUT;}
     void GetStartEndRow(sal_uInt16& nStartRow, sal_uInt16& nEndRow);
@@ -230,7 +230,7 @@ protected:
 class LwpSuperParallelColumnLayout : public LwpSuperTableLayout
 {
 public:
-    LwpSuperParallelColumnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpSuperParallelColumnLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpSuperParallelColumnLayout() override;
 protected:
     void Read() override;
@@ -243,7 +243,7 @@ protected:
 class LwpParallelColumnsLayout : public LwpTableLayout
 {
 public:
-    LwpParallelColumnsLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpParallelColumnsLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpParallelColumnsLayout() override;
 protected:
     void Read() override;
@@ -252,7 +252,7 @@ protected:
 class LwpSuperGlossaryLayout : public LwpSuperTableLayout
 {
 public:
-    LwpSuperGlossaryLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpSuperGlossaryLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpSuperGlossaryLayout() override;
 protected:
     void Read() override;
diff --git a/lotuswordpro/source/filter/lwptblcell.cxx b/lotuswordpro/source/filter/lwptblcell.cxx
index d60a20dc6963..0021a186cf53 100644
--- a/lotuswordpro/source/filter/lwptblcell.cxx
+++ b/lotuswordpro/source/filter/lwptblcell.cxx
@@ -63,7 +63,7 @@
 #include "lwptblcell.hxx"
 #include "lwppara.hxx"
 
- LwpCellList::LwpCellList(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+ LwpCellList::LwpCellList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
      : LwpDLVList(objHdr, pStrm)
      , cColumn(0)
 {}
@@ -110,7 +110,7 @@ void LwpCellList::Convert(XFCell * pCell, LwpTableLayout* /*pCellsMap*/)
     }
 }
 
-LwpNumericValue::LwpNumericValue(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpNumericValue::LwpNumericValue(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpObject(objHdr, pStrm)
     , cNumber(0)
 {}
@@ -129,7 +129,7 @@ void  LwpNumericValue::Parse(IXFStream* /*pOutputStream*/)
 {
 }
 
-LwpRowList::LwpRowList(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpRowList::LwpRowList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpDLVList(objHdr, pStrm)
     , cRowID(0)
 {}
@@ -156,7 +156,7 @@ void LwpRowList::Read()
 {
 }
 
-LwpTableRange::LwpTableRange(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpTableRange::LwpTableRange(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     :LwpDLVList(objHdr, pStrm)
 {}
 
@@ -176,7 +176,7 @@ void  LwpTableRange::Parse(IXFStream* /*pOutputStream*/)
 {
 }
 
- LwpCellRange::LwpCellRange(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpObject(objHdr, pStrm)
+ LwpCellRange::LwpCellRange(LwpObjectHeader const &objHdr, LwpSvStream* pStrm):LwpObject(objHdr, pStrm)
 {}
 
 LwpCellRange::~LwpCellRange()
@@ -192,7 +192,7 @@ void  LwpCellRange::Parse(IXFStream* /*pOutputStream*/)
 {
 }
 
- LwpFolder::LwpFolder(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm)
+ LwpFolder::LwpFolder(LwpObjectHeader const &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm)
 {}
 
 LwpFolder::~LwpFolder()
@@ -217,7 +217,7 @@ void  LwpFolder::Parse(IXFStream* /*pOutputStream*/)
 {
 }
 
-LwpDependent::LwpDependent(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpDependent::LwpDependent(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpDLVList(objHdr, pStrm)
     , cReferenceOffset(0)
     , cFlags(0)
diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx
index 0907e6fc6ef4..2ccaec0ccd28 100644
--- a/lotuswordpro/source/filter/lwptblcell.hxx
+++ b/lotuswordpro/source/filter/lwptblcell.hxx
@@ -79,7 +79,7 @@ class LwpTableLayout;
 class LwpCellList : public LwpDLVList
 {
 public:
-    LwpCellList(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpCellList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
 
     virtual void Parse(IXFStream* pOutputStream) override;
     LwpObjectID GetNextID(){return GetNext();}
@@ -102,7 +102,7 @@ protected:
 class LwpRowList : public LwpDLVList
 {
 public:
-    LwpRowList(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpRowList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
 
     void Parse(IXFStream* pOutputStream) override;
     LwpObjectID GetChildHeadID(){return cChild.GetHead();}
@@ -123,7 +123,7 @@ private:
 class LwpNumericValue : public LwpObject
 {
 public:
-    LwpNumericValue(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpNumericValue(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
 
     double GetValue(){return cNumber;}
     void Parse(IXFStream* pOutputStream) override;
@@ -142,7 +142,7 @@ private:
 class LwpTableRange: public LwpDLVList
 {
 public:
-    LwpTableRange(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpTableRange(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
 
     void Parse(IXFStream* pOutputStream) override;
     const LwpObjectID& GetCellRangeID(){return cpCellRange;}
@@ -162,7 +162,7 @@ private:
 class LwpCellRange: public LwpObject
 {
 public:
-    LwpCellRange(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpCellRange(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
 
     void Parse(IXFStream* pOutputStream) override;
     const LwpObjectID& GetFolderID(){return cpFolder;}
@@ -179,7 +179,7 @@ private:
 class LwpFolder: public LwpDLVList
 {
 public:
-    LwpFolder(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpFolder(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
 
     void Parse(IXFStream* pOutputStream) override;
     LwpObjectID GetChildHeadID(){ return cChild.GetHead();}
@@ -198,7 +198,7 @@ private:
 class LwpDependent: public LwpDLVList
 {
 public:
-    LwpDependent(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpDependent(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
 
     void Parse(IXFStream* pOutputStream) override;
 protected:
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index 7ec008bc37c0..8e352e5c8b8d 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -72,7 +72,7 @@ LwpFormulaArg::~LwpFormulaArg()
 {
 }
 
- LwpFormulaInfo::LwpFormulaInfo(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+ LwpFormulaInfo::LwpFormulaInfo(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpCellList(objHdr, pStrm)
     , m_bSupported(true)
     , m_nFormulaRow(0)
diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx
index ab0bbdcf323c..44a61b017e26 100644
--- a/lotuswordpro/source/filter/lwptblformula.hxx
+++ b/lotuswordpro/source/filter/lwptblformula.hxx
@@ -194,7 +194,7 @@ public:
 class LwpFormulaInfo : public LwpCellList
 {
 public:
-    LwpFormulaInfo(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpFormulaInfo(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     OUString Convert(LwpTableLayout* pCellsMap);
     void Convert(XFCell * pCell, LwpTableLayout* pCellsMap=nullptr) override;
 protected:
diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx
index be8d12a76b03..52aaf6625b68 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -75,7 +75,7 @@
 #include "xfilter/xfframe.hxx"
 #include "xfilter/xftable.hxx"
 
-LwpTocSuperLayout::LwpTocSuperLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
+LwpTocSuperLayout::LwpTocSuperLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
     : LwpSuperTableLayout(objHdr, pStrm)
     , m_nFrom(0)
     , m_pCont(nullptr)
@@ -434,7 +434,7 @@ LwpTocLevelData * LwpTocSuperLayout::GetNextSearchLevelPtr(sal_uInt16 index, Lwp
     return nullptr;
 }
 
-LwpTocLevelData::LwpTocLevelData(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm)
+LwpTocLevelData::LwpTocLevelData(LwpObjectHeader const &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm)
 {
     m_nFlags = 0;
     m_nLevel = 0;
diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx
index 5c2c2c85191c..7923fdf8c394 100644
--- a/lotuswordpro/source/filter/lwptoc.hxx
+++ b/lotuswordpro/source/filter/lwptoc.hxx
@@ -70,7 +70,7 @@ class XFIndex;
 class LwpTocSuperLayout : public LwpSuperTableLayout
 {
 public:
-    LwpTocSuperLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpTocSuperLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     virtual ~LwpTocSuperLayout() override;
     void RegisterStyle() override;
     virtual void XFConvert(XFContentContainer* pCont) override;
@@ -144,7 +144,7 @@ public:
         USETEXT = 0x01,
         USENUMBER = 0x02
     };
-    LwpTocLevelData(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
+    LwpTocLevelData(LwpObjectHeader const &objHdr, LwpSvStream* pStrm);
     void RegisterStyle() override;
     virtual void XFConvert(XFContentContainer* pCont) override;
     sal_uInt16 GetLevel(){return m_nLevel;}
diff --git a/lotuswordpro/source/filter/lwpverdocument.cxx b/lotuswordpro/source/filter/lwpverdocument.cxx
index 19bc0213a08a..c87d758d9d31 100644
--- a/lotuswordpro/source/filter/lwpverdocument.cxx
+++ b/lotuswordpro/source/filter/lwpverdocument.cxx
@@ -67,7 +67,7 @@
 #include "xfilter/xfparastyle.hxx"
 #include "lwptools.hxx"
 
-LwpVerDocument::LwpVerDocument(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpVerDocument::LwpVerDocument(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpObject(objHdr, pStrm)
     , m_nTabSpacing(0)
 {}
diff --git a/lotuswordpro/source/filter/lwpverdocument.hxx b/lotuswordpro/source/filter/lwpverdocument.hxx
index c6ae2e826fc9..b5c2026f2747 100644
--- a/lotuswordpro/source/filter/lwpverdocument.hxx
+++ b/lotuswordpro/source/filter/lwpverdocument.hxx
@@ -70,7 +70,7 @@
 class LwpVerDocument : public LwpObject
 {
 public:
-    LwpVerDocument(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpVerDocument(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     void Read() override;
     virtual void RegisterStyle() override;
 private:
diff --git a/lotuswordpro/source/filter/lwpvpointer.cxx b/lotuswordpro/source/filter/lwpvpointer.cxx
index 9d1fdb217730..12f36daf318e 100644
--- a/lotuswordpro/source/filter/lwpvpointer.cxx
+++ b/lotuswordpro/source/filter/lwpvpointer.cxx
@@ -56,7 +56,7 @@
 #include "lwpvpointer.hxx"
 #include "lwpfilehdr.hxx"
 
-LwpVersionedPointer::LwpVersionedPointer(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
+LwpVersionedPointer::LwpVersionedPointer(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     : LwpObject(objHdr, pStrm)
 {}
 
diff --git a/lotuswordpro/source/filter/lwpvpointer.hxx b/lotuswordpro/source/filter/lwpvpointer.hxx
index 283e6c688446..3d26d38806d1 100644
--- a/lotuswordpro/source/filter/lwpvpointer.hxx
+++ b/lotuswordpro/source/filter/lwpvpointer.hxx
@@ -67,7 +67,7 @@
 class LwpVersionedPointer : public LwpObject
 {
 public:
-    LwpVersionedPointer(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
+    LwpVersionedPointer(LwpObjectHeader const & objHdr, LwpSvStream* pStrm);
     void Read() override;
     void RegisterStyle() override;
     void Parse(IXFStream* pOutputStream) override;
diff --git a/lotuswordpro/source/filter/ut.hxx b/lotuswordpro/source/filter/ut.hxx
index 5b04883df76d..92ef8d31cacf 100644
--- a/lotuswordpro/source/filter/ut.hxx
+++ b/lotuswordpro/source/filter/ut.hxx
@@ -60,10 +60,10 @@
 namespace OpenStormBento
 {
 
-inline sal_uInt16 UtGetIntelWord(sal_uInt8 * pData)
+inline sal_uInt16 UtGetIntelWord(sal_uInt8 const * pData)
 { return pData[0] | pData[1] << 8; }
 
-inline sal_uInt32 UtGetIntelDWord(sal_uInt8 * pData)
+inline sal_uInt32 UtGetIntelDWord(sal_uInt8 const * pData)
 { return pData[0] | pData[1] << 8 | pData[2] << 16 | pData[3] << 24; }
 
 inline sal_uInt8 UtGetIntelByte(sal_uInt8 * pData)
diff --git a/lotuswordpro/source/filter/utlist.cxx b/lotuswordpro/source/filter/utlist.cxx
index 95e25e137bd4..5c0d4d261cd0 100644
--- a/lotuswordpro/source/filter/utlist.cxx
+++ b/lotuswordpro/source/filter/utlist.cxx
@@ -92,7 +92,7 @@ CUtList::~CUtList()
 // in list after pCurr or NULL if no more items in list.  Terminating item
 // is never returned
 CUtListElmt *
-CUtList::GetNextOrNULL(CUtListElmt * pCurr)
+CUtList::GetNextOrNULL(CUtListElmt const * pCurr)
 {
     CUtListElmt * pNext;
 
diff --git a/lotuswordpro/source/filter/utlist.hxx b/lotuswordpro/source/filter/utlist.hxx
index 78880cb99464..58a666a2f8a3 100644
--- a/lotuswordpro/source/filter/utlist.hxx
+++ b/lotuswordpro/source/filter/utlist.hxx
@@ -101,7 +101,7 @@ public: // Methods
     CUtListElmt * GetFirst() { return cDummyElmt.GetNext(); }
     CUtListElmt * GetLast() { return cDummyElmt.GetPrev(); }
     CUtListElmt& GetTerminating() { return cDummyElmt; }
-    CUtListElmt * GetNextOrNULL(CUtListElmt * pCurr);
+    CUtListElmt * GetNextOrNULL(CUtListElmt const * pCurr);
 
     void Destroy();
 
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
index b7691a651ec9..a50d83353afb 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfbgimage.cxx
@@ -124,7 +124,7 @@ void    XFBGImage::ToXml(IXFStream *pStrm)
     pStrm->EndElement( "style:background-image" );
 }
 
-bool operator==(XFBGImage& img1, XFBGImage& img2)
+bool operator==(XFBGImage const & img1, XFBGImage const & img2)
 {
     if( img1.m_bUserFileLink != img2.m_bUserFileLink )
         return false;
@@ -152,7 +152,7 @@ bool operator==(XFBGImage& img1, XFBGImage& img2)
     return true;
 }
 
-bool operator!=(XFBGImage& img1, XFBGImage& img2)
+bool operator!=(XFBGImage const & img1, XFBGImage const & img2)
 {
     return !(img1==img2);
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
index 1a9dee30f330..fb6a2193211a 100644
--- a/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbgimage.hxx
@@ -105,8 +105,8 @@ public:
 
     virtual void ToXml(IXFStream *pStrm) override;
 
-    friend bool operator==(XFBGImage& img1, XFBGImage& img2);
-    friend bool operator!=(XFBGImage& img1, XFBGImage& img2);
+    friend bool operator==(XFBGImage const & img1, XFBGImage const & img2);
+    friend bool operator!=(XFBGImage const & img1, XFBGImage const & img2);
 private:
     OUString   m_strFileName;
     OUString   m_strData;
diff --git a/lotuswordpro/source/filter/xfilter/xfborders.cxx b/lotuswordpro/source/filter/xfilter/xfborders.cxx
index 2d3ef738d5e9..695914482b05 100644
--- a/lotuswordpro/source/filter/xfilter/xfborders.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfborders.cxx
@@ -69,7 +69,7 @@ XFBorder::XFBorder()
     m_fWidthOuter = 0;
 }
 
-void    XFBorder::SetColor(XFColor& color)
+void    XFBorder::SetColor(XFColor const & color)
 {
     m_aColor = color;
 }
@@ -152,7 +152,7 @@ OUString   XFBorder::ToString()
     return str;
 }
 
-bool operator==(XFBorder& b1, XFBorder& b2)
+bool operator==(XFBorder const & b1, XFBorder const & b2)
 {
     if( b1.m_fOffset != b2.m_fOffset )
         return false;
@@ -178,14 +178,14 @@ bool operator==(XFBorder& b1, XFBorder& b2)
     return true;
 }
 
-bool operator!=(XFBorder& b1, XFBorder& b2)
+bool operator!=(XFBorder const & b1, XFBorder const & b2)
 {
     return !(b1 == b2);
 }
 
 //XFBorders:
 
-void    XFBorders::SetColor(enumXFBorder side, XFColor& color)
+void    XFBorders::SetColor(enumXFBorder side, XFColor const & color)
 {
     switch(side)
     {
@@ -311,7 +311,7 @@ void    XFBorders::SetWidthOuter(enumXFBorder side, double outer)
     }
 }
 
-bool    operator ==(XFBorders& b1, XFBorders& b2)
+bool    operator ==(XFBorders const & b1, XFBorders const & b2)
 {
     if( b1.m_aBorderLeft != b2.m_aBorderLeft )
         return false;
@@ -324,7 +324,7 @@ bool    operator ==(XFBorders& b1, XFBorders& b2)
     return true;
 }
 
-bool operator!=(XFBorders& b1, XFBorders& b2)
+bool operator!=(XFBorders const & b1, XFBorders const & b2)
 {
     return !(b1 == b2);
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfborders.hxx b/lotuswordpro/source/filter/xfilter/xfborders.hxx
index c537cb0a8dff..dc2cd4b705ef 100644
--- a/lotuswordpro/source/filter/xfilter/xfborders.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfborders.hxx
@@ -76,7 +76,7 @@ public:
     /**
      * @descr   Set border color.
      */
-    void        SetColor(XFColor& color);
+    void        SetColor(XFColor const & color);
 
     /**
      * @descr   Set border width in cm.
@@ -111,8 +111,8 @@ private:
 
     OUString   ToString();
 
-    friend bool operator==(XFBorder& b1, XFBorder& b2);
-    friend bool operator!=(XFBorder& b1, XFBorder& b2);
+    friend bool operator==(XFBorder const & b1, XFBorder const & b2);
+    friend bool operator!=(XFBorder const & b1, XFBorder const & b2);
     friend class XFBorders;
 
 private:
@@ -139,7 +139,7 @@ public:
     /**
      * @descr   Set color of border side.
      */
-    void    SetColor(enumXFBorder side, XFColor& color);
+    void    SetColor(enumXFBorder side, XFColor const & color);
 
     /**
      * @descr   Set width or border side.
@@ -176,8 +176,8 @@ public:
 
     void    ToXml(IXFStream *pStrm);
 
-    friend bool operator==(XFBorders& b1, XFBorders& b2);
-    friend bool operator!=(XFBorders& b1, XFBorders& b2);
+    friend bool operator==(XFBorders const & b1, XFBorders const & b2);
+    friend bool operator!=(XFBorders const & b1, XFBorders const & b2);
 
 private:
     XFBorder    m_aBorderLeft;
diff --git a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx b/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
index 48c86ad425e8..59a39c675d7b 100644
--- a/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfbreaks.hxx
@@ -80,8 +80,8 @@ public:
      */
     void    ToXml(IXFStream *pStrm);
 
-    friend bool operator==(XFBreaks& b1, XFBreaks& b2);
-    friend bool operator!=(XFBreaks& b1, XFBreaks& b2);
+    friend bool operator==(XFBreaks const & b1, XFBreaks const & b2);
+    friend bool operator!=(XFBreaks const & b1, XFBreaks const & b2);
 
 private:
     enumXFBreaks    m_eBreaks;
@@ -120,12 +120,12 @@ inline void XFBreaks::ToXml(IXFStream *pStrm)
     }
 }
 
-inline bool operator==(XFBreaks& b1, XFBreaks& b2)
+inline bool operator==(XFBreaks const & b1, XFBreaks const & b2)
 {
     return b1.m_eBreaks == b2.m_eBreaks;
 }
 
-inline bool operator!=(XFBreaks& b1, XFBreaks& b2)
+inline bool operator!=(XFBreaks const & b1, XFBreaks const & b2)
 {
     return !(b1==b2);
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
index aab7919a6421..4f5c6b217c53 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
@@ -87,7 +87,7 @@ void XFCellStyle::SetPadding(double left, double right,double top, double bottom
         m_aPadding.SetBottom( bottom );
 }
 
-void    XFCellStyle::SetBackColor(XFColor& color)
+void    XFCellStyle::SetBackColor(XFColor const & color)
 {
     m_aBackColor = color;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
index 0f9ec761f11e..f8b2f5cf3484 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx
@@ -119,7 +119,7 @@ public:
      * @descr:  Set background color of the cell.
      * @param:  color value of the back color.
      */
-    void    SetBackColor(XFColor& color);
+    void    SetBackColor(XFColor const & color);
 
     /**
      * descr:   set cell background image.
diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.cxx b/lotuswordpro/source/filter/xfilter/xfcolor.cxx
index ede680821d7e..d4adff73e78b 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolor.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolor.cxx
@@ -75,7 +75,7 @@ OUString XFColor::ToString() const
     return OUString::createFromAscii(buf);
 }
 
-bool operator==(XFColor& c1, XFColor& c2)
+bool operator==(XFColor const & c1, XFColor const & c2)
 {
     return (
         (c1.m_nRed==c2.m_nRed)&&
@@ -84,7 +84,7 @@ bool operator==(XFColor& c1, XFColor& c2)
         );
 }
 
-bool operator!=(XFColor& c1, XFColor& c2)
+bool operator!=(XFColor const & c1, XFColor const & c2)
 {
     return !(c1==c2);
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.hxx b/lotuswordpro/source/filter/xfilter/xfcolor.hxx
index 53f4e0a13220..5b024cfb6254 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolor.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolor.hxx
@@ -100,8 +100,8 @@ public:
 
     OUString   ToString ()const;
 
-    friend bool operator==(XFColor& c1, XFColor& c2);
-    friend bool operator!=(XFColor& c1, XFColor& c2);
+    friend bool operator==(XFColor const & c1, XFColor const & c2);
+    friend bool operator!=(XFColor const & c1, XFColor const & c2);
 private:
     sal_uInt8   m_nRed;
     sal_uInt8   m_nGreen;
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
index 68e3aeccd047..48d8367f018e 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
@@ -92,7 +92,7 @@ void    XFColumnSep::SetWidth(double width)
 {
     m_fWidth = width;
 }
-void    XFColumnSep::SetColor(XFColor& color)
+void    XFColumnSep::SetColor(XFColor const & color)
 {
     m_aColor = color;
 }
@@ -128,13 +128,13 @@ void    XFColumnSep::ToXml(IXFStream *pStrm)
     pStrm->EndElement( "style:column-sep" );
 }
 
-void    XFColumns::SetSeparator(XFColumnSep& aSeparator)
+void    XFColumns::SetSeparator(XFColumnSep const & aSeparator)
 {
     m_aSeparator = aSeparator;
     m_nFlag |= XFCOLUMNS_FLAG_SEPARATOR;
 }
 
-void    XFColumns::AddColumn(XFColumn& column)
+void    XFColumns::AddColumn(XFColumn const & column)
 {
     m_aColumns.push_back(column);
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
index f2617e6f13b5..a0fcc310148a 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
@@ -114,7 +114,7 @@ public:
 public:
     void    SetRelHeight(sal_Int32 height);
     void    SetWidth(double width);
-    void    SetColor(XFColor& color);
+    void    SetColor(XFColor const & color);
     void    SetVerticalAlign(enumXFAlignType align);
 
     void    ToXml(IXFStream *pStrm);
@@ -136,10 +136,10 @@ public:
         , m_fGap(0.0)
         { }
 public:
-    void    SetSeparator(XFColumnSep& aSeparator);
+    void    SetSeparator(XFColumnSep const & aSeparator);
     void    SetGap(double fGap);
     void    SetCount(sal_uInt16 nCount);
-    void    AddColumn(XFColumn& column);
+    void    AddColumn(XFColumn const & column);
 
     void    ToXml(IXFStream *pStrm);
 private:
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
index bff022b68cc9..4870aab710e4 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx
@@ -74,9 +74,9 @@ public:
 
     void    SetLineStyle(enumXFAreaLineStyle style);
 
-    void    SetBackColor(XFColor& color);
+    void    SetBackColor(XFColor const & color);
 
-    void    SetLineColor(XFColor& color);
+    void    SetLineColor(XFColor const & color);
 
     void    SetLineAngle(sal_Int32 angle);
 
@@ -109,12 +109,12 @@ inline void XFDrawAreaStyle::SetLineStyle(enumXFAreaLineStyle style)
     m_eLineStyle = style;
 }
 
-inline void XFDrawAreaStyle::SetBackColor(XFColor& color)
+inline void XFDrawAreaStyle::SetBackColor(XFColor const & color)
 {
     m_aBackColor = color;
 }
 
-inline void XFDrawAreaStyle::SetLineColor(XFColor& color)
+inline void XFDrawAreaStyle::SetLineColor(XFColor const & color)
 {
     m_aLineColor = color;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
index 5145a4173c5b..cb1e9d7746ca 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
@@ -125,7 +125,7 @@ void XFDrawStyle::SetFontWorkStyle(enumXFFWStyle eStyle, enumXFFWAdjust eAdjust)
     m_pFontWorkStyle->SetFWAdjustType(eAdjust);
 }
 
-void    XFDrawStyle::SetAreaColor(XFColor& color)
+void    XFDrawStyle::SetAreaColor(XFColor const & color)
 {
     if( !m_pAreaStyle )
     {
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
index 38a5b51d4ce4..0d2469035867 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx
@@ -96,7 +96,7 @@ public:
     /**
      * @descr   Set drawing object area fill color.
      */
-    void    SetAreaColor(XFColor& color);
+    void    SetAreaColor(XFColor const & color);
 
     /**
      * @descr   Set drawing object area grid style.
diff --git a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
index 8d7641b0cd60..4813262d55b2 100644
--- a/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdropcap.hxx
@@ -81,8 +81,8 @@ public:
 
     void    ToXml(IXFStream *pStrm);
 
-    friend bool operator==(XFDropcap& dc1, XFDropcap& dc2);
-    friend bool operator!=(XFDropcap& dc1, XFDropcap& dc2);
+    friend bool operator==(XFDropcap const & dc1, XFDropcap const & dc2);
+    friend bool operator!=(XFDropcap const & dc1, XFDropcap const & dc2);
     friend class XFParaStyle;
 private:
     sal_Int32       m_nCharCount;
@@ -130,7 +130,7 @@ inline void XFDropcap::ToXml(IXFStream *pStrm)
     pStrm->EndElement( "style:drop-cap" );
 }
 
-inline bool operator==(XFDropcap& dc1, XFDropcap& dc2)
+inline bool operator==(XFDropcap const & dc1, XFDropcap const & dc2)
 {
     return (
         (dc1.m_nCharCount == dc2.m_nCharCount)&&
@@ -140,7 +140,7 @@ inline bool operator==(XFDropcap& dc1, XFDropcap& dc2)
         );
 }
 
-inline bool operator!=(XFDropcap& dc1, XFDropcap& dc2)
+inline bool operator!=(XFDropcap const & dc1, XFDropcap const & dc2)
 {
     return !(dc1==dc2);
 }
diff --git a/lotuswordpro/source/filter/xfilter/xffont.cxx b/lotuswordpro/source/filter/xfilter/xffont.cxx
index 799df220a350..e8073bfd1aa9 100644
--- a/lotuswordpro/source/filter/xfilter/xffont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffont.cxx
@@ -106,7 +106,7 @@ XFFont::XFFont()
 
         sal_uInt32      m_nFlag;
 */
-bool operator==(XFFont& f1, XFFont& f2)
+bool operator==(XFFont const & f1, XFFont const & f2)
 {
     //The most possible entry be first:
     if( f1.m_nFlag != f2.m_nFlag )
@@ -234,7 +234,7 @@ bool operator==(XFFont& f1, XFFont& f2)
     return true;
 }
 
-bool operator!=(XFFont& f1, XFFont& f2)
+bool operator!=(XFFont const & f1, XFFont const & f2)
 {
     return !(f1==f2);
 }
diff --git a/lotuswordpro/source/filter/xfilter/xffont.hxx b/lotuswordpro/source/filter/xfilter/xffont.hxx
index e6bb33519bd6..ea68136e61a9 100644
--- a/lotuswordpro/source/filter/xfilter/xffont.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffont.hxx
@@ -204,12 +204,12 @@ public:
     /**
      * @descr   Set font color.
      */
-    void    SetColor(XFColor& color);
+    void    SetColor(XFColor const & color);
 
     /**
      * @descr   Set font background color.
      */
-    void    SetBackColor(XFColor& color);
+    void    SetBackColor(XFColor const & color);
     void    SetBackColorTransparent();
 
     //getter:
@@ -220,8 +220,8 @@ public:
 
     void    ToXml(IXFStream *pStrm);
 
-    friend bool operator==(XFFont& f1, XFFont& f2);
-    friend bool operator!=(XFFont& f1, XFFont& f2);
+    friend bool operator==(XFFont const & f1, XFFont const & f2);
+    friend bool operator!=(XFFont const & f1, XFFont const & f2);
     friend class    XFFontFactory;
 private:
     virtual ~XFFont() override {}
@@ -386,13 +386,13 @@ inline void XFFont::SetPosition(bool bUpperScript, sal_Int16 pos, sal_Int16 scal
     }
 }
 
-inline void XFFont::SetColor(XFColor& color)
+inline void XFFont::SetColor(XFColor const & color)
 {
     m_nFlag |= XFFONT_FLAG_COLOR;
     m_aColor = color;
 }
 
-inline void XFFont::SetBackColor(XFColor& color)
+inline void XFFont::SetBackColor(XFColor const & color)
 {
     m_bTransparent = false;
     m_nFlag |= XFFONT_FLAG_BGCOLOR;
diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
index d3ac67fc2121..9d91d6ec34a9 100644
--- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx
@@ -119,7 +119,7 @@ public:
     /**
      * @descr:  set the background color of the frame.
      */
-    void    SetBackColor(XFColor& color);
+    void    SetBackColor(XFColor const & color);
 
     /**
      * @descr   Set whether frame is protected. There are three properties that can be protected, content,size and position.
@@ -197,7 +197,7 @@ inline void XFFrameStyle::SetPadding(double left, double right,double top, doubl
         m_aPad.SetBottom( bottom );
 }
 
-inline void XFFrameStyle::SetBackColor(XFColor& color)
+inline void XFFrameStyle::SetBackColor(XFColor const & color)
 {
     m_aBackColor = color;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xflineheight.hxx b/lotuswordpro/source/filter/xfilter/xflineheight.hxx
index 6bfcf692e0ad..7f7ded192542 100644
--- a/lotuswordpro/source/filter/xfilter/xflineheight.hxx
+++ b/lotuswordpro/source/filter/xfilter/xflineheight.hxx
@@ -82,8 +82,8 @@ public:
 
     void    ToXml(IXFStream *pStrm);
 
-    friend bool operator==(XFLineHeight& indent1, XFLineHeight& indent2);
-    friend bool operator!=(XFLineHeight& indent1, XFLineHeight& indent2);
+    friend bool operator==(XFLineHeight const & indent1, XFLineHeight const & indent2);
+    friend bool operator!=(XFLineHeight const & indent1, XFLineHeight const & indent2);
 private:
     union{
         sal_Int32   m_nValue;
@@ -143,7 +143,7 @@ inline void XFLineHeight::ToXml(IXFStream *pStrm)
     }
 }
 
-inline bool operator==(XFLineHeight& lh1, XFLineHeight& lh2)
+inline bool operator==(XFLineHeight const & lh1, XFLineHeight const & lh2)
 {
     if( lh1.m_eType != lh2.m_eType )
         return false;
@@ -160,7 +160,7 @@ inline bool operator==(XFLineHeight& lh1, XFLineHeight& lh2)
     return true;
 }
 
-inline bool operator!=(XFLineHeight& lh1, XFLineHeight& lh2)
+inline bool operator!=(XFLineHeight const & lh1, XFLineHeight const & lh2)
 {
     return !(lh1==lh2);
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
index 1900747d6a7b..ff37257a3c3e 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
@@ -288,7 +288,7 @@ void    XFListStyle::SetListBullet(sal_Int32 level,
     m_pListLevels[level-1] = pLevel;
 }
 
-void    XFListStyle::SetListNumber(sal_Int32 level, XFNumFmt& fmt, sal_Int16 start )
+void    XFListStyle::SetListNumber(sal_Int32 level, XFNumFmt const & fmt, sal_Int16 start )
 {
     assert(level>=1&&level<=10);
 
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
index aae9ceae7dfc..2d017f28fdc0 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx
@@ -122,7 +122,7 @@ public:
         m_eListType = enumXFListLevelNumber;
     }
 public:
-    void    SetNumFmt(XFNumFmt& fmt)
+    void    SetNumFmt(XFNumFmt const & fmt)
     {
         m_aNumFmt = fmt;
     }
@@ -205,7 +205,7 @@ public:
                             const OUString& suffix
                             );
 
-    void    SetListNumber( sal_Int32 level, XFNumFmt& numFmt, sal_Int16 nStartValue );
+    void    SetListNumber( sal_Int32 level, XFNumFmt const & numFmt, sal_Int16 nStartValue );
 
     virtual enumXFStyle GetStyleFamily() override
     {
diff --git a/lotuswordpro/source/filter/xfilter/xfmargins.cxx b/lotuswordpro/source/filter/xfilter/xfmargins.cxx
index 31e410abca43..df930b3ef052 100644
--- a/lotuswordpro/source/filter/xfilter/xfmargins.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfmargins.cxx
@@ -99,7 +99,7 @@ void    XFMargins::ToXml(IXFStream *pStrm)
     }
 }
 
-bool operator==(XFMargins& indent1, XFMargins& indent2)
+bool operator==(XFMargins const & indent1, XFMargins const & indent2)
 {
     return (
         (indent1.m_nFlag == indent2.m_nFlag) &&
@@ -109,7 +109,7 @@ bool operator==(XFMargins& indent1, XFMargins& indent2)
         (indent1.m_fBottom == indent2.m_fBottom)
         );
 }
-bool operator!=(XFMargins& indent1, XFMargins& indent2)
+bool operator!=(XFMargins const & indent1, XFMargins const & indent2)
 {
     return !(indent1==indent2);
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfmargins.hxx b/lotuswordpro/source/filter/xfilter/xfmargins.hxx
index 4238b5fa9a28..42c385eeaddb 100644
--- a/lotuswordpro/source/filter/xfilter/xfmargins.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfmargins.hxx
@@ -83,8 +83,8 @@ public:
 
     void    ToXml(IXFStream *pStrm);
 
-    friend bool operator==(XFMargins& indent1, XFMargins& indent2);
-    friend bool operator!=(XFMargins& indent1, XFMargins& indent2);
+    friend bool operator==(XFMargins const & indent1, XFMargins const & indent2);
+    friend bool operator!=(XFMargins const & indent1, XFMargins const & indent2);
 private:
     double  m_fLeft;
     double  m_fRight;
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
index 96b4b6057a03..34ff89b33adc 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
@@ -64,12 +64,12 @@
 #include "xfheader.hxx"
 #include "../lwpglobalmgr.hxx"
 
-void XFMasterPage::SetHeader(rtl::Reference<XFHeader>& rHeader)
+void XFMasterPage::SetHeader(rtl::Reference<XFHeader> const & rHeader)
 {
     m_xHeader = rHeader;
 }
 
-void XFMasterPage::SetFooter(rtl::Reference<XFFooter>& rFooter)
+void XFMasterPage::SetFooter(rtl::Reference<XFFooter> const & rFooter)
 {
     m_xFooter = rFooter;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
index 367e37ca1163..8a35db0d4b09 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
@@ -70,9 +70,9 @@ class XFMasterPage : public XFStyle
 public:
     void    SetPageMaster(const OUString& pm);
 
-    void    SetHeader(rtl::Reference<XFHeader>& rHeader);
+    void    SetHeader(rtl::Reference<XFHeader> const & rHeader);
 
-    void    SetFooter(rtl::Reference<XFFooter>& rFooter);
+    void    SetFooter(rtl::Reference<XFFooter> const & rFooter);
 
     virtual enumXFStyle GetStyleFamily() override;
 
diff --git a/lotuswordpro/source/filter/xfilter/xfpadding.hxx b/lotuswordpro/source/filter/xfilter/xfpadding.hxx
index dae6c0ab8518..cd9b1ecd6400 100644
--- a/lotuswordpro/source/filter/xfilter/xfpadding.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfpadding.hxx
@@ -107,8 +107,8 @@ public:
      */
     void    ToXml(IXFStream *pStrm);
 
-    friend bool operator==(XFPadding& p1, XFPadding& p2);
-    friend bool operator!=(XFPadding& p1, XFPadding& p2);
+    friend bool operator==(XFPadding const & p1, XFPadding const & p2);
+    friend bool operator!=(XFPadding const & p1, XFPadding const & p2);
 private:
     int     m_nFlag;
     double  m_fLeft;
@@ -186,7 +186,7 @@ inline void XFPadding::ToXml(IXFStream *pStrm)
     }
 }
 
-inline bool operator==(XFPadding& p1, XFPadding& p2)
+inline bool operator==(XFPadding const & p1, XFPadding const & p2)
 {
     return (
         (p1.m_nFlag == p2.m_nFlag) &&
@@ -197,7 +197,7 @@ inline bool operator==(XFPadding& p1, XFPadding& p2)
         );
 }
 
-inline bool operator!=(XFPadding& p1, XFPadding& p2)
+inline bool operator!=(XFPadding const & p1, XFPadding const & p2)
 {
     return !(p1==p2);
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
index 7eaa391813b6..14f07aac964a 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
@@ -219,14 +219,14 @@ void    XFParaStyle::SetMargins(double left, double right, double top, double bo
         m_aMargin.SetBottom( bottom );
 }
 
-void    XFParaStyle::SetShadow(enumXFShadowPos pos, double offset, XFColor& color)
+void    XFParaStyle::SetShadow(enumXFShadowPos pos, double offset, XFColor const & color)
 {
     m_aShadow.SetPosition(pos);
     m_aShadow.SetOffset(offset);
     m_aShadow.SetColor(color);
 }
 
-void    XFParaStyle::SetBackColor(XFColor& color)
+void    XFParaStyle::SetBackColor(XFColor const & color)
 {
     m_aBackColor = color;
     m_nFlag |= XFPARA_FLAG_BACKCOLOR;
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
index c73e34661de2..555fd977ac8d 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
@@ -155,7 +155,7 @@ public:
      * @param   offset the distance between the paragraph border and the shadow.
      * @param   color color to fill the shadow.
      */
-    void    SetShadow(enumXFShadowPos pos, double offset, XFColor& color);
+    void    SetShadow(enumXFShadowPos pos, double offset, XFColor const & color);
 
     /**
      * @descr   The borders is complex, so you have to create one before use.
@@ -183,7 +183,7 @@ public:
      * @descr   Set background color of the paragraph.
      * @param   color value of the back color.
      */
-    void    SetBackColor(XFColor& color);
+    void    SetBackColor(XFColor const & color);
 
     /**
      * @descr   Set background image of the paragraph.
diff --git a/lotuswordpro/source/filter/xfilter/xfrow.cxx b/lotuswordpro/source/filter/xfilter/xfrow.cxx
index b4e7f7357800..3490c76ddbe1 100644
--- a/lotuswordpro/source/filter/xfilter/xfrow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfrow.cxx
@@ -77,7 +77,7 @@ XFRow::~XFRow()
 {
 }
 
-void XFRow::AddCell(rtl::Reference<XFCell>& rCell)
+void XFRow::AddCell(rtl::Reference<XFCell> const & rCell)
 {
     if (!rCell)
         return;
diff --git a/lotuswordpro/source/filter/xfilter/xfrow.hxx b/lotuswordpro/source/filter/xfilter/xfrow.hxx
index a154b5358403..f413489accf6 100644
--- a/lotuswordpro/source/filter/xfilter/xfrow.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfrow.hxx
@@ -74,7 +74,7 @@ public:
     virtual ~XFRow() override;
 
 public:
-    void    AddCell(rtl::Reference<XFCell>& rCell);
+    void    AddCell(rtl::Reference<XFCell> const & rCell);
 
     void    SetRepeated(sal_Int32 repeat);
 
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
index 9932fdb26408..dfffa84fefa8 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx
@@ -77,7 +77,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::uno;
 
-XFSaxStream::XFSaxStream(Reference<XDocumentHandler>& xHandler)
+XFSaxStream::XFSaxStream(Reference<XDocumentHandler> const & xHandler)
 {
     m_aHandler = xHandler;
     m_pAttrList.reset(new XFSaxAttrList );
diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
index c783319c62f3..fe9e7930f259 100644
--- a/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.hxx
@@ -80,7 +80,7 @@ class IXFAttrList;
 class XFSaxStream : public IXFStream
 {
 public:
-    explicit XFSaxStream(css::uno::Reference<css::xml::sax::XDocumentHandler>& xHandler);
+    explicit XFSaxStream(css::uno::Reference<css::xml::sax::XDocumentHandler> const & xHandler);
 
     virtual ~XFSaxStream() override;
 
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.cxx b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
index b7b278a7f354..b399e34ec882 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.cxx
@@ -101,14 +101,14 @@ void    XFShadow::ToXml(IXFStream *pStrm)
         pAttrList->AddAttribute( "style:shadow", ToString() );
 }
 
-bool operator==(XFShadow& s1, XFShadow& s2)
+bool operator==(XFShadow const & s1, XFShadow const & s2)
 {
     return (s1.m_ePosition == s2.m_ePosition) &&
         (s1.m_fOffset == s2.m_fOffset) &&
         (s1.m_aColor == s2.m_aColor);
 }
 
-bool operator!=(XFShadow& s1, XFShadow& s2)
+bool operator!=(XFShadow const & s1, XFShadow const & s2)
 {
     return !(s1==s2);
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.hxx b/lotuswordpro/source/filter/xfilter/xfshadow.hxx
index 1fcae472176c..0827fab5cddc 100644
--- a/lotuswordpro/source/filter/xfilter/xfshadow.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfshadow.hxx
@@ -107,8 +107,8 @@ public:
 
     void    ToXml(IXFStream *pStrm);
 
-    friend bool operator==(XFShadow& s1, XFShadow& s2);
-    friend bool operator!=(XFShadow& s1, XFShadow& s2);
+    friend bool operator==(XFShadow const & s1, XFShadow const & s2);
+    friend bool operator!=(XFShadow const & s1, XFShadow const & s2);
 private:
     enumXFShadowPos m_ePosition;
     double          m_fOffset;
diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
index 6cd468b2cbcb..ac439d25872d 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
@@ -104,7 +104,7 @@ void    XFStyleManager::Reset()
     s_aFontDecls.clear();
 }
 
-void    XFStyleManager::AddFontDecl(XFFontDecl& aFontDecl)
+void    XFStyleManager::AddFontDecl(XFFontDecl const & aFontDecl)
 {
     s_aFontDecls.push_back(aFontDecl);
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx
index c3680f53f2ea..9a13b472d14e 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.hxx
@@ -93,7 +93,7 @@ public:
      */
     void        Reset();
 
-    void        AddFontDecl(XFFontDecl& aFontDecl);
+    void        AddFontDecl(XFFontDecl const & aFontDecl);
 
     IXFStyleRet AddStyle(IXFStyle *pStyle);
 
diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx
index 13ced4af2b77..2125eb9d7ac8 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.cxx
@@ -81,7 +81,7 @@ void    XFTable::SetColumnStyle(sal_Int32 col, const OUString& style)
     m_aColumns[col] = style;
 }
 
-void XFTable::AddRow(rtl::Reference<XFRow>& rRow)
+void XFTable::AddRow(rtl::Reference<XFRow> const & rRow)
 {
     assert(rRow.get());
 
diff --git a/lotuswordpro/source/filter/xfilter/xftable.hxx b/lotuswordpro/source/filter/xfilter/xftable.hxx
index 02a07d41182f..8340c12724e3 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.hxx
@@ -79,7 +79,7 @@ public:
 
     void    SetColumnStyle(sal_Int32 col, const OUString& style);
 
-    void    AddRow(rtl::Reference<XFRow>& rRow);
+    void    AddRow(rtl::Reference<XFRow> const & rRow);
 
     void    AddHeaderRow(XFRow *pRow);
 
diff --git a/lotuswordpro/source/filter/xfilter/xftablestyle.hxx b/lotuswordpro/source/filter/xfilter/xftablestyle.hxx
index dc4788bed33c..f7510382d17f 100644
--- a/lotuswordpro/source/filter/xfilter/xftablestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftablestyle.hxx
@@ -82,7 +82,7 @@ public:
 
     void    SetShadow(enumXFShadowPos pos, double offset, XFColor color );
 
-    void    SetBackColor(XFColor& color);
+    void    SetBackColor(XFColor const & color);
 
     void    SetBackImage(XFBGImage *pImage);
 
@@ -124,7 +124,7 @@ inline void XFTableStyle::SetShadow(enumXFShadowPos pos, double offset, XFColor
     m_aShadow.SetPosition(pos);
 }
 
-inline void XFTableStyle::SetBackColor(XFColor& color)
+inline void XFTableStyle::SetBackColor(XFColor const & color)
 {
     m_aBackColor = color;
 }
author	Noel Grandin <noel.grandin@collabora.co.uk>	2017-08-01 09:29:37 +0200
committer	Noel Grandin <noel.grandin@collabora.co.uk>	2017-08-01 10:18:35 +0200
commit	8c64b2e06b7495e50c0a8d46d639316283da6a9c (patch)
tree	531a8078c97f076f7d0170016f539e8e28d2dc4c /lotuswordpro
parent	aaa6a5202a447fb4e86d5f016d8e79fbc34a3ed7 (diff)