loplugin:constparams in sw part10

Change-Id: I7d708c3e6157d0b8690b433d3363d2c0745b2410
Reviewed-on: https://gerrit.libreoffice.org/40832
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

46 files changed, 88 insertions, 88 deletions

diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 7c79409a8fee..96c77cd9edd7 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -91,7 +91,7 @@ struct AddressUserData_Impl
         {}
 };
 
-static OUString lcl_getFlatURL( uno::Reference<beans::XPropertySet>& xSourceProperties )
+static OUString lcl_getFlatURL( uno::Reference<beans::XPropertySet> const & xSourceProperties )
 {
     if(xSourceProperties.is())
     {
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 07bffc295a99..1ef08e5b52bd 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -393,7 +393,7 @@ void SwAddressControl_Impl::Resize()
 }
 
 SwCreateAddressListDialog::SwCreateAddressListDialog(
-        vcl::Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig) :
+        vcl::Window* pParent, const OUString& rURL, SwMailMergeConfigItem const & rConfig) :
     SfxModalDialog(pParent, "CreateAddressList", "modules/swriter/ui/createaddresslist.ui"),
     m_sAddressListFilterName( SwResId(    ST_FILTERNAME)),
     m_sURL(rURL),
diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx
index a50e585b4606..81ecad7cb8ec 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.hxx
@@ -74,7 +74,7 @@ class SwCreateAddressListDialog : public SfxModalDialog
 
 public:
     SwCreateAddressListDialog(
-            vcl::Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig);
+            vcl::Window* pParent, const OUString& rURL, SwMailMergeConfigItem const & rConfig);
     virtual ~SwCreateAddressListDialog() override;
     virtual void dispose() override;
 
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
index e501fe9772a1..2c0d1fb45710 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
-SwDBTablePreviewDialog::SwDBTablePreviewDialog(vcl::Window* pParent, uno::Sequence< beans::PropertyValue>& rValues ) :
+SwDBTablePreviewDialog::SwDBTablePreviewDialog(vcl::Window* pParent, uno::Sequence< beans::PropertyValue> const & rValues ) :
     SfxModalDialog(pParent, "TablePreviewDialog", "modules/swriter/ui/tablepreviewdialog.ui")
 {
     get(m_pDescriptionFI, "description");
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
index faf89f7ec1b9..b0d2f25de99e 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
@@ -37,7 +37,7 @@ class SwDBTablePreviewDialog : public SfxModalDialog
     css::uno::Reference< css::frame::XFrame2 >         m_xFrame;
 public:
     SwDBTablePreviewDialog(vcl::Window* pParent,
-            css::uno::Sequence< css::beans::PropertyValue>& rValues  );
+            css::uno::Sequence< css::beans::PropertyValue> const & rValues  );
     virtual ~SwDBTablePreviewDialog() override;
     virtual void dispose() override;
 
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 5856271632b7..15eda7fa94be 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -39,7 +39,7 @@
 using namespace svt;
 using namespace ::com::sun::star;
 
