compilerplugins/clang/constparams.cxx        |    2 
 sw/inc/swabstdlg.hxx                         |    2 
 sw/source/filter/inc/msfilter.hxx            |    2 
 sw/source/filter/ww8/attributeoutputbase.hxx |    2 
 sw/source/filter/ww8/wrtw8esh.cxx            |    2 
 sw/source/filter/ww8/wrtww8.cxx              |    2 
 sw/source/filter/ww8/wrtww8.hxx              |    2 
 sw/source/filter/ww8/wrtww8gr.cxx            |    2 
 sw/source/filter/ww8/ww8atr.cxx              |    2 
 sw/source/filter/ww8/ww8glsy.cxx             |    2 
 sw/source/filter/ww8/ww8glsy.hxx             |    2 
 sw/source/filter/ww8/ww8graf.cxx             |   34 +++++++--------
 sw/source/filter/ww8/ww8graf.hxx             |    2 
 sw/source/filter/ww8/ww8graf2.cxx            |   10 ++--
 sw/source/filter/ww8/ww8par.cxx              |   26 +++++------
 sw/source/filter/ww8/ww8par.hxx              |   60 +++++++++++++--------------
 sw/source/filter/ww8/ww8par2.cxx             |    8 +--
 sw/source/filter/ww8/ww8par3.cxx             |    6 +-
 sw/source/filter/ww8/ww8par4.cxx             |    6 +-
 sw/source/filter/ww8/ww8par5.cxx             |   12 ++---
 sw/source/filter/ww8/ww8par6.cxx             |    6 +-
 sw/source/filter/ww8/ww8scan.cxx             |    2 
 sw/source/filter/ww8/ww8scan.hxx             |    2 
 sw/source/ui/chrdlg/drpcps.cxx               |    2 
 sw/source/ui/chrdlg/swuiccoll.cxx            |    6 +-
 sw/source/ui/config/optload.cxx              |    2 
 sw/source/ui/config/optpage.cxx              |    2 
 sw/source/ui/dialog/uiregionsw.cxx           |    2 
 sw/source/ui/dialog/wordcountdialog.cxx      |    2 
 sw/source/ui/envelp/envfmt.cxx               |    2 
 sw/source/ui/envelp/envfmt.hxx               |    2 
 sw/source/ui/envelp/labelexp.cxx             |    2 
 sw/source/ui/envelp/mailmrge.cxx             |    2 
 sw/source/ui/fldui/changedb.cxx              |    2 
 sw/source/ui/fldui/flddb.cxx                 |    2 
 sw/source/ui/fldui/flddb.hxx                 |    2 
 sw/source/ui/fldui/fldedt.cxx                |    2 
 sw/source/ui/fldui/fldfunc.cxx               |    2 
 sw/source/ui/fldui/fldfunc.hxx               |    2 
 sw/source/ui/fldui/fldvar.cxx                |    2 
 sw/source/ui/fldui/fldvar.hxx                |    2 
 sw/source/ui/frmdlg/column.cxx               |    8 +--
 sw/source/ui/frmdlg/frmdlg.cxx               |    2 
 sw/source/uibase/inc/changedb.hxx            |    2 
 sw/source/uibase/inc/column.hxx              |    6 +-
 sw/source/uibase/inc/fldedt.hxx              |    2 
 sw/source/uibase/inc/frmdlg.hxx              |    2 
 sw/source/uibase/inc/label.hxx               |    4 -
 sw/source/uibase/inc/mailmrge.hxx            |    2 
 sw/source/uibase/inc/optload.hxx             |    2 
 sw/source/uibase/inc/regionsw.hxx            |    2 
 sw/source/uibase/inc/swrenamexnameddlg.hxx   |    4 -
 sw/source/uibase/inc/swuiccoll.hxx           |    4 -
 sw/source/uibase/inc/wordcountdialog.hxx     |    2 
 54 files changed, 140 insertions(+), 138 deletions(-)

New commits:
commit 06e2246f1683fc862f40155ea4d68800c0fcfd9e
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date:   Mon Aug 7 12:15:34 2017 +0200

    loplugin:constparams in sw part9
    
    Change-Id: I2edba9cde5a5efd06815a55632703b706ca523c7
    Reviewed-on: https://gerrit.libreoffice.org/40830
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/compilerplugins/clang/constparams.cxx 
b/compilerplugins/clang/constparams.cxx
index f0f4baf761b4..b5256401890c 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/constparams.cxx
@@ -173,6 +173,8 @@ bool ConstParams::VisitFunctionDecl(const FunctionDecl * 
functionDecl)
             || name == "GetFormulaBoxes"
             || name == "HasValidBoxes_"
             || name == "SplitMergeBoxNm_"
+            || name.startswith("Read_F_")
+            || name == "UpdateFieldInformation"
              // #ifdef win32
             || name == "convert_slashes"
                 // UNO component entry points
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index cd6759dfe8b6..a0b572ae0006 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -91,7 +91,7 @@ namespace com{namespace sun{namespace star{
     }
 }}}
 
-typedef   void (*SwLabDlgMethod) (css::uno::Reference< css::frame::XModel>& 
xModel,   const SwLabItem& rItem);
+typedef   void (*SwLabDlgMethod) (css::uno::Reference< css::frame::XModel> 
const & xModel, const SwLabItem& rItem);
 
 typedef OUString    (*GlossaryGetCurrGroup)();
 typedef void        (*GlossarySetActGroup)(const OUString& rNewGroup);
diff --git a/sw/source/filter/inc/msfilter.hxx 
b/sw/source/filter/inc/msfilter.hxx
index f430ec9f9763..d3b7e6dd0a83 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -89,7 +89,7 @@ namespace sw
             @param rXE
                 the arguments of the original word XE field
         */
-        void ImportXE(SwDoc &rDoc, SwPaM &rPaM, const OUString &rXE);
+        void ImportXE(SwDoc &rDoc, SwPaM const &rPaM, const OUString &rXE);
 
         /** Convert from DTTM to Writer's DateTime
 
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 1c8b6df15ad0..21111322b2f2 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -646,7 +646,7 @@ public:
     void OutputFlyFrame( const ww8::Frame& rFormat );
 
     void GetTablePageSize
-    ( ww8::WW8TableNodeInfoInner * pTableTextNodeInfoInner,
+    ( ww8::WW8TableNodeInfoInner const * pTableTextNodeInfoInner,
       long& rPageSize, bool& rRelBoxSize );
 
     /// Exports the definition (image, size) of a single numbering picture 
bullet.
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index e15b6854f1ee..f29a568a27a5 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -332,7 +332,7 @@ namespace
 
     public:
         explicit CompareDrawObjs(const WW8Export& rWrt) : wrt(rWrt) {};
-        bool operator()(DrawObj *a, DrawObj *b) const
+        bool operator()(DrawObj const *a, DrawObj const *b) const
         {
             sal_uLong aSort = lcl_getSdrOrderNumber(wrt, a);
             sal_uLong bSort = lcl_getSdrOrderNumber(wrt, b);
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index f32cfeffc0ca..2ca149ebc6c7 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2392,7 +2392,7 @@ ww8::WidthsPtr AttributeOutputBase::GetColumnWidths( 
ww8::WW8TableNodeInfoInner:
     return pTableTextNodeInfoInner->getGridColsOfRow(*this, true);
 }
 
-void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * 
pTableTextNodeInfoInner, long& rPageSize, bool& rRelBoxSize )
+void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner const * 
pTableTextNodeInfoInner, long& rPageSize, bool& rRelBoxSize )
 {
     long nPageSize = 0;
 
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 83aa12ecb3c8..05f3cb627844 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1034,7 +1034,7 @@ public:
     void EndCommentOutput(   const OUString& rName );
     void OutGrf(const ww8::Frame &rFrame);
     bool TestOleNeedsGraphic(const SwAttrSet& rSet, tools::SvRef<SotStorage> 
const & xOleStg,
-        tools::SvRef<SotStorage> xObjStg, OUString &rStorageName, SwOLENode 
*pOLENd);
+        tools::SvRef<SotStorage> xObjStg, OUString const &rStorageName, 
SwOLENode *pOLENd);
 
     virtual void AppendBookmarks( const SwTextNode& rNd, sal_Int32 nAktPos, 
sal_Int32 nLen ) override;
     virtual void AppendBookmark( const OUString& rName ) override;
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx 
b/sw/source/filter/ww8/wrtww8gr.cxx
index 6ad2e8703a35..3115eaa1eecb 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -90,7 +90,7 @@ void WW8Export::OutputGrfNode( const SwGrfNode& /*rNode*/ )
 }
 
 bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet,