-SwMailMergeWizard::SwMailMergeWizard(SwView& rView, std::shared_ptr<SwMailMergeConfigItem>& rItem) :
+SwMailMergeWizard::SwMailMergeWizard(SwView& rView, std::shared_ptr<SwMailMergeConfigItem> const & rItem) :
         RoadmapWizard(&rView.GetViewFrame()->GetWindow()),
         m_pSwView(&rView),
         m_bDocumentLoad( false ),
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index d7cd2fdf95e2..36ce5d02934a 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
 static void lcl_FillGreetingsBox(ListBox& rBox,
-                        SwMailMergeConfigItem& rConfig,
+                        SwMailMergeConfigItem const & rConfig,
                         SwMailMergeConfigItem::Gender eType)
 {
     const Sequence< OUString> rEntries = rConfig.GetGreetings(eType);
@@ -47,7 +47,7 @@ static void lcl_FillGreetingsBox(ListBox& rBox,
 }
 
 static void lcl_FillGreetingsBox(ComboBox& rBox,
-                        SwMailMergeConfigItem& rConfig,
+                        SwMailMergeConfigItem const & rConfig,
                         SwMailMergeConfigItem::Gender eType)
 {
     const Sequence< OUString> rEntries = rConfig.GetGreetings(eType);
@@ -56,7 +56,7 @@ static void lcl_FillGreetingsBox(ComboBox& rBox,
     rBox.SelectEntryPos(rConfig.GetCurrentGreeting(eType));
 }
 
-static void lcl_StoreGreetingsBox(ListBox& rBox,
+static void lcl_StoreGreetingsBox(ListBox const & rBox,
                         SwMailMergeConfigItem& rConfig,
                         SwMailMergeConfigItem::Gender eType)
 {
@@ -68,7 +68,7 @@ static void lcl_StoreGreetingsBox(ListBox& rBox,
     rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos());
 }
 
-static void lcl_StoreGreetingsBox(ComboBox& rBox,
+static void lcl_StoreGreetingsBox(ComboBox const & rBox,
                         SwMailMergeConfigItem& rConfig,
                         SwMailMergeConfigItem::Gender eType)
 {
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index a7e7f47fc9f3..7c08f53d24a5 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -247,7 +247,7 @@ bool SwMailMergeLayoutPage::commitPage(::svt::WizardTypes::CommitPageReason eRea
     return true;
 }
 
-SwFrameFormat*  SwMailMergeLayoutPage::InsertAddressAndGreeting(SwView* pView,
+SwFrameFormat*  SwMailMergeLayoutPage::InsertAddressAndGreeting(SwView const * pView,
         SwMailMergeConfigItem& rConfigItem,
         const Point& rAddressPosition,
         bool bAlignToBody)
@@ -277,7 +277,7 @@ SwFrameFormat*  SwMailMergeLayoutPage::InsertAddressAndGreeting(SwView* pView,
 
 SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame(
         SwWrtShell& rShell,
-        SwMailMergeConfigItem& rConfigItem,
+        SwMailMergeConfigItem const & rConfigItem,
         const Point& rDestination,
         bool bAlignLeft,
         bool bExample)
@@ -415,7 +415,7 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame(
     return pRet;
 }
 
-void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem& rConfigItem, bool bExample)
+void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem const & rConfigItem, bool bExample)
 {
     //set the cursor to the desired position - if no text content is here then
     //new paragraphs are inserted
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index e75a48cfda45..c2e453fbab57 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -73,11 +73,11 @@ class SwMailMergeLayoutPage : public svt::OWizardPage
 
     static SwFrameFormat*        InsertAddressFrame(
                             SwWrtShell& rShell,
-                            SwMailMergeConfigItem& rConfigItem,
+                            SwMailMergeConfigItem const & rConfigItem,
                             const Point& rDestination,
                             bool bAlignToBody,
                             bool bExample);
-    static void             InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem& rConfigItem, bool bExample);
+    static void             InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem const & rConfigItem, bool bExample);
 
     virtual void        ActivatePage() override;
     virtual bool        commitPage(::svt::WizardTypes::CommitPageReason _eReason) override;
@@ -86,7 +86,7 @@ public:
         virtual ~SwMailMergeLayoutPage() override;
     virtual void            dispose() override;
 
-    static SwFrameFormat*        InsertAddressAndGreeting(SwView* pView,
+    static SwFrameFormat*        InsertAddressAndGreeting(SwView const * pView,
                                             SwMailMergeConfigItem& rConfigItem,
                                             const Point& rAddressPos,
                                             bool bAlignToBody);
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 45d8042b5a53..06424c743aca 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -146,7 +146,7 @@ public:
     virtual void mailDeliveryError(::rtl::Reference<MailDispatcher> xMailDispatcher,
                 uno::Reference< mail::XMailMessage> xMailMessage, const OUString& sErrorMessage) override;
 
-    static void DeleteAttachments( uno::Reference< mail::XMailMessage >& xMessage );
+    static void DeleteAttachments( uno::Reference< mail::XMailMessage > const & xMessage );
 };
 
 SwMailDispatcherListener_Impl::SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg) :
@@ -191,7 +191,7 @@ void SwMailDispatcherListener_Impl::mailDeliveryError(
     DeleteAttachments( xMailMessage );
 }
 
-void SwMailDispatcherListener_Impl::DeleteAttachments( uno::Reference< mail::XMailMessage >& xMessage )
+void SwMailDispatcherListener_Impl::DeleteAttachments( uno::Reference< mail::XMailMessage > const & xMessage )
 {
     uno::Sequence< mail::MailAttachment > aAttachments = xMessage->getAttachments();
 
@@ -334,7 +334,7 @@ void SwSendMailDialog::dispose()
     ModelessDialog::dispose();
 }
 
-void SwSendMailDialog::AddDocument( SwMailDescriptor& rDesc )
+void SwSendMailDialog::AddDocument( SwMailDescriptor const & rDesc )
 {
     ::osl::MutexGuard aGuard(m_pImpl->aDescriptorMutex);
     m_pImpl->aDescriptors.push_back(rDesc);
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index b31130733e9a..09499d3a7dc9 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -97,7 +97,7 @@ static OUString lcl_GetExtensionForDocType(sal_uLong nDocType)
     return sExtension;
 }
 
-static OUString lcl_GetColumnValueOf(const OUString& rColumn, Reference < container::XNameAccess>& rxColAccess )
+static OUString lcl_GetColumnValueOf(const OUString& rColumn, Reference < container::XNameAccess> const & rxColAccess )
 {
     OUString sRet;
     try
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index a24b4bfe494b..eb2dcd2c7540 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -1628,7 +1628,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap,
     RelHdl(_rLB);
 }
 
-sal_Int16 SwFramePage::GetRelation(ListBox &rRelationLB)
+sal_Int16 SwFramePage::GetRelation(ListBox const &rRelationLB)
 {
     const sal_Int32 nPos = rRelationLB.GetSelectEntryPos();
 
@@ -1642,7 +1642,7 @@ sal_Int16 SwFramePage::GetRelation(ListBox &rRelationLB)
 }
 
 sal_Int16 SwFramePage::GetAlignment(FrameMap *pMap, sal_Int32 nMapPos,
-        ListBox &rRelationLB)
+        ListBox const &rRelationLB)
 {
     if (!pMap || nMapPos < 0)
         return 0;
@@ -1674,7 +1674,7 @@ sal_Int16 SwFramePage::GetAlignment(FrameMap *pMap, sal_Int32 nMapPos,
     return 0;
 }
 
-sal_Int32 SwFramePage::GetMapPos( const FrameMap *pMap, ListBox &rAlignLB )
+sal_Int32 SwFramePage::GetMapPos( const FrameMap *pMap, ListBox const &rAlignLB )
 {
     sal_Int32 nMapPos = 0;
     sal_Int32 nLBSelPos = rAlignLB.GetSelectEntryPos();
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index e64e03ba6178..4593af32c80a 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -211,7 +211,7 @@ public:
     virtual ~SwSendMailDialog() override;
     virtual void        dispose() override;
 
-    void                AddDocument( SwMailDescriptor& rDesc );
+    void                AddDocument( SwMailDescriptor const & rDesc );
     void                EnableDestruction() {m_bDesctructionEnabled = true;}
     void                ShowDialog();
 
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index 55bdceb8ea52..cc1f3cacc5f5 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -60,8 +60,8 @@ using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::uno;
 using namespace com::sun::star::ui::dialogs;
 
-static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
-                           uno::Reference< XPropertySet > & xProps,
+static void lcl_SetProp( uno::Reference< XPropertySetInfo > const & xInfo,
+                           uno::Reference< XPropertySet > const & xProps,
                          OUString const & aPropName, const OUString& rValue)
 {
     if(xInfo->hasPropertyByName(aPropName))
@@ -72,8 +72,8 @@ static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
     }
 }
 
-static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
-                           uno::Reference< XPropertySet > & xProps,
+static void lcl_SetProp( uno::Reference< XPropertySetInfo > const & xInfo,
+                           uno::Reference< XPropertySet > const & xProps,
                            OUString const & aPropName, sal_Int16 nValue )
 {
     if(xInfo->hasPropertyByName(aPropName))
@@ -85,8 +85,8 @@ static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
 }
 
 static void lcl_SetBOOLProp(
-                uno::Reference< beans::XPropertySetInfo > & xInfo,
-                uno::Reference< beans::XPropertySet > & xProps,
+                uno::Reference< beans::XPropertySetInfo > const & xInfo,
+                uno::Reference< beans::XPropertySet > const & xProps,
                 OUString const & aPropName, bool bValue )
 {
     if(xInfo->hasPropertyByName(aPropName))
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 562d4a2c3764..eacc2b8e9510 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -633,13 +633,13 @@ class SwAddStylesDlg_Impl : public SfxModalDialog
     DECL_LINK(HeaderDragHdl, HeaderBar*, void);
 
 public:
-    SwAddStylesDlg_Impl(vcl::Window* pParent, SwWrtShell& rWrtSh, OUString rStringArr[]);
+    SwAddStylesDlg_Impl(vcl::Window* pParent, SwWrtShell const & rWrtSh, OUString rStringArr[]);
     virtual ~SwAddStylesDlg_Impl() override;
     virtual void dispose() override;
 };
 
 SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(vcl::Window* pParent,
-            SwWrtShell& rWrtSh, OUString rStringArr[])
+            SwWrtShell const & rWrtSh, OUString rStringArr[])
     : SfxModalDialog(pParent, "AssignStylesDialog",
         "modules/swriter/ui/assignstylesdialog.ui")
     , pStyleArr(rStringArr)
@@ -940,7 +940,7 @@ void SwTOXSelectTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-void SwTOXSelectTabPage::SetWrtShell(SwWrtShell& rSh)
+void SwTOXSelectTabPage::SetWrtShell(SwWrtShell const & rSh)
 {
     const sal_uInt16 nUserTypeCount = rSh.GetTOXTypeCount(TOX_USER);
     if(nUserTypeCount > 1)
@@ -1427,7 +1427,7 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageListBoxHdl, ListBox&, rBox, void)
 {
     LanguageHdl(&rBox);
 }
-void SwTOXSelectTabPage::LanguageHdl( ListBox* pBox )
+void SwTOXSelectTabPage::LanguageHdl( ListBox const * pBox )
 {
     lang::Locale aLcl( LanguageTag( m_pLanguageLB->GetSelectLanguage() ).getLocale() );
     Sequence< OUString > aSeq = pIndexEntryWrapper->GetAlgorithmList( aLcl );
@@ -2045,7 +2045,7 @@ IMPL_LINK_NOARG(SwTOXEntryTabPage, ModifyHdl, LinkParamNone*, void)
 {
     OnModify(nullptr);
 }
-void SwTOXEntryTabPage::OnModify(void* pVoid)
+void SwTOXEntryTabPage::OnModify(void const * pVoid)
 {
     UpdateDescriptor();
 
@@ -3459,7 +3459,7 @@ bool SwTokenWindow::Contains(FormTokenType eSearchFor) const
     return bRet;
 }
 
-bool SwTokenWindow::CreateQuickHelp(Control* pCtrl,
+bool SwTokenWindow::CreateQuickHelp(Control const * pCtrl,
             const SwFormToken& rToken,
             const HelpEvent& rHEvt)
 {
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 13bef9bbd156..06eb81bbd41e 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -651,7 +651,7 @@ IMPL_LINK( SwIndexMarkPane, ModifyEditHdl, Edit&, rEdit, void )
     ModifyHdl(&rEdit);
 }
 
-void SwIndexMarkPane::ModifyHdl(Control* pBox)
+void SwIndexMarkPane::ModifyHdl(Control const * pBox)
 {
     if (m_pTypeDCB == pBox)
     {
@@ -946,7 +946,7 @@ SwIndexMarkPane::~SwIndexMarkPane()
 {
 }
 
-void    SwIndexMarkPane::ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark)
+void    SwIndexMarkPane::ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark const * pCurTOXMark)
 {
     pSh = &rWrtShell;
     pTOXMgr.reset( new SwTOXMgr(pSh) );
@@ -964,7 +964,7 @@ void    SwIndexMarkPane::ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark
 
 SwIndexMarkFloatDlg::SwIndexMarkFloatDlg(SfxBindings* _pBindings,
     SfxChildWindow* pChild, vcl::Window *pParent,
-    SfxChildWinInfo* pInfo, bool bNew)
+    SfxChildWinInfo const * pInfo, bool bNew)
     : SfxModelessDialog(_pBindings, pChild, pParent, "IndexEntryDialog", "modules/swriter/ui/indexentry.ui")
     , m_aContent(*this, bNew, *::GetActiveWrtShell())
 {
@@ -983,7 +983,7 @@ void SwIndexMarkFloatDlg::ReInitDlg(SwWrtShell& rWrtShell)
     m_aContent.ReInitDlg( rWrtShell );
 }
 
-SwIndexMarkModalDlg::SwIndexMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark)
+SwIndexMarkModalDlg::SwIndexMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark const * pCurTOXMark)
     : SvxStandardDialog(pParent, "IndexEntryDialog", "modules/swriter/ui/indexentry.ui")
     , m_aContent(*this, false, rSh)
 {
@@ -1658,7 +1658,7 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, EnableHdl, ListBox&, rBox, void)
 SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* _pBindings,
                                    SfxChildWindow* pChild,
                                    vcl::Window *pParent,
-                                   SfxChildWinInfo* pInfo,
+                                   SfxChildWinInfo const * pInfo,
                                    bool bNew)
     : SfxModelessDialog(_pBindings, pChild, pParent,
         "BibliographyEntryDialog", "modules/swriter/ui/bibliographyentry.ui")
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 7c48cf135374..8f5eaf264086 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -187,7 +187,7 @@ void SwGlossaryDlg::SetActGroup(const OUString &rGrp)
     ::SetCurrGlosGroup(rGrp);
 }
 
-SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
+SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame const * pViewFrame,
                             SwGlossaryHdl * pGlosHdl, SwWrtShell *pWrtShell)
     : SvxStandardDialog(&pViewFrame->GetWindow(), "AutoTextDialog",
         "modules/swriter/ui/autotext.ui")
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index cad31b1e29cf..7077e8c4b7db 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -59,7 +59,7 @@ static void lcl_setLineNumbering(const OUString& rName, SwWrtShell* pSh, bool bL
     xStyleSheet->SetItemSet(rSet);
 }
 
-SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
+SwLineNumberingDlg::SwLineNumberingDlg(SwView const *pVw)
     : SfxModalDialog( &pVw->GetViewFrame()->GetWindow(), "LineNumberingDialog",
         "modules/swriter/ui/linenumbering.ui" )
     , pSh(pVw->GetWrtShellPtr())
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index f2a98831641f..abc6a0d186a0 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -81,7 +81,7 @@ static void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox )
 }
 
 // determine lines and columns for table selection
-static bool lcl_GetSelTable( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY )
+static bool lcl_GetSelTable( SwWrtShell const &rSh, sal_uInt16& rX, sal_uInt16& rY )
 {
     const SwTableNode* pTableNd = rSh.IsCursorInTable();
     if( !pTableNd )
@@ -428,7 +428,7 @@ IMPL_LINK( SwSortDlg, LanguageListBoxHdl, ListBox&, rLBox, void )
     LanguageHdl(&rLBox);
 }
 