-    tools::SvRef<SotStorage> const & xOleStg, tools::SvRef<SotStorage> 
xObjStg, OUString &rStorageName,
+    tools::SvRef<SotStorage> const & xOleStg, tools::SvRef<SotStorage> 
xObjStg, OUString const &rStorageName,
     SwOLENode *pOLENd)
 {
     bool bGraphicNeeded = false;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 59395790d65a..f16506f2f8d1 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1550,7 +1550,7 @@ void WW8AttributeOutput::TextINetFormat( const 
SwFormatINetFormat& rINet )
 // add optional parameter <bIncludeEmptyPicLocation>
 // It is needed to write an empty picture location for page number field 
separators
 static void InsertSpecialChar( WW8Export& rWrt, sal_uInt8 c,
-                               OUString* pLinkStr,
+                               OUString const * pLinkStr,
                                bool bIncludeEmptyPicLocation = false )
 {
     ww::bytes aItems;
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 1a9ffb66e77f..00d1f06493d6 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -56,7 +56,7 @@ WW8Glossary::WW8Glossary(tools::SvRef<SotStorageStream> 
&refStrm, sal_uInt8 nVer
     }
 }
 
-bool WW8Glossary::HasBareGraphicEnd(SwDoc *pDoc,SwNodeIndex &rIdx)
+bool WW8Glossary::HasBareGraphicEnd(SwDoc *pDoc,SwNodeIndex const &rIdx)
 {
     bool bRet=false;
     for( sal_uInt16 nCnt = pDoc->GetSpzFrameFormats()->size(); nCnt; )
diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx
index 9018a806781e..461d40f19cba 100644
--- a/sw/source/filter/ww8/ww8glsy.hxx
+++ b/sw/source/filter/ww8/ww8glsy.hxx
@@ -79,7 +79,7 @@ private:
     static bool MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, bool 
bSaveRelFile,
                             const std::vector<OUString>& rStrings,
                             const std::vector<ww::bytes>& rExtra);
-    static bool HasBareGraphicEnd(SwDoc *pD,SwNodeIndex &rIdx);
+    static bool HasBareGraphicEnd(SwDoc *pD,SwNodeIndex const &rIdx);
 
     WW8Glossary(const WW8Glossary&) = delete;
     WW8Glossary& operator=(const WW8Glossary&) = delete;
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 982696de15ad..e9796306d1af 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -165,7 +165,7 @@ void wwFrameNamer::SetUniqueGraphName(SwFrameFormat 
*pFrameFormat, const OUStrin
 
 // ReadGrafStart reads object data and if necessary creates an anchor
 bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz,
-    WW8_DPHEAD* pHd, SfxAllItemSet &rSet)
+    WW8_DPHEAD const * pHd, SfxAllItemSet &rSet)
 {
     if (SVBT16ToShort(pHd->cb) < sizeof(WW8_DPHEAD) + nDataSiz)
     {
@@ -191,7 +191,7 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short 
nDataSiz,
 
 // SetStdAttr() sets standard attributes
 static void SetStdAttr( SfxItemSet& rSet, WW8_DP_LINETYPE& rL,
-                        WW8_DP_SHADOW& rSh )
+                        WW8_DP_SHADOW const & rSh )
 {
     if( SVBT16ToShort( rL.lnps ) == 5 ){            // invisible
         rSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) );
@@ -265,8 +265,8 @@ static void SetFill( SfxItemSet& rSet, WW8_DP_FILL& rFill )
     }
 }
 