-void SwSortDlg::LanguageHdl(ListBox* pLBox)
+void SwSortDlg::LanguageHdl(ListBox const * pLBox)
 {
     Sequence < OUString > aSeq( GetAppCollator().listCollatorAlgorithms(
                 LanguageTag( m_pLangLB->GetSelectLanguage()).getLocale() ));
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index 5fcefe0451c6..62c175901346 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -116,7 +116,7 @@ namespace
         pSh->LockView( false );
     }
 
-    sal_uInt16 lcl_GetCurrentPage(SwWrtShell *pSh)
+    sal_uInt16 lcl_GetCurrentPage(SwWrtShell const *pSh)
     {
         OUString sDummy;
         sal_uInt16 nPhyNum=1, nVirtNum=1;
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index b2a7ac92e46e..fc040fc2d51b 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -949,7 +949,7 @@ bool  SwTableColumnPage::FillItemSet( SfxItemSet* )
     return bModified;
 }
 
-void   SwTableColumnPage::ModifyHdl( MetricField* pField )
+void   SwTableColumnPage::ModifyHdl( MetricField const * pField )
 {
         PercentField *pEdit = nullptr;
         sal_uInt16 i;
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 6f4a5bf8c080..8bb89e7958cc 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -56,7 +56,7 @@ public:
 
     void NotifyChange( const SwTableAutoFormat& rNewData );
 
-    void DetectRTL(SwWrtShell* pWrtShell);
+    void DetectRTL(SwWrtShell const * pWrtShell);
 
     virtual void Resize() override;
 protected:
@@ -538,7 +538,7 @@ void AutoFormatPreview::Resize()
     NotifyChange(aCurData);
 }
 
-void AutoFormatPreview::DetectRTL(SwWrtShell* pWrtShell)
+void AutoFormatPreview::DetectRTL(SwWrtShell const * pWrtShell)
 {
     if (!pWrtShell->IsCursorInTable()) // We haven't created the table yet
         mbRTL = AllSettings::GetLayoutRTL();
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index 552cfaf294bf..73d3fd2c6c79 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -46,7 +46,7 @@ class SwVbaBorder : public SwVbaBorder_Base
 private:
     uno::Reference< beans::XPropertySet > m_xProps;
     sal_Int32 m_LineType;
-    void setBorderLine( table::BorderLine& rBorderLine )
+    void setBorderLine( table::BorderLine const & rBorderLine )
     {
         table::TableBorder aTableBorder;
         m_xProps->getPropertyValue( "TableBorder" ) >>= aTableBorder;
@@ -247,7 +247,7 @@ private:
         return getCount(); // error condition
     }
 public:
-    RangeBorders(  const uno::Reference< table::XCellRange >& xRange,  const uno::Reference< uno::XComponentContext > & xContext, VbaPalette& rPalette ) : m_xRange( xRange ), m_xContext( xContext ), m_Palette( rPalette )
+    RangeBorders(  const uno::Reference< table::XCellRange >& xRange,  const uno::Reference< uno::XComponentContext > & xContext, VbaPalette const & rPalette ) : m_xRange( xRange ), m_xContext( xContext ), m_Palette( rPalette )
     {
     }
     // XIndexAccess
@@ -277,7 +277,7 @@ public:
 };
 
 uno::Reference< container::XIndexAccess >
-rangeToBorderIndexAccess( const uno::Reference< table::XCellRange >& xRange,  const uno::Reference< uno::XComponentContext > & xContext, VbaPalette& rPalette )
+rangeToBorderIndexAccess( const uno::Reference< table::XCellRange >& xRange,  const uno::Reference< uno::XComponentContext > & xContext, VbaPalette const & rPalette )
 {
     return new RangeBorders( xRange, xContext, rPalette );
 }
@@ -302,7 +302,7 @@ public:
 };
 
 // for Table borders
-SwVbaBorders::SwVbaBorders( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< table::XCellRange >& xRange, VbaPalette& rPalette  ):  SwVbaBorders_BASE( xParent, xContext, rangeToBorderIndexAccess( xRange ,xContext, rPalette ) )
+SwVbaBorders::SwVbaBorders( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< table::XCellRange >& xRange, VbaPalette const & rPalette  ):  SwVbaBorders_BASE( xParent, xContext, rangeToBorderIndexAccess( xRange ,xContext, rPalette ) )
 {
     m_xProps.set( xRange, uno::UNO_QUERY_THROW );
 }
diff --git a/sw/source/ui/vba/vbaborders.hxx b/sw/source/ui/vba/vbaborders.hxx
index 45364e3c5f59..a4ca819f6752 100644
--- a/sw/source/ui/vba/vbaborders.hxx
+++ b/sw/source/ui/vba/vbaborders.hxx
@@ -33,7 +33,7 @@ class SwVbaBorders : public SwVbaBorders_BASE
     virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) override;
     css::uno::Reference< css::beans::XPropertySet > m_xProps;
 public:
-    SwVbaBorders( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::table::XCellRange >& xRange, VbaPalette& rPalette );
+    SwVbaBorders( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::table::XCellRange >& xRange, VbaPalette const & rPalette );
 
     // XEnumerationAccess
     virtual css::uno::Type SAL_CALL getElementType() override;
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index 126306d25218..cb3d227fb09a 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -360,7 +360,7 @@ public:
     OUString msOOOPropName;
     std::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper;
 
-    static DocPropInfo createDocPropInfo( const OUString& sDesc, const OUString& sPropName, std::shared_ptr< PropertGetSetHelper >& rHelper )
+    static DocPropInfo createDocPropInfo( const OUString& sDesc, const OUString& sPropName, std::shared_ptr< PropertGetSetHelper > const & rHelper )
     {
         DocPropInfo aItem;
         aItem.msMSODesc = sDesc;
@@ -369,7 +369,7 @@ public:
         return aItem;
     }
 
-    static DocPropInfo createDocPropInfo( const sal_Char* sDesc, const sal_Char* sPropName, std::shared_ptr< PropertGetSetHelper >& rHelper )
+    static DocPropInfo createDocPropInfo( const sal_Char* sDesc, const sal_Char* sPropName, std::shared_ptr< PropertGetSetHelper > const & rHelper )
     {
         return createDocPropInfo( OUString::createFromAscii( sDesc ), OUString::createFromAscii( sPropName ), rHelper );
     }
diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx
index c7fd7421a824..3594b24daab7 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -42,7 +42,7 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 static uno::Any
-getDocument( uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< text::XTextDocument > &xDoc, const uno::Any& aApplication )
+getDocument( uno::Reference< uno::XComponentContext > const & xContext, const uno::Reference< text::XTextDocument > &xDoc, const uno::Any& aApplication )
 {
     // FIXME: fine as long as SwVbaDocument is stateless ...
     uno::Reference< frame::XModel > xModel( xDoc, uno::UNO_QUERY );
diff --git a/sw/source/ui/vba/vbalisttemplate.cxx b/sw/source/ui/vba/vbalisttemplate.cxx
index a4e646d26f78..97ea48983fc3 100644
--- a/sw/source/ui/vba/vbalisttemplate.cxx
+++ b/sw/source/ui/vba/vbalisttemplate.cxx
@@ -43,7 +43,7 @@ SwVbaListTemplate::ListLevels( const uno::Any& index )
     return uno::makeAny( xCol );
 }
 