-static void SetLineEndAttr( SfxItemSet& rSet, WW8_DP_LINEEND& rLe,
-                            WW8_DP_LINETYPE& rLt )
+static void SetLineEndAttr( SfxItemSet& rSet, WW8_DP_LINEEND const & rLe,
+                            WW8_DP_LINETYPE const & rLt )
 {
     sal_uInt16 aSB = SVBT16ToShort( rLe.aStartBits );
     if( aSB & 0x3 )
@@ -301,7 +301,7 @@ static void SetLineEndAttr( SfxItemSet& rSet, 
WW8_DP_LINEEND& rLe,
 }
 
 // start of routines for the different objects
-SdrObject* SwWW8ImplReader::ReadLine(WW8_DPHEAD* pHd, SfxAllItemSet &rSet)
+SdrObject* SwWW8ImplReader::ReadLine(WW8_DPHEAD const * pHd, SfxAllItemSet 
&rSet)
 {
     WW8_DP_LINE aLine;
 
@@ -333,7 +333,7 @@ SdrObject* SwWW8ImplReader::ReadLine(WW8_DPHEAD* pHd, 
SfxAllItemSet &rSet)
     return pObj;
 }
 
-SdrObject* SwWW8ImplReader::ReadRect(WW8_DPHEAD* pHd, SfxAllItemSet &rSet)
+SdrObject* SwWW8ImplReader::ReadRect(WW8_DPHEAD const * pHd, SfxAllItemSet 
&rSet)
 {
     WW8_DP_RECT aRect;
 
@@ -354,7 +354,7 @@ SdrObject* SwWW8ImplReader::ReadRect(WW8_DPHEAD* pHd, 
SfxAllItemSet &rSet)
     return pObj;
 }
 
-SdrObject* SwWW8ImplReader::ReadElipse(WW8_DPHEAD* pHd, SfxAllItemSet &rSet)
+SdrObject* SwWW8ImplReader::ReadElipse(WW8_DPHEAD const * pHd, SfxAllItemSet 
&rSet)
 {
     WW8_DP_ELIPSE aElipse;
 
@@ -375,7 +375,7 @@ SdrObject* SwWW8ImplReader::ReadElipse(WW8_DPHEAD* pHd, 
SfxAllItemSet &rSet)
     return pObj;
 }
 
-SdrObject* SwWW8ImplReader::ReadArc(WW8_DPHEAD* pHd, SfxAllItemSet &rSet)
+SdrObject* SwWW8ImplReader::ReadArc(WW8_DPHEAD const * pHd, SfxAllItemSet 
&rSet)
 {
     WW8_DP_ARC aArc;
 
@@ -408,7 +408,7 @@ SdrObject* SwWW8ImplReader::ReadArc(WW8_DPHEAD* pHd, 
SfxAllItemSet &rSet)
     return pObj;
 }
 
-SdrObject* SwWW8ImplReader::ReadPolyLine(WW8_DPHEAD* pHd, SfxAllItemSet &rSet)
+SdrObject* SwWW8ImplReader::ReadPolyLine(WW8_DPHEAD const * pHd, SfxAllItemSet 
&rSet)
 {
     WW8_DP_POLYLINE aPoly;
 
@@ -442,7 +442,7 @@ SdrObject* SwWW8ImplReader::ReadPolyLine(WW8_DPHEAD* pHd, 
SfxAllItemSet &rSet)
     return pObj;
 }
 
-ESelection GetESelection(EditEngine &rDrawEditEngine, long nCpStart, long 
nCpEnd)
+ESelection GetESelection(EditEngine const &rDrawEditEngine, long nCpStart, 
long nCpEnd)
 {
     sal_Int32 nPCnt = rDrawEditEngine.GetParagraphCount();
     sal_Int32 nSP = 0;
@@ -979,8 +979,8 @@ OutlinerParaObject* 
SwWW8ImplReader::ImportAsOutliner(OUString &rString, WW8_CP
 
 // InsertTxbxText() adds the Text and the Attributes for TextBoxes and 
CaptionBoxes
 void SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
-    Size* pObjSiz, sal_uInt16 nTxBxS, sal_uInt16 nSequence, long nPosCp,
-    SwFrameFormat* pOldFlyFormat, bool bMakeSdrGrafObj, bool& rbEraseTextObj,
+    Size const * pObjSiz, sal_uInt16 nTxBxS, sal_uInt16 nSequence, long nPosCp,
+    SwFrameFormat const * pOldFlyFormat, bool bMakeSdrGrafObj, bool& 
rbEraseTextObj,
     bool* pbTestTxbxContainsText, long* pnStartCp, long* pnEndCp,
     bool* pbContainsGraphics, SvxMSDffImportRec* pRecord)
 {
@@ -1196,7 +1196,7 @@ bool 
SwWW8ImplReader::TxbxChainContainsRealText(sal_uInt16 nTxBxS, long& rStartC
 }
 
 // TextBoxes only for Ver67 !!
-SdrObject* SwWW8ImplReader::ReadTextBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet)
+SdrObject* SwWW8ImplReader::ReadTextBox(WW8_DPHEAD const * pHd, SfxAllItemSet 
&rSet)
 {
     bool bDummy;
     WW8_DP_TXTBOX aTextB;
@@ -1235,7 +1235,7 @@ SdrObject* SwWW8ImplReader::ReadTextBox(WW8_DPHEAD* pHd, 
SfxAllItemSet &rSet)
     return pObj;
 }
 
-SdrObject* SwWW8ImplReader::ReadCaptionBox(WW8_DPHEAD* pHd, SfxAllItemSet 
&rSet)
+SdrObject* SwWW8ImplReader::ReadCaptionBox(WW8_DPHEAD const * pHd, 
SfxAllItemSet &rSet)
 {
     static const SdrCaptionType aCaptA[] = { SdrCaptionType::Type1, 
SdrCaptionType::Type2,
                                        SdrCaptionType::Type3, 
SdrCaptionType::Type4 };
@@ -1299,7 +1299,7 @@ SdrObject* SwWW8ImplReader::ReadCaptionBox(WW8_DPHEAD* 
pHd, SfxAllItemSet &rSet)
     return pObj;
 }
 
-SdrObject *SwWW8ImplReader::ReadGroup(WW8_DPHEAD* pHd, SfxAllItemSet &rSet)
+SdrObject *SwWW8ImplReader::ReadGroup(WW8_DPHEAD const * pHd, SfxAllItemSet 
&rSet)
 {
     sal_Int16 nGrouped;
 
@@ -1614,7 +1614,7 @@ sal_Int32 
SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
 
 #define WW8ITEMVALUE(ItemSet,Id,Cast)  ItemSet.GetItem<Cast>(Id)->GetValue()
 
-void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
+void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject const * pSdrObj,
     SfxItemSet& rFlySet, MSO_LineStyle eLineStyle, MSO_LineDashing eDashing, 
MSO_SPT eShapeType,
     tools::Rectangle& rInnerDist )
 {
@@ -2037,7 +2037,7 @@ static sal_Int32 lcl_ConvertCrop(sal_uInt32 const nCrop, 
sal_Int32 const nSize)
 
 void
 SwWW8ImplReader::SetAttributesAtGrfNode(SvxMSDffImportRec const*const pRecord,
-    SwFrameFormat *pFlyFormat, WW8_FSPA *pF )
+    SwFrameFormat const *pFlyFormat, WW8_FSPA const *pF )
 {
     const SwNodeIndex* pIdx = pFlyFormat->GetContent(false).GetContentIdx();
     SwGrfNode *const pGrfNd(
diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx
index 0c15878f2b8a..4cbad48754ec 100644
--- a/sw/source/filter/ww8/ww8graf.hxx
+++ b/sw/source/filter/ww8/ww8graf.hxx
@@ -87,7 +87,7 @@ public:
     void OutsideEscher();
 };
 
-void WW8FSPAShadowToReal( WW8_FSPA_SHADOW* pFSPAS, WW8_FSPA* pPic );
+void WW8FSPAShadowToReal( WW8_FSPA_SHADOW const * pFSPAS, WW8_FSPA* pPic );
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8graf2.cxx 
b/sw/source/filter/ww8/ww8graf2.cxx
index 3283e4a27c4c..0f13748e5b0b 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -409,7 +409,7 @@ SwFrameFormat* SwWW8ImplReader::MakeGrafInContent(const 
WW8_PIC& rPic,
     return pFlyFormat;
 }
 
-SwFrameFormat* SwWW8ImplReader::ImportGraf1(WW8_PIC& rPic, SvStream* pSt,
+SwFrameFormat* SwWW8ImplReader::ImportGraf1(WW8_PIC const & rPic, SvStream* 
pSt,
     sal_uLong nFilePos )
 {
     SwFrameFormat* pRet = nullptr;
@@ -461,7 +461,7 @@ void SwWW8ImplReader::PicRead(SvStream *pDataStream, 
WW8_PIC *pPic,
 
 namespace
 {
-    SwNodeType GetNodeType(SwFrameFormat &rSource)
+    SwNodeType GetNodeType(SwFrameFormat const &rSource)
     {
         const SwNodeIndex* pNodeIndex = rSource.GetContent().GetContentIdx();
         if (!pNodeIndex)
@@ -472,8 +472,8 @@ namespace
     }
 }
 
-SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
-    SwFrameFormat* pOldFlyFormat)
+SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj const * pTextObj,
+    SwFrameFormat const * pOldFlyFormat)
 {
     SwFrameFormat* pRet = nullptr;
     if (
@@ -762,7 +762,7 @@ void WW8PicShadowToReal( WW8_PIC_SHADOW * pPicS, WW8_PIC * 
pPic )
     pPic->bpp = pPicS->aBits2;
 }
 
-void WW8FSPAShadowToReal( WW8_FSPA_SHADOW * pFSPAS, WW8_FSPA * pFSPA )
+void WW8FSPAShadowToReal( WW8_FSPA_SHADOW const * pFSPAS, WW8_FSPA * pFSPA )
 {
     pFSPA->nSpId        = SVBT32ToUInt32( pFSPAS->nSpId );
     pFSPA->nXaLeft      = SVBT32ToUInt32( pFSPAS->nXaLeft );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 624a7b26cb8e..b1b7ca61eb81 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -172,7 +172,7 @@ SwMacroInfo* GetMacroInfo( SdrObject* pObj, bool bCreate )  
           // static
     return nullptr;
 };
 
-void lclGetAbsPath(OUString& rPath, sal_uInt16 nLevel, SwDocShell* pDocShell)
+void lclGetAbsPath(OUString& rPath, sal_uInt16 nLevel, SwDocShell const * 
pDocShell)
 {
     OUString aTmpStr;
     while( nLevel )
@@ -205,7 +205,7 @@ namespace
     }
 }
 
-void SwWW8ImplReader::ReadEmbeddedData(SvStream& rStrm, SwDocShell* pDocShell, 
struct HyperLinksTable& hlStr)
+void SwWW8ImplReader::ReadEmbeddedData(SvStream& rStrm, SwDocShell const * 
pDocShell, struct HyperLinksTable& hlStr)
 {
     // (0x01B8) HLINK
     // const sal_uInt16 WW8_ID_HLINK               = 0x01B8;
@@ -2149,7 +2149,7 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes)
 }
 
 void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(WW8_CP nStart, WW8_CP nLen,
-    SwFrameFormat &rHdFtFormat, sal_uInt16 nPageWidth)
+    SwFrameFormat const &rHdFtFormat, sal_uInt16 nPageWidth)
 {
     const SwNodeIndex* pSttIdx = rHdFtFormat.GetContent().GetContentIdx();
     OSL_ENSURE(pSttIdx, "impossible");
@@ -2192,7 +2192,7 @@ void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(WW8_CP 
nStart, WW8_CP nLen,
     MoveOutsideFly(pFrame, aTmpPos);
 }
 
-void SwWW8ImplReader::Read_HdFtText(WW8_CP nStart, WW8_CP nLen, SwFrameFormat* 
pHdFtFormat)
+void SwWW8ImplReader::Read_HdFtText(WW8_CP nStart, WW8_CP nLen, SwFrameFormat 
const * pHdFtFormat)
 {
     const SwNodeIndex* pSttIdx = pHdFtFormat->GetContent().GetContentIdx();
     if (!pSttIdx)
@@ -2810,7 +2810,7 @@ void SwWW8ImplReader::PostProcessAttrs()
  convert from 1252 on the undefined character
 */
 std::size_t Custom8BitToUnicode(rtl_TextToUnicodeConverter hConverter,
-    sal_Char *pIn, std::size_t nInLen, sal_Unicode *pOut, std::size_t nOutLen)
+    sal_Char const *pIn, std::size_t nInLen, sal_Unicode *pOut, std::size_t 
nOutLen)
 {
     const sal_uInt32 nFlags =
         RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR |
@@ -4110,7 +4110,7 @@ bool SwWW8ImplReader::ReadText(WW8_CP nStartCp, WW8_CP 
nTextLen, ManTypes nType)
 }
 
 SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage,
-    SvStream* pSt, SwDoc& rD, const OUString& rBaseURL, bool bNewDoc, bool 
bSkipImages, SwPosition &rPos)
+    SvStream* pSt, SwDoc& rD, const OUString& rBaseURL, bool bNewDoc, bool 
bSkipImages, SwPosition const &rPos)
     : m_pDocShell(rD.GetDocShell())
     , m_pStg(pStorage)
     , m_pStrm(pSt)
@@ -4310,7 +4310,7 @@ void wwSectionManager::SetUseOn(wwSection &rSection)
  * Set the page descriptor on this node, handle the different cases for a text
  * node or a table
  */
-void GiveNodePageDesc(SwNodeIndex &rIdx, const SwFormatPageDesc &rPgDesc,
+void GiveNodePageDesc(SwNodeIndex const &rIdx, const SwFormatPageDesc &rPgDesc,
     SwDoc &rDoc)
 {
     /*
@@ -4341,8 +4341,8 @@ void GiveNodePageDesc(SwNodeIndex &rIdx, const 
SwFormatPageDesc &rPgDesc,
 /**
  * Map a word section to a writer page descriptor
  */
-SwFormatPageDesc wwSectionManager::SetSwFormatPageDesc(mySegIter &rIter,
-    mySegIter &rStart, bool bIgnoreCols)
+SwFormatPageDesc wwSectionManager::SetSwFormatPageDesc(mySegIter const &rIter,
+    mySegIter const &rStart, bool bIgnoreCols)
 {
     if (mrReader.m_bNewDoc && rIter == rStart)
     {
@@ -4756,11 +4756,11 @@ class WW8Customizations
     SvStream* mpTableStream;
     WW8Fib mWw8Fib;
 public:
-    WW8Customizations( SvStream*, WW8Fib& );
+    WW8Customizations( SvStream*, WW8Fib const & );
     void  Import( SwDocShell* pShell );
 };
 
-WW8Customizations::WW8Customizations( SvStream* pTableStream, WW8Fib& rFib ) : 
mpTableStream(pTableStream), mWw8Fib( rFib )
+WW8Customizations::WW8Customizations( SvStream* pTableStream, WW8Fib const & 
rFib ) : mpTableStream(pTableStream), mWw8Fib( rFib )
 {
 }
 
@@ -4858,7 +4858,7 @@ ImportProgress::~ImportProgress()
     ::EndProgress(m_pDocShell);
 }
 
-ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
+ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss)
 {
     m_rDoc.SetDocumentType( SwDoc::DOCTYPE_MSWORD );
     if (m_bNewDoc && m_pStg && !pGloss)
@@ -5558,7 +5558,7 @@ namespace
         return aEncryptionData;
     }
 
-    uno::Sequence< beans::NamedValue > Init97Codec(msfilter::MSCodec97& 
rCodec, sal_uInt8 pDocId[16], SfxMedium& rMedium)
+    uno::Sequence< beans::NamedValue > Init97Codec(msfilter::MSCodec97& 
rCodec, sal_uInt8 const pDocId[16], SfxMedium& rMedium)
     {
         uno::Sequence< beans::NamedValue > aEncryptionData;
         const SfxUnoAnyItem* pEncryptionData = 
SfxItemSet::GetItem<SfxUnoAnyItem>(rMedium.GetItemSet(), SID_ENCRYPTIONDATA, 
false);
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index c038ded95f8c..d6abe149a5fb 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -177,7 +177,7 @@ private:
     // character style pointer
     typedef SwCharFormat* WW8aCFormat[nMaxLevel];
 
-    void AdjustLVL(sal_uInt8 nLevel, SwNumRule& rNumRule, WW8aISet& 
rListItemSet,
+    void AdjustLVL(sal_uInt8 nLevel, SwNumRule& rNumRule, WW8aISet const & 
rListItemSet,
         WW8aCFormat& aCharFormat, bool& bNewCharFormatCreated,
         const OUString& aPrefix = OUString());
 
@@ -206,7 +206,7 @@ struct WW8FlyPara
     bool operator==(const WW8FlyPara& rSrc) const;
     void Read(sal_uInt8 nSprm29, WW8PLCFx_Cp_FKP* pPap);
     void ReadFull(sal_uInt8 nSprm29, SwWW8ImplReader* pIo);
-    void Read(sal_uInt8 nSprm29, WW8RStyle* pStyle);
+    void Read(sal_uInt8 nSprm29, WW8RStyle const * pStyle);
     void ApplyTabPos(const WW8_TablePos *pTabPos);
     bool IsEmpty() const;
 };
@@ -555,7 +555,7 @@ class WW8FieldEntry
         sw::hack::Position maStartPos;
         sal_uInt16 mnFieldId;
         sal_uLong mnObjLocFc;
-        WW8FieldEntry(SwPosition &rPos, sal_uInt16 nFieldId) throw();
+        WW8FieldEntry(SwPosition const &rPos, sal_uInt16 nFieldId) throw();
         WW8FieldEntry(const WW8FieldEntry &rOther) throw();
         WW8FieldEntry &operator=(const WW8FieldEntry &rOther) throw();
         void Swap(WW8FieldEntry &rOther) throw();
@@ -847,7 +847,7 @@ private:
     void SetUseOn(wwSection &rSection);
     void SetHdFt(wwSection &rSection, int nSect, const wwSection *pPrevious);
 
-    SwSectionFormat *InsertSection(SwPaM& rMyPaM, wwSection &rSection);
+    SwSectionFormat *InsertSection(SwPaM const & rMyPaM, wwSection &rSection);
     static bool SetCols(SwFrameFormat &rFormat, const wwSection &rSection,
         sal_uInt32 nNetWidth);
     bool SectionIsProtected(const wwSection &rSection) const;
@@ -857,7 +857,7 @@ private:
      nodeindex of where we want the page break to (normally the segments start
      position
     */
-    SwFormatPageDesc SetSwFormatPageDesc(mySegIter &rIter, mySegIter &rStart,
+    SwFormatPageDesc SetSwFormatPageDesc(mySegIter const &rIter, mySegIter 
const &rStart,
         bool bIgnoreCols);
 
     wwSectionManager(const wwSectionManager&) = delete;
@@ -1030,7 +1030,7 @@ struct WW8TabBandDesc
     }
 
     WW8TabBandDesc();
-    WW8TabBandDesc(WW8TabBandDesc& rBand);    // deep copy
+    WW8TabBandDesc(WW8TabBandDesc const & rBand);    // deep copy
     ~WW8TabBandDesc();
     static void setcelldefaults(WW8_TCell *pCells, short nCells);
     void ReadDef(bool bVer67, const sal_uInt8* pS);
@@ -1377,9 +1377,9 @@ private:
 
     void Read_HdFt(int nSect, const SwPageDesc *pPrev,
         const wwSection &rSection);
-    void Read_HdFtText(WW8_CP nStartCp, WW8_CP nLen, SwFrameFormat* 
pHdFtFormat);
+    void Read_HdFtText(WW8_CP nStartCp, WW8_CP nLen, SwFrameFormat const * 
pHdFtFormat);
     void Read_HdFtTextAsHackedFrame(WW8_CP nStart, WW8_CP nLen,
-        SwFrameFormat &rHdFtFormat, sal_uInt16 nPageWidth);
+        SwFrameFormat const &rHdFtFormat, sal_uInt16 nPageWidth);
 
     bool isValid_HdFt_CP(WW8_CP nHeaderCP) const;
 
@@ -1470,7 +1470,7 @@ private:
     static sal_Int32 MatchSdrBoxIntoFlyBoxItem( const Color& rLineColor,
         MSO_LineStyle eLineStyle, MSO_LineDashing eDashing, MSO_SPT 
eShapeType, sal_Int32 &rLineWidth,
         SvxBoxItem& rBox );
-    void MatchSdrItemsIntoFlySet( SdrObject*    pSdrObj, SfxItemSet &aFlySet,
+    void MatchSdrItemsIntoFlySet( SdrObject const *    pSdrObj, SfxItemSet 
&aFlySet,
         MSO_LineStyle eLineStyle, MSO_LineDashing eDashing, MSO_SPT 
eShapeType, tools::Rectangle &rInnerDist );
     static void AdjustLRWrapForWordMargins(const SvxMSDffImportRec &rRecord,
         SvxLRSpaceItem &rLR);
@@ -1479,7 +1479,7 @@ private:
     static void MapWrapIntoFlyFormat(SvxMSDffImportRec* pRecord, 
SwFrameFormat* pFlyFormat);
 
     void SetAttributesAtGrfNode(SvxMSDffImportRec const* pRecord,
-            SwFrameFormat *pFlyFormat, WW8_FSPA *pF);
+            SwFrameFormat const *pFlyFormat, WW8_FSPA const *pF);
 
     bool IsDropCap();
     bool IsListOrDropcap() { return (!m_pAktItemSet  || m_bDropCap); };
@@ -1492,7 +1492,7 @@ private:
     bool TestSameApo(const ApoTestResults &rApo, const WW8_TablePos *pTabPos);
     ApoTestResults TestApo(int nCellLevel, bool bTableRowEnd,
         const WW8_TablePos *pTabPos);
-    static void StripNegativeAfterIndent(SwFrameFormat *pFlyFormat);
+    static void StripNegativeAfterIndent(SwFrameFormat const *pFlyFormat);
 
     void EndSpecial();
     bool ProcessSpecial(bool &rbReSync, WW8_CP nStartCp);
@@ -1513,8 +1513,8 @@ private:
         const SfxItemSet& rGrfSet);
 
     SwFrameFormat *AddAutoAnchor(SwFrameFormat *pFormat);
-    SwFrameFormat* ImportGraf1(WW8_PIC& rPic, SvStream* pSt, sal_uLong 
nFilePos);
-    SwFrameFormat* ImportGraf(SdrTextObj* pTextObj = nullptr, SwFrameFormat* 
pFlyFormat = nullptr);
+    SwFrameFormat* ImportGraf1(WW8_PIC const & rPic, SvStream* pSt, sal_uLong 
nFilePos);
+    SwFrameFormat* ImportGraf(SdrTextObj const * pTextObj = nullptr, 
SwFrameFormat const * pFlyFormat = nullptr);
 
     SdrObject* ImportOleBase( Graphic& rGraph, const Graphic* pGrf=nullptr,
         const SfxItemSet* pFlySet=nullptr, const tools::Rectangle& aVisArea = 
tools::Rectangle() );
@@ -1534,7 +1534,7 @@ private:
 
     ErrCode LoadThroughDecryption(WW8Glossary *pGloss);
     ErrCode SetSubStreams(tools::SvRef<SotStorageStream> &rTableStream, 
tools::SvRef<SotStorageStream> &rDataStream);
-    ErrCode CoreLoad(WW8Glossary *pGloss);
+    ErrCode CoreLoad(WW8Glossary const *pGloss);
 
     void ReadDocVars();
 
@@ -1568,13 +1568,13 @@ private:
 
 // graphics layer
 
-    bool ReadGrafStart(void* pData, short nDataSiz, WW8_DPHEAD* pHd,
+    bool ReadGrafStart(void* pData, short nDataSiz, WW8_DPHEAD const * pHd,
         SfxAllItemSet &rSet);
-    SdrObject *ReadLine(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
-    SdrObject *ReadRect(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
-    SdrObject *ReadElipse(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
-    SdrObject *ReadArc(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
-    SdrObject *ReadPolyLine(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
+    SdrObject *ReadLine(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
+    SdrObject *ReadRect(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
+    SdrObject *ReadElipse(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
+    SdrObject *ReadArc(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
+    SdrObject *ReadPolyLine(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
     void InsertTxbxStyAttrs( SfxItemSet& rS, sal_uInt16 nColl );
     void InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp, ManTypes 
eType, bool bONLYnPicLocFc=false);
 
@@ -1582,8 +1582,8 @@ private:
         sal_uInt16 nSequence);
     sal_Int32 GetRangeAsDrawingString(OUString& rString, long StartCp, long 
nEndCp, ManTypes eType);
     OutlinerParaObject* ImportAsOutliner(OUString &rString, WW8_CP nStartCp, 
WW8_CP nEndCp, ManTypes eType);
-    void InsertTxbxText(SdrTextObj* pTextObj, Size* pObjSiz,
-        sal_uInt16 nTxBxS, sal_uInt16 nSequence, long nPosCp, SwFrameFormat* 
pFlyFormat,
+    void InsertTxbxText(SdrTextObj* pTextObj, Size const * pObjSiz,
+        sal_uInt16 nTxBxS, sal_uInt16 nSequence, long nPosCp, SwFrameFormat 
const * pFlyFormat,
         bool bMakeSdrGrafObj, bool& rbEraseTextObj,
         bool* pbTestTxbxContainsText = nullptr, long* pnStartCp = nullptr,
         long* pnEndCp = nullptr, bool* pbContainsGraphics = nullptr,
@@ -1591,9 +1591,9 @@ private:
     bool TxbxChainContainsRealText( sal_uInt16 nTxBxS,
                                     long&  rStartCp,
                                     long&  rEndCp );
-    SdrObject *ReadTextBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
-    SdrObject *ReadCaptionBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
-    SdrObject *ReadGroup(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
+    SdrObject *ReadTextBox(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
+    SdrObject *ReadCaptionBox(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
+    SdrObject *ReadGroup(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet);
     SdrObject *ReadGrafPrimitive(short& rLeft, SfxAllItemSet &rSet);
     void ReadGrafLayer1( WW8PLCFspecial* pPF, long nGrafAnchorCp );
     SdrObject* CreateContactObject(SwFrameFormat* pFlyFormat);
@@ -1824,7 +1824,7 @@ public:     // really private, but can only be done public
     eF_ResT Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr );
     eF_ResT Read_F_Author( WW8FieldDesc*, OUString& );
     eF_ResT Read_F_TemplName( WW8FieldDesc*, OUString& );
-    short GetTimeDatePara(OUString& rStr, sal_uInt32& rFormat, LanguageType 
&rLang,
+    short GetTimeDatePara(OUString const & rStr, sal_uInt32& rFormat, 
LanguageType &rLang,
         int nWhichDefault, bool bHijri = false);
     bool ForceFieldLanguage(SwField &rField, LanguageType nLang);
     eF_ResT Read_F_DateTime( WW8FieldDesc*, OUString& rStr );
@@ -1844,7 +1844,7 @@ public:     // really private, but can only be done public
     eF_ResT Read_F_FormCheckBox( WW8FieldDesc* pF, OUString& rStr );
     eF_ResT Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr);
     css::awt::Size MiserableDropDownFormHack(const OUString &rString,
-        css::uno::Reference<css::beans::XPropertySet>& rPropSet);
+        css::uno::Reference<css::beans::XPropertySet> const & rPropSet);
 
     eF_ResT Read_F_Macro( WW8FieldDesc*, OUString& rStr);
     eF_ResT Read_F_DBField( WW8FieldDesc*, OUString& rStr );
@@ -1877,7 +1877,7 @@ public:     // really private, but can only be done public
     void SetNAktColl( sal_uInt16 nColl ) { m_nAktColl = nColl;    }
     void SetAktItemSet( SfxItemSet* pItemSet ) { m_pAktItemSet = pItemSet; }
     sal_uInt16 StyleUsingLFO( sal_uInt16 nLFOIndex ) const ;
-    const SwFormat* GetStyleWithOrgWWName( OUString& rName ) const ;
+    const SwFormat* GetStyleWithOrgWWName( OUString const & rName ) const ;
 
     static bool GetPictGrafFromStream(Graphic& rGraphic, SvStream& rSrc);
     static void PicRead( SvStream *pDataStream, WW8_PIC *pPic, bool bVer67);
@@ -1886,7 +1886,7 @@ public:     // really private, but can only be done public
     static ColorData GetCol(sal_uInt8 nIco);
 
     SwWW8ImplReader( sal_uInt8 nVersionPara, SotStorage* pStorage, SvStream* 
pSt,
-        SwDoc& rD, const OUString& rBaseURL, bool bNewDoc, bool bSkipImages, 
SwPosition &rPos );
+        SwDoc& rD, const OUString& rBaseURL, bool bNewDoc, bool bSkipImages, 
SwPosition const &rPos );
 
     const OUString& GetBaseURL() const { return m_sBaseURL; }
     // load a complete doc file
@@ -1897,7 +1897,7 @@ public:     // really private, but can only be done public
     rtl_TextEncoding GetCJKCharSetFromLanguage();
 
     void PostProcessAttrs();
-    void ReadEmbeddedData(SvStream& rStrm, SwDocShell* pDocShell, struct 
HyperLinksTable& hlStr);
+    void ReadEmbeddedData(SvStream& rStrm, SwDocShell const * pDocShell, 
struct HyperLinksTable& hlStr);
 };
 
 bool CanUseRemoteLink(const OUString &rGrfName);
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index ace6e8f776d5..32b7747e669e 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -199,7 +199,7 @@ class WW8TabDesc
 
     // single box - maybe used in a merge group
     // (the merge groups are processed later at once)
-    void UpdateTableMergeGroup(WW8_TCell& rCell,
+    void UpdateTableMergeGroup(WW8_TCell const & rCell,
         WW8SelBoxInfo* pActGroup, SwTableBox* pActBox, sal_uInt16 nCol  );
     void StartMiserableHackForUnsupportedDirection(short nWwCol);
     void EndMiserableHackForUnsupportedDirection(short nWwCol);
@@ -1199,7 +1199,7 @@ void SwWW8ImplReader::StopAnlToRestart(sal_uInt8 
nNewType, bool bGoBack)
     m_bAnl = false;
 }
 
-WW8TabBandDesc::WW8TabBandDesc( WW8TabBandDesc& rBand )
+WW8TabBandDesc::WW8TabBandDesc( WW8TabBandDesc const & rBand )
 {
     *this = rBand;
     if( rBand.pTCs )
@@ -3399,7 +3399,7 @@ void WW8TabDesc::TableCellEnd()
 }
 
 // if necessary register the box for the merge group for this column
-void WW8TabDesc::UpdateTableMergeGroup(  WW8_TCell&     rCell,
+void WW8TabDesc::UpdateTableMergeGroup(  WW8_TCell const &     rCell,
                                                 WW8SelBoxInfo* pActGroup,
                                                 SwTableBox*    pActBox,
                                                 sal_uInt16         nCol )
@@ -3678,7 +3678,7 @@ sal_uInt16 SwWW8ImplReader::StyleUsingLFO( sal_uInt16 
nLFOIndex ) const
     return nRes;
 }
 
-const SwFormat* SwWW8ImplReader::GetStyleWithOrgWWName( OUString& rName ) const
+const SwFormat* SwWW8ImplReader::GetStyleWithOrgWWName( OUString const & rName 
) const
 {
     SwFormat* pRet = nullptr;
     if( !m_vColl.empty() )
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 1fa133247822..e1f2a584a824 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -461,7 +461,7 @@ WW8LSTInfo* WW8ListManager::GetLSTByListId( sal_uInt32 
nIdLst ) const
     return *aResult;
 }
 
-static void lcl_CopyGreaterEight(OUString &rDest, OUString &rSrc,
+static void lcl_CopyGreaterEight(OUString &rDest, OUString const &rSrc,
     sal_Int32 nStart, sal_Int32 nLen = SAL_MAX_INT32)
 {
     const sal_Int32 nMaxLen = std::min(rSrc.getLength(), nLen);
@@ -984,7 +984,7 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, 
std::unique_ptr<SfxItemSet
 }
 
 void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule,
-    WW8aISet& rListItemSet, WW8aCFormat& rCharFormat, bool& 
bNewCharFormatCreated,
+    WW8aISet const & rListItemSet, WW8aCFormat& rCharFormat, bool& 
bNewCharFormatCreated,
     const OUString& sPrefix )
 {
     bNewCharFormatCreated = false;
@@ -2250,7 +2250,7 @@ WW8FormulaListBox::WW8FormulaListBox(SwWW8ImplReader &rR)
 //Miserable hack to get a hardcoded guesstimate of the size of a list dropdown
 //box's first entry to set as the lists default size
 awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString,
-    uno::Reference<beans::XPropertySet>& rPropSet)
+    uno::Reference<beans::XPropertySet> const & rPropSet)
 {
     awt::Size aRet;
     struct CtrlFontMapEntry
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index cc8d795d962e..43b57c16ec5b 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -68,7 +68,7 @@ struct OLE_MFP
 
 using namespace ::com::sun::star;
 
-static bool SwWw8ReadScaling(long& rX, long& rY, tools::SvRef<SotStorage>& 
rSrc1)
+static bool SwWw8ReadScaling(long& rX, long& rY, tools::SvRef<SotStorage> 
const & rSrc1)
 {
     // Getting the scaling factor:
     //      Information in the PIC-stream (by trying out)
@@ -126,7 +126,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, 
tools::SvRef<SotStorage>& rSrc1
 }
 
 static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
-    tools::SvRef<SotStorage>& rSrc1)
+    tools::SvRef<SotStorage> const & rSrc1)
 {
     tools::SvRef<SotStorageStream> xSrc2 = rSrc1->OpenSotStream( "\3META",
         StreamMode::STD_READ );
@@ -179,7 +179,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* 
pMfp,
     return true;
 }
 
-static bool SwWw6ReadMacPICTStream(Graphic& rGraph, tools::SvRef<SotStorage>& 
rSrc1)
+static bool SwWw6ReadMacPICTStream(Graphic& rGraph, tools::SvRef<SotStorage> 
const & rSrc1)
 {
     // 03-META-stream does not exist. Maybe a 03-PICT?
     tools::SvRef<SotStorageStream> xSrc4 = rSrc1->OpenSotStream("\3PICT");
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index aed5f42b3368..652c20c51637 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -429,7 +429,7 @@ OUString GetWordDefaultDateStringAsUS(SvNumberFormatter* 
pFormatter, LanguageTyp
     return sParams;
 }
 
-short SwWW8ImplReader::GetTimeDatePara(OUString& rStr, sal_uInt32& rFormat,
+short SwWW8ImplReader::GetTimeDatePara(OUString const & rStr, sal_uInt32& 
rFormat,
     LanguageType &rLang, int nWhichDefault, bool bHijri)
 {
     bool bRTL = false;
@@ -686,7 +686,7 @@ bool AcceptableNestedField(sal_uInt16 nFieldCode)
     }
 }
 
-WW8FieldEntry::WW8FieldEntry(SwPosition &rPos, sal_uInt16 nFieldId) throw()
+WW8FieldEntry::WW8FieldEntry(SwPosition const &rPos, sal_uInt16 nFieldId) 
throw()
     : maStartPos(rPos), mnFieldId(nFieldId), mnObjLocFc(0)
 {
 }
@@ -2753,7 +2753,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& 
rReadParam)
 
 //        "table of ..." fields
 
-static void lcl_toxMatchACSwitch(SwDoc& rDoc,
+static void lcl_toxMatchACSwitch(SwDoc const & rDoc,
                             SwTOXBase& rBase,
                             WW8ReadFieldParams& rParam,
                             SwCaptionDisplay eCaptionType)
@@ -2791,7 +2791,7 @@ static void EnsureMaxLevelForTemplates(SwTOXBase& rBase)
     }
 }
 
-static void lcl_toxMatchTSwitch(SwWW8ImplReader& rReader, SwTOXBase& rBase,
+static void lcl_toxMatchTSwitch(SwWW8ImplReader const & rReader, SwTOXBase& 
rBase,
     WW8ReadFieldParams& rParam)
 {
     if ( rParam.GoToTokenParam() )
@@ -3518,7 +3518,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* 
/*pF*/, OUString& rStr
     return eF_ResT::TEXT;
 }
 
-static void lcl_ImportTox(SwDoc &rDoc, SwPaM &rPaM, const OUString &rStr, bool 
bIdx)
+static void lcl_ImportTox(SwDoc &rDoc, SwPaM const &rPaM, const OUString 
&rStr, bool bIdx)
 {
     TOXTypes eTox = ( !bIdx ) ? TOX_CONTENT : TOX_INDEX;    // Default
 
@@ -3594,7 +3594,7 @@ static void lcl_ImportTox(SwDoc &rDoc, SwPaM &rPaM, const 
OUString &rStr, bool b
     }
 }
 
-void sw::ms::ImportXE(SwDoc &rDoc, SwPaM &rPaM, const OUString &rStr)
+void sw::ms::ImportXE(SwDoc &rDoc, SwPaM const &rPaM, const OUString &rStr)
 {
     lcl_ImportTox(rDoc, rPaM, rStr, true);
 }
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index a585b8d48233..b31b0d867170 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -640,7 +640,7 @@ void wwSectionManager::SetPageULSpaceItems(SwFrameFormat 
&rFormat,
 }
 
 SwSectionFormat *wwSectionManager::InsertSection(
-    SwPaM& rMyPaM, wwSection &rSection)
+    SwPaM const & rMyPaM, wwSection &rSection)
 {
     SwSectionData aSection( CONTENT_SECTION,
             mrReader.m_rDoc.GetUniqueSectionName() );
@@ -1708,7 +1708,7 @@ void WW8FlyPara::ReadFull(sal_uInt8 nOrigSp29, 
SwWW8ImplReader* pIo)
 }
 
 // read for Apo definitions in Styledefs
-void WW8FlyPara::Read(sal_uInt8 nOrigSp29, WW8RStyle* pStyle)
+void WW8FlyPara::Read(sal_uInt8 nOrigSp29, WW8RStyle const * pStyle)
 {
     if (bVer67)
     {
@@ -2443,7 +2443,7 @@ bool SwWW8ImplReader::JoinNode(SwPaM &rPam, bool 
bStealAttr)
 }
 
 //In auto-width word frames negative after-indent values are ignored
-void SwWW8ImplReader::StripNegativeAfterIndent(SwFrameFormat *pFlyFormat)
+void SwWW8ImplReader::StripNegativeAfterIndent(SwFrameFormat const *pFlyFormat)
 {
     const SwNodeIndex* pSttNd = pFlyFormat->GetContent().GetContentIdx();
     if (!pSttNd)
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index df80ff69e843..cacbf5b54cd5 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -7123,7 +7123,7 @@ const WW8_FFN* WW8Fonts::GetFont( sal_uInt16 nNum ) const
 //    out of WW8_{FOOTER,HEADER}_{ODD,EVEN,FIRST} (Do not change!)
 //  -> maybe we can get a right result then
 
-WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop )
+WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop const & rDop )
     : aPLCF(*pSt, rFib.m_fcPlcfhdd , rFib.m_lcbPlcfhdd , 0)
 {
     nIdxOffset = 0;
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 59560885b015..07a82ad0e5e7 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1849,7 +1849,7 @@ private:
     short nIdxOffset;
 
 public:
-    WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop );
+    WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop const & rDop );
     bool GetTextPos(sal_uInt8 grpfIhdt, sal_uInt8 nWhich, WW8_CP& rStart, 
WW8_CP& rLen);
     void GetTextPosExact(short nIdx, WW8_CP& rStart, WW8_CP& rLen);
     void UpdateIndex( sal_uInt8 grpfIhdt );
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 674519f8e747..9b9cc1254851 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -187,7 +187,7 @@ OUString GetDefaultString(sal_Int32 nChars)
     return aStr;
 }
 
-static void calcFontHeightAnyAscent( vcl::RenderContext* _pWin, vcl::Font& 
_rFont, long& _nHeight, long& _nAscent )
+static void calcFontHeightAnyAscent( vcl::RenderContext* _pWin, vcl::Font 
const & _rFont, long& _nHeight, long& _nAscent )
 {
     if ( !_nHeight )
     {
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx 
b/sw/source/ui/chrdlg/swuiccoll.cxx
index 23a1f231211d..0156e6017e93 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -238,7 +238,7 @@ IMPL_LINK( SwCondCollPage, AssignRemoveHdl, ListBox&, rBox, 
void)
 {
     AssignRemove(&rBox);
 }
-void SwCondCollPage::AssignRemove(void* pBtn)
+void SwCondCollPage::AssignRemove(void const * pBtn)
 {
     SvTreeListEntry* pE = m_pTbLinks->FirstSelected();
     if (!pE)
@@ -276,12 +276,12 @@ IMPL_LINK( SwCondCollPage, SelectListBoxHdl, ListBox&, 
rBox, void)
 {
     SelectHdl(&rBox);
 }
-void SwCondCollPage::SelectHdl(void* pBox)
+void SwCondCollPage::SelectHdl(void const * pBox)
 {
     if (pBox == m_pFilterLB)
     {
         m_pStyleLB->Clear();
-        const sal_Int32 nSelPos = 
static_cast<ListBox*>(pBox)->GetSelectEntryPos();
+        const sal_Int32 nSelPos = static_cast<ListBox const 
*>(pBox)->GetSelectEntryPos();
         const sal_uInt16 nSearchFlags = 
*static_cast<sal_uInt16*>(m_pFilterLB->GetEntryData(nSelPos));
         SfxStyleSheetBasePool* pPool = 
m_rSh.GetView().GetDocShell()->GetStyleSheetPool();
         pPool->SetSearchMask(SfxStyleFamily::Para, nSearchFlags);
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 597ae2c401aa..731d9d2f25cd 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -805,7 +805,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, SaveEntryHdl, 
SvTreeListBox*, void)
         SaveEntry(pEntry);
 }
 
-void SwCaptionOptPage::SaveEntry(SvTreeListEntry* pEntry)
+void SwCaptionOptPage::SaveEntry(SvTreeListEntry const * pEntry)
 {
     if (pEntry)
     {
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index bc51b37bd194..cfbe7cfcf538 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -639,7 +639,7 @@ VclPtr<SfxTabPage> SwStdFontTabPage::Create( vcl::Window* 
pParent,
 }
 
 static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType,
-                    SfxPrinter* pPrt, const OUString& rStyle,
+                    SfxPrinter const * pPrt, const OUString& rStyle,
                     sal_uInt16 nFontWhich)
 {
     vcl::Font aFont( rStyle, Size( 0, 10 ) );
diff --git a/sw/source/ui/dialog/uiregionsw.cxx 
b/sw/source/ui/dialog/uiregionsw.cxx
index cffa27ca408e..076b69ddf930 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -2188,7 +2188,7 @@ VclPtr<SfxTabPage> SwSectionIndentTabPage::Create( 
vcl::Window* pParent, const S
     return VclPtr<SwSectionIndentTabPage>::Create(pParent, *rAttrSet);
 }
 
-void SwSectionIndentTabPage::SetWrtShell(SwWrtShell& rSh)
+void SwSectionIndentTabPage::SetWrtShell(SwWrtShell const & rSh)
 {
     //set sensible values at the preview
     m_pPreviewWin->SetAdjust(SvxAdjust::Block);
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx 
b/sw/source/ui/dialog/wordcountdialog.cxx
index 777e194a37f3..c1a160f08fee 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -127,7 +127,7 @@ void SwWordCountFloatDlg::showStandardizedPages(bool 
bShowStandardizedPages)
 SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings* _pBindings,
                                          SfxChildWindow* pChild,
                                          vcl::Window *pParent,
-                                         SfxChildWinInfo* pInfo)
+                                         SfxChildWinInfo const * pInfo)
     : SfxModelessDialog(_pBindings, pChild, pParent, "WordCountDialog", 
"modules/swriter/ui/wordcount.ui")
 {
     get(m_pCurrentWordFT, "selectwords");
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 87dfbd268b48..4d1a897bfd8b 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -347,7 +347,7 @@ IMPL_LINK( SwEnvFormatPage, EditHdl, MenuButton *, pButton, 
void )
 }
 
 // A temporary Itemset that gets discarded at abort
-SfxItemSet *SwEnvFormatPage::GetCollItemSet(SwTextFormatColl* pColl, bool 
bSender)
+SfxItemSet *SwEnvFormatPage::GetCollItemSet(SwTextFormatColl const * pColl, 
bool bSender)
 {
     SfxItemSet *&pAddrSet = bSender ? GetParentSwEnvDlg()->pSenderSet : 
GetParentSwEnvDlg()->pAddresseeSet;
     if (!pAddrSet)
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index cfd94f6381a4..6bf55a6a4ccb 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -49,7 +49,7 @@ class SwEnvFormatPage : public SfxTabPage
 
     void SetMinMax();
 
-    SfxItemSet  *GetCollItemSet(SwTextFormatColl* pColl, bool bSender);
+    SfxItemSet  *GetCollItemSet(SwTextFormatColl const * pColl, bool bSender);
 
     SwEnvDlg    *GetParentSwEnvDlg() {return 
static_cast<SwEnvDlg*>(GetParentDialog());}
 
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index 2f473617b20b..1e96b826fc5d 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -170,7 +170,7 @@ void SwVisitingCardPage::UpdateFields()
     }
 }
 
-void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & 
xModel, const SwLabItem& rItem)
+void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > const & 
xModel, const SwLabItem& rItem)
 {
     uno::Reference< text::XTextFieldsSupplier >  xFields(xModel, 
uno::UNO_QUERY);
     uno::Reference< container::XNameAccess >  xFieldMasters = 
xFields->getTextFieldMasters();
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 9c8bc472f9da..f2a77592c2db 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -123,7 +123,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, 
SwWrtShell& rShell,
                                const OUString& rTableName,
                                sal_Int32 nCommandType,
                                const uno::Reference< XConnection>& 
_xConnection,
-                               Sequence< Any >* pSelection) :
+                               Sequence< Any > const * pSelection) :
 
     SvxStandardDialog(pParent, "MailmergeDialog", 
"modules/swriter/ui/mailmerge.ui"),
 
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 9740084521ec..0f95651e139d 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::uno;
 
 // edit insert-field
-SwChangeDBDlg::SwChangeDBDlg(SwView& rVw)
+SwChangeDBDlg::SwChangeDBDlg(SwView const & rVw)
     : SvxStandardDialog(&rVw.GetViewFrame()->GetWindow(), 
"ExchangeDatabasesDialog",
         "modules/swriter/ui/exchangedatabases.ui")
     , pSh(rVw.GetWrtShellPtr())
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index e05123a40092..fe37026e3b99 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -279,7 +279,7 @@ IMPL_LINK( SwFieldDBPage, TypeListBoxHdl, ListBox&, rBox, 
void )
     TypeHdl(&rBox);
 }
 
-void SwFieldDBPage::TypeHdl( ListBox* pBox )
+void SwFieldDBPage::TypeHdl( ListBox const * pBox )
 {
     // save old ListBoxPos
     const sal_Int32 nOld = GetTypeSel();
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 788de1f064a6..8600ac19fb82 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -59,7 +59,7 @@ class SwFieldDBPage : public SwFieldPage
     DECL_LINK( TreeSelectHdl, SvTreeListBox*, void );
     DECL_LINK( ModifyHdl, Edit&, void );
     DECL_LINK( AddDBHdl, Button*, void );
-    void TypeHdl(ListBox*);
+    void TypeHdl(ListBox const *);
 
     void                CheckInsert();
 
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index e07b6407053c..88476c473816 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -85,7 +85,7 @@ void SwFieldEditDlg::EnsureSelection(SwField *pCurField, 
SwFieldMgr &rMgr)
     assert(pCurField == rMgr.GetCurField());
 }
 
-SwFieldEditDlg::SwFieldEditDlg(SwView& rVw)
+SwFieldEditDlg::SwFieldEditDlg(SwView const & rVw)
     : SfxSingleTabDialog(&rVw.GetViewFrame()->GetWindow(), nullptr,
         "EditFieldDialog", "modules/swriter/ui/editfielddialog.ui")
     , pSh(rVw.GetWrtShellPtr())
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 6bfac73c5276..f958cfb12870 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -434,7 +434,7 @@ IMPL_LINK( SwFieldFuncPage, ListModifyReturnActionHdl, 
ReturnActionEdit&, rContr
 {
     ListModifyHdl(&rControl);
 }
-void SwFieldFuncPage::ListModifyHdl(Control* pControl)
+void SwFieldFuncPage::ListModifyHdl(Control const * pControl)
 {
     m_pListItemsLB->SetUpdateMode(false);
     if(pControl == m_pListAddPB ||
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 3789057d6ac1..a86417931ab1 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -74,7 +74,7 @@ class SwFieldFuncPage : public SwFieldPage
     DECL_LINK( ListModifyButtonHdl, Button*, void );
     DECL_LINK( ListEnableHdl, Edit&, void );
     DECL_LINK( ListEnableListBoxHdl, ListBox&, void );
-    void ListModifyHdl(Control*);
+    void ListModifyHdl(Control const *);
 
     // select Macro
     DECL_LINK( MacroHdl, Button *, void );
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 446688d660c3..0ceb902b183c 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -242,7 +242,7 @@ IMPL_LINK( SwFieldVarPage, SubTypeListBoxHdl, ListBox&, 
rBox, void )
     SubTypeHdl(&rBox);
 }
 
-void SwFieldVarPage::SubTypeHdl(ListBox* pBox)
+void SwFieldVarPage::SubTypeHdl(ListBox const * pBox)
 {
     sal_uInt16 nTypeId = 
(sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
     sal_Int32 nSelPos = m_pSelectionLB->GetSelectEntryPos();
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 66421cea84e2..fc4851d3e4dc 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -82,7 +82,7 @@ class SwFieldVarPage : public SwFieldPage
     DECL_LINK( TBClickHdl, ToolBox *, void );
     DECL_LINK( ChapterHdl, ListBox&, void );
     DECL_LINK( SeparatorHdl, Edit&, void );
-    void SubTypeHdl(ListBox*);
+    void SubTypeHdl(ListBox const *);
 
     void                UpdateSubType();
     void                FillFormatLB(sal_uInt16 nTypeId);
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index ee1f4ec98bc1..54d33a4fbbb0 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -235,7 +235,7 @@ IMPL_LINK(SwColumnDlg, ObjectListBoxHdl, ListBox&, rBox, 
void)
     ObjectHdl(&rBox);
 }
 
-void SwColumnDlg::ObjectHdl(ListBox* pBox)
+void SwColumnDlg::ObjectHdl(ListBox const * pBox)
 {
     SfxItemSet* pSet = EvalCurrentSelection();
 
@@ -367,7 +367,7 @@ SfxItemSet* SwColumnDlg::EvalCurrentSelection(void)
 #if OSL_DEBUG_LEVEL < 2
 inline
 #endif
-sal_uInt16 GetMaxWidth( SwColMgr* pColMgr, sal_uInt16 nCols )
+sal_uInt16 GetMaxWidth( SwColMgr const * pColMgr, sal_uInt16 nCols )
 {
     sal_uInt16 nMax = pColMgr->GetActualSize();
     if( --nCols )
@@ -947,7 +947,7 @@ IMPL_LINK( SwColumnPage, ColModify, Edit&, rEdit, void )
     ColModify(static_cast<NumericField*>(&rEdit));
 }
 
-void SwColumnPage::ColModify(NumericField* pNF)
+void SwColumnPage::ColModify(NumericField const * pNF)
 {
     m_nCols = (sal_uInt16)m_pCLNrEdt->GetValue();
     //#107890# the handler is also called from LoseFocus()
@@ -1140,7 +1140,7 @@ void SwColumnPage::Timeout()
 }
 
 // Update the view
-void SwColumnPage::Update(MetricField *pInteractiveField)
+void SwColumnPage::Update(MetricField const *pInteractiveField)
 {
     m_pBalanceColsCB->Enable(m_nCols > 1);
     if(m_nCols >= 2)
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 8e81b3693311..43f37545cece 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -44,7 +44,7 @@
 #include <svx/xflgrit.hxx>
 
 // the dialog's carrier
-SwFrameDlg::SwFrameDlg( SfxViewFrame*       pViewFrame,
+SwFrameDlg::SwFrameDlg( SfxViewFrame const * pViewFrame,
                     vcl::Window*        pParent,
                     const SfxItemSet&   rCoreSet,
                     bool                bNewFrame,
diff --git a/sw/source/uibase/inc/changedb.hxx 
b/sw/source/uibase/inc/changedb.hxx
index 0a1233420df3..23ae2c6430a2 100644
--- a/sw/source/uibase/inc/changedb.hxx
+++ b/sw/source/uibase/inc/changedb.hxx
@@ -53,7 +53,7 @@ class SwChangeDBDlg: public SvxStandardDialog
     void            ShowDBName(const SwDBData& rDBData);
 
 public:
-    SwChangeDBDlg(SwView& rVw);
+    SwChangeDBDlg(SwView const & rVw);
     virtual ~SwChangeDBDlg() override;
     virtual void dispose() override;
 };
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index c3bfe0904583..5e129e3d0f20 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -63,7 +63,7 @@ class SwColumnDlg : public SfxModalDialog
 
     DECL_LINK(ObjectListBoxHdl, ListBox&, void);
     DECL_LINK(OkHdl, Button*, void);
-    void ObjectHdl(ListBox*);
+    void ObjectHdl(ListBox const *);
     SfxItemSet* EvalCurrentSelection(void);
 
 public:
@@ -138,7 +138,7 @@ class SwColumnPage : public SfxTabPage
 
     // Handler
     DECL_LINK( ColModify, Edit&, void );
-    void ColModify(NumericField*);
+    void ColModify(NumericField const *);
     DECL_LINK( GapModify, Edit&, void );
     DECL_LINK( EdModify, Edit&, void );
     DECL_LINK( AutoWidthHdl, Button *, void );
@@ -151,7 +151,7 @@ class SwColumnPage : public SfxTabPage
     DECL_LINK( UpdateColMgrColorBox, SvxColorListBox&, void );
     void Timeout();
 
-    void            Update(MetricField *pInteractiveField);
+    void            Update(MetricField const *pInteractiveField);
     void            UpdateCols();
     void            Init();
     void            ResetColWidth();
diff --git a/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx
index 54e8b05df01a..c6ddf545cea1 100644
--- a/sw/source/uibase/inc/fldedt.hxx
+++ b/sw/source/uibase/inc/fldedt.hxx
@@ -41,7 +41,7 @@ class SwFieldEditDlg : public SfxSingleTabDialog
     void EnsureSelection(SwField *pCurField, SwFieldMgr &rMgr);
 public:
 
-    SwFieldEditDlg(SwView& rVw);
+    SwFieldEditDlg(SwView const & rVw);
     virtual ~SwFieldEditDlg() override;
     virtual void dispose() override;
 
diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx
index e31abe7afcf0..048042ac928b 100644
--- a/sw/source/uibase/inc/frmdlg.hxx
+++ b/sw/source/uibase/inc/frmdlg.hxx
@@ -47,7 +47,7 @@ class SwFrameDlg : public SfxTabDialog
     virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override;
 
 public:
-    SwFrameDlg(   SfxViewFrame *pFrame, vcl::Window *pParent,
+    SwFrameDlg(   SfxViewFrame const *pFrame, vcl::Window *pParent,
                 const SfxItemSet& rCoreSet,
                 bool bNewFrame,
                 const OUString& sResType = OUString("FrameDialog"),
diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx
index 055deac52ccf..a11ccfec6d88 100644
--- a/sw/source/uibase/inc/label.hxx
+++ b/sw/source/uibase/inc/label.hxx
@@ -70,8 +70,8 @@ public:
     Printer *GetPrt();
     inline void ReplaceGroup( const OUString &rMake );
     void UpdateGroup( const OUString &rMake ) {ReplaceGroup_( rMake );}
-    static void UpdateFieldInformation(css::uno::Reference< 
css::frame::XModel>& xModel,
-                                                                               
 const SwLabItem& rItem);
+    static void UpdateFieldInformation(css::uno::Reference< 
css::frame::XModel> const & xModel,
+                                       const SwLabItem& rItem);
     const OUString& GetBusinessCardStr() const {return m_sBusinessCardDlg;}
 
     SwLabelConfig& GetLabelsConfig() {return aLabelsCfg;}
diff --git a/sw/source/uibase/inc/mailmrge.hxx 
b/sw/source/uibase/inc/mailmrge.hxx
index a37e3b728101..e139d6a8bc65 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -123,7 +123,7 @@ public:
         const OUString& rTableName,
         sal_Int32 nCommandType,
         const css::uno::Reference< css::sdbc::XConnection>& xConnection,
-        css::uno::Sequence< css::uno::Any >* pSelection);
+        css::uno::Sequence< css::uno::Any > const * pSelection);
     virtual ~SwMailMergeDlg() override;
     virtual void dispose() override;
 
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index b530f4557a30..198a71cc1432 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -180,7 +180,7 @@ private:
 
     void DelUserData();
     void SetOptions(const sal_uLong nPos, const SwCapObjType eType, const 
SvGlobalName *pOleId = nullptr);
-    void SaveEntry(SvTreeListEntry* pEntry);
+    void SaveEntry(SvTreeListEntry const * pEntry);
     void InvalidatePreview();
 
 public:
diff --git a/sw/source/uibase/inc/regionsw.hxx 
b/sw/source/uibase/inc/regionsw.hxx
index cc1a0072c31a..add9aa524eb8 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -250,7 +250,7 @@ public:
     static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet);
 
-    void    SetWrtShell(SwWrtShell& rSh);
+    void    SetWrtShell(SwWrtShell const & rSh);
 };
 
 class SwInsertSectionTabDialog : public SfxTabDialog
diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx 
b/sw/source/uibase/inc/swrenamexnameddlg.hxx
index b111b7cbc3db..9259fe4d19d0 100644
--- a/sw/source/uibase/inc/swrenamexnameddlg.hxx
+++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx
@@ -54,8 +54,8 @@ public:
     }
 
     void SetAlternativeAccess(
-            css::uno::Reference< css::container::XNameAccess > & xSecond,
-            css::uno::Reference< css::container::XNameAccess > & xThird )
+            css::uno::Reference< css::container::XNameAccess > const & xSecond,
+            css::uno::Reference< css::container::XNameAccess > const & xThird )
     {
         xSecondAccess = xSecond;
         xThirdAccess = xThird;
diff --git a/sw/source/uibase/inc/swuiccoll.hxx 
b/sw/source/uibase/inc/swuiccoll.hxx
index e3a9f29e3729..0a6e7fb7450f 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -56,8 +56,8 @@ class SwCondCollPage : public SfxTabPage
     DECL_LINK( AssignRemoveClickHdl, Button*, void);
     DECL_LINK( SelectTreeListBoxHdl, SvTreeListBox*, void );
     DECL_LINK( SelectListBoxHdl, ListBox&, void );
-    void AssignRemove(void*);
-    void SelectHdl(void*);
+    void AssignRemove(void const *);
+    void SelectHdl(void const *);
 
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
diff --git a/sw/source/uibase/inc/wordcountdialog.hxx 
b/sw/source/uibase/inc/wordcountdialog.hxx
index b8ebc2344db4..972ea5cb990f 100644
--- a/sw/source/uibase/inc/wordcountdialog.hxx
+++ b/sw/source/uibase/inc/wordcountdialog.hxx
@@ -53,7 +53,7 @@ public:
     SwWordCountFloatDlg(     SfxBindings* pBindings,
                              SfxChildWindow* pChild,
                              vcl::Window *pParent,
-                             SfxChildWinInfo* pInfo);
+                             SfxChildWinInfo const * pInfo);
     virtual ~SwWordCountFloatDlg() override;
     virtual void dispose() override;
     void    UpdateCounts();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to