-void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet >& xProps )
+void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet > const & xProps )
 {
     uno::Reference< container::XIndexReplace > xNumberingRules = pListHelper->getNumberingRules();
     xProps->setPropertyValue("NumberingRules", uno::makeAny( xNumberingRules ) );
diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx
index 598656f9dd48..902695cb2700 100644
--- a/sw/source/ui/vba/vbalisttemplate.hxx
+++ b/sw/source/ui/vba/vbalisttemplate.hxx
@@ -37,7 +37,7 @@ public:
     virtual ~SwVbaListTemplate() override;
 
     /// @throws css::uno::RuntimeException
-    void applyListTemplate( css::uno::Reference< css::beans::XPropertySet >& xProps );
+    void applyListTemplate( css::uno::Reference< css::beans::XPropertySet > const & xProps );
 
     // Methods
     virtual css::uno::Any SAL_CALL ListLevels( const css::uno::Any& index ) override;
diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx
index 34b2b38146ba..2c2e2af16fb3 100644
--- a/sw/source/ui/vba/vbaoptions.cxx
+++ b/sw/source/ui/vba/vbaoptions.cxx
@@ -31,7 +31,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaOptions::SwVbaOptions( uno::Reference<uno::XComponentContext >& xContext ) : SwVbaOptions_BASE( uno::Reference< XHelperInterface >(), xContext )
+SwVbaOptions::SwVbaOptions( uno::Reference<uno::XComponentContext > const & xContext ) : SwVbaOptions_BASE( uno::Reference< XHelperInterface >(), xContext )
 {
 }
 
diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx
index d7de9d6ea661..9d9403564bb9 100644
--- a/sw/source/ui/vba/vbaoptions.hxx
+++ b/sw/source/ui/vba/vbaoptions.hxx
@@ -32,7 +32,7 @@ class SwVbaOptions : public SwVbaOptions_BASE,
 private:
     OUString msDefaultFilePath;
 public:
-    explicit SwVbaOptions( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
+    explicit SwVbaOptions( css::uno::Reference< css::uno::XComponentContext > const & m_xContext );
     virtual ~SwVbaOptions() override;
 
     // Attributes
diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx
index a6184d4358bf..c50dd5d4a396 100644
--- a/sw/source/ui/vba/vbaparagraphformat.cxx
+++ b/sw/source/ui/vba/vbaparagraphformat.cxx
@@ -424,7 +424,7 @@ float SwVbaParagraphFormat::getMSWordLineSpacing( style::LineSpacing& rLineSpaci
     return wdLineSpacing;
 }
 
-sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing& rLineSpacing )
+sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing const & rLineSpacing )
 {
     sal_Int32 wdLineSpacing = word::WdLineSpacing::wdLineSpaceSingle;
     switch( rLineSpacing.Mode )
diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx
index 80e5407c1ed3..c24162a712c8 100644
--- a/sw/source/ui/vba/vbaparagraphformat.hxx
+++ b/sw/source/ui/vba/vbaparagraphformat.hxx
@@ -36,7 +36,7 @@ private:
     static css::style::LineSpacing getOOoLineSpacing( float _lineSpace, sal_Int16 mode );
     css::style::LineSpacing getOOoLineSpacingFromRule( sal_Int32 _linespacingrule );
     static float getMSWordLineSpacing( css::style::LineSpacing& rLineSpacing );
-    static sal_Int32 getMSWordLineSpacingRule( css::style::LineSpacing& rLineSpacing );
+    static sal_Int32 getMSWordLineSpacingRule( css::style::LineSpacing const & rLineSpacing );
     /// @throws css::uno::RuntimeException
     sal_Int16 getCharHeight();
     static css::style::ParagraphAdjust getOOoAlignment( sal_Int32 _alignment );
diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx
index 17fd3a0bfa71..db299585fbb2 100644
--- a/sw/source/ui/vba/vbarangehelper.cxx
+++ b/sw/source/ui/vba/vbarangehelper.cxx
@@ -60,7 +60,7 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u
     return xRange;
 }
 
-void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, bool _bAbsorb )
+void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange > const & rTextRange, uno::Reference< text::XText > const & rText, const OUString& rStr, bool _bAbsorb )
 {
     sal_Int32 nlastIndex = 0;
     sal_Int32 nIndex = 0;
diff --git a/sw/source/ui/vba/vbarangehelper.hxx b/sw/source/ui/vba/vbarangehelper.hxx
index 40b02531bd74..5d91af3c8c02 100644
--- a/sw/source/ui/vba/vbarangehelper.hxx
+++ b/sw/source/ui/vba/vbarangehelper.hxx
@@ -31,7 +31,7 @@ public:
     /// @throws css::uno::RuntimeException
     static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position );
     /// @throws css::uno::RuntimeException
-    static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const OUString& rStr, bool _bAbsorb );
+    static void insertString( css::uno::Reference< css::text::XTextRange > const & rTextRange, css::uno::Reference< css::text::XText > const & rText, const OUString& rStr, bool _bAbsorb );
     /// @throws css::uno::RuntimeException
     /// @throws css::script::BasicErrorException
     static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText );
diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx
index f02ea0c243ba..270d22dd2fd7 100644
--- a/sw/source/ui/vba/vbasystem.cxx
+++ b/sw/source/ui/vba/vbasystem.cxx
@@ -167,7 +167,7 @@ void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value )
 
 }
 
-SwVbaSystem::SwVbaSystem( uno::Reference<uno::XComponentContext >& xContext ): SwVbaSystem_BASE( uno::Reference< XHelperInterface >(), xContext )
+SwVbaSystem::SwVbaSystem( uno::Reference<uno::XComponentContext > const & xContext ): SwVbaSystem_BASE( uno::Reference< XHelperInterface >(), xContext )
 {
 }
 
diff --git a/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx
index 9c5921f3de16..c0acb2ad490f 100644
--- a/sw/source/ui/vba/vbasystem.hxx
+++ b/sw/source/ui/vba/vbasystem.hxx
@@ -47,7 +47,7 @@ private:
     PrivateProfileStringListener maPrivateProfileStringListener;
 
 public:
-    explicit SwVbaSystem( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
+    explicit SwVbaSystem( css::uno::Reference< css::uno::XComponentContext > const & m_xContext );
     virtual ~SwVbaSystem() override;
 
     // XSystem
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index eeff0d96ae69..efcf9aadb6e9 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -160,7 +160,7 @@ void SwVbaTableHelper::InitTabCols( SwTabCols& rCols, const SwTableBox *pStart )
     pTable->GetTabCols( rCols, pStart );
 }
 
-sal_Int32 SwVbaTableHelper::GetColCount( SwTabCols& rCols )
+sal_Int32 SwVbaTableHelper::GetColCount( SwTabCols const & rCols )
 {
     sal_Int32 nCount = 0;
     for( size_t i = 0; i < rCols.Count(); ++i )
@@ -169,7 +169,7 @@ sal_Int32 SwVbaTableHelper::GetColCount( SwTabCols& rCols )
     return rCols.Count() - nCount;
 }
 
-sal_Int32 SwVbaTableHelper::GetRightSeparator( SwTabCols& rCols, sal_Int32 nNum)
+sal_Int32 SwVbaTableHelper::GetRightSeparator( SwTabCols const & rCols, sal_Int32 nNum)
 {
     OSL_ENSURE( nNum < GetColCount( rCols ) ,"Index out of range");
     sal_Int32 i = 0;
diff --git a/sw/source/ui/vba/vbatablehelper.hxx b/sw/source/ui/vba/vbatablehelper.hxx
index 6f4a4d4424b6..c569a64ae06d 100644
--- a/sw/source/ui/vba/vbatablehelper.hxx
+++ b/sw/source/ui/vba/vbatablehelper.hxx
@@ -34,8 +34,8 @@ private:
     /// @throws css::uno::RuntimeException
     SwTableBox* GetTabBox( sal_Int32 nCol, sal_Int32 nRow );
     void    InitTabCols( SwTabCols& rCols, const SwTableBox *pStart );
-    static sal_Int32 GetRightSeparator( SwTabCols& rCols, sal_Int32 nNum);
-    static sal_Int32 GetColCount( SwTabCols& rCols );
+    static sal_Int32 GetRightSeparator( SwTabCols const & rCols, sal_Int32 nNum);
+    static sal_Int32 GetColCount( SwTabCols const & rCols );
     /// @throws css::uno::RuntimeException
     static sal_Int32 GetColWidth( SwTabCols& rCols, sal_Int32 nNum );
 
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 260746e45deb..870ad0803b4d 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -163,9 +163,9 @@ class SwFramePage: public SfxTabPage
                                const sal_Int16 _nRel,
                                ListBox& _rLB,
                                FixedText& _rFT );
-    static sal_Int32 GetMapPos(const FrameMap *pMap, ListBox &rAlignLB);
-    static sal_Int16 GetAlignment(FrameMap *pMap, sal_Int32 nMapPos, ListBox &rRelationLB);
-    static sal_Int16 GetRelation(ListBox &rRelationLB);
+    static sal_Int32 GetMapPos(const FrameMap *pMap, ListBox const &rAlignLB);
+    static sal_Int16 GetAlignment(FrameMap *pMap, sal_Int32 nMapPos, ListBox const &rRelationLB);
+    static sal_Int16 GetRelation(ListBox const &rRelationLB);
     RndStdIds       GetAnchor();
 
     void setOptimalFrameWidth();
diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx
index bc9c87d55266..32e22554b067 100644
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.hxx
@@ -150,7 +150,7 @@ class SwGlossaryDlg : public SvxStandardDialog
 
     void            DeleteEntry();
 public:
-    SwGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell);
+    SwGlossaryDlg(SfxViewFrame const * pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell);
     virtual ~SwGlossaryDlg() override;
     virtual void dispose() override;
     OUString GetCurrGrpName() const;
diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx
index 92dcf8eaf616..5f0af2b410a6 100644
--- a/sw/source/uibase/inc/linenum.hxx
+++ b/sw/source/uibase/inc/linenum.hxx
@@ -53,7 +53,7 @@ private:
     DECL_LINK(ModifyHdl, Edit&, void);
 
 public:
-    SwLineNumberingDlg(SwView *pVw);
+    SwLineNumberingDlg(SwView const *pVw);
     virtual ~SwLineNumberingDlg() override;
     virtual void dispose() override;
 };
diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx
index 567f989684dc..a9d022f0826e 100644
--- a/sw/source/uibase/inc/mailmergewizard.hxx
+++ b/sw/source/uibase/inc/mailmergewizard.hxx
@@ -60,7 +60,7 @@ protected:
     virtual OUString                getStateDisplayName( WizardState _nState ) const override;
 
 public:
-    SwMailMergeWizard(SwView& rView, std::shared_ptr<SwMailMergeConfigItem>& rConfigItem);
+    SwMailMergeWizard(SwView& rView, std::shared_ptr<SwMailMergeConfigItem> const & rConfigItem);
     virtual ~SwMailMergeWizard() override;
 
     SwView*                     GetSwView() {return m_pSwView;}
diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx
index c280a917db4e..d86cf35e4376 100644
--- a/sw/source/uibase/inc/srtdlg.hxx
+++ b/sw/source/uibase/inc/srtdlg.hxx
@@ -80,7 +80,7 @@ class SwSortDlg : public SvxStandardDialog
     DECL_LINK( CheckHdl, Button*, void );
     DECL_LINK( DelimHdl, Button*, void );
     DECL_LINK( LanguageListBoxHdl, ListBox&, void );
-    void LanguageHdl(ListBox*);
+    void LanguageHdl(ListBox const *);
     DECL_LINK(DelimCharHdl, Button*,void);
 
 public:
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 248985073902..505f4c5284a5 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -204,7 +204,7 @@ class SwTOXSelectTabPage : public SfxTabPage
     DECL_LINK(MenuEnableHdl, Menu*, bool);
     DECL_LINK(MenuExecuteHdl, Menu*, bool);
     DECL_LINK(LanguageListBoxHdl, ListBox&, void);
-    void LanguageHdl(ListBox*);
+    void LanguageHdl(ListBox const *);
     DECL_LINK(CheckBoxHdl, Button*, void );
     DECL_LINK(RadioButtonHdl, Button*, void);
     DECL_LINK(ModifyHdl, Edit&, void);
@@ -231,7 +231,7 @@ public:
                                 const SfxItemSet* rAttrSet);
 
     void                SelectType(TOXTypes eSet);  //preset TOXType, GlobalDoc
-    void                SetWrtShell(SwWrtShell& rSh);
+    void                SetWrtShell(SwWrtShell const & rSh);
 };
 
 class SwTokenWindow : public VclHBox, public VclBuilderContainer
@@ -304,7 +304,7 @@ public:
     bool        Contains(FormTokenType) const;
 
     //helper for pattern buttons and edits
-    bool        CreateQuickHelp(Control* pCtrl,
+    bool        CreateQuickHelp(Control const * pCtrl,
                     const SwFormToken& rToken, const HelpEvent& );
 
     virtual void    GetFocus() override;
@@ -420,7 +420,7 @@ class SwTOXEntryTabPage : public SfxTabPage
     void            WriteBackLevel();
     void            UpdateDescriptor();
     DECL_LINK(ModifyHdl, LinkParamNone*, void);
-    void OnModify(void*);
+    void OnModify(void const *);
     DECL_LINK(ModifyClickHdl, Button*, void);
 
     using SfxTabPage::ActivatePage;
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index 2ae2ab4f4a0e..165ec5cfb465 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -119,7 +119,7 @@ class SwIndexMarkPane
     DECL_LINK( PrevSameHdl, Button*, void );
     DECL_LINK( ModifyListBoxHdl, ListBox&, void );
     DECL_LINK( ModifyEditHdl, Edit&, void );
-    void ModifyHdl(Control*);
+    void ModifyHdl(Control const *);
     DECL_LINK( KeyDCBModifyHdl, Edit&, void );
     DECL_LINK( NewUserIdxHdl, Button*, void );
     DECL_LINK( SearchTypeHdl, Button*, void );
@@ -148,7 +148,7 @@ public:
 
     ~SwIndexMarkPane();
 
-    void    ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark = nullptr);
+    void    ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark const * pCurTOXMark = nullptr);
     bool    IsTOXType(const OUString& rName)
                 {return LISTBOX_ENTRY_NOTFOUND != m_pTypeDCB->GetEntryPos(rName);}
 };
@@ -161,7 +161,7 @@ public:
     SwIndexMarkFloatDlg( SfxBindings* pBindings,
                          SfxChildWindow* pChild,
                          vcl::Window *pParent,
-                         SfxChildWinInfo* pInfo,
+                         SfxChildWinInfo const * pInfo,
                          bool bNew);
     void    ReInitDlg(SwWrtShell& rWrtShell);
 };
@@ -170,7 +170,7 @@ class SwIndexMarkModalDlg : public SvxStandardDialog
 {
     SwIndexMarkPane m_aContent;
 public:
-    SwIndexMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark);
+    SwIndexMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark const * pCurTOXMark);
 
     virtual void        Apply() override;
     virtual void        dispose() override;
@@ -236,7 +236,7 @@ public:
     SwAuthMarkFloatDlg( SfxBindings* pBindings,
                         SfxChildWindow* pChild,
                         vcl::Window *pParent,
-                        SfxChildWinInfo* pInfo,
+                        SfxChildWinInfo const * pInfo,
                         bool bNew);
     void    ReInitDlg(SwWrtShell& rWrtShell);
 };
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx
index 1a9ebb679724..47180997d790 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -118,7 +118,7 @@ class SwTableColumnPage : public SfxTabPage
 
     void        Init(bool bWeb);
     DECL_LINK( AutoClickHdl, Button *, void );
-    void        ModifyHdl( MetricField* pEdit );
+    void        ModifyHdl( MetricField const * pEdit );
     DECL_LINK( UpHdl, SpinField&, void );
     DECL_LINK( DownHdl, SpinField&, void );
     DECL_LINK( LoseFocusHdl, Control&, void );