[Libreoffice-commits] core.git: idlc/inc idlc/source sw/inc sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Sun Aug 6 18:14:35 UTC 2017
idlc/inc/astexception.hxx | 2 +-
idlc/inc/fehelper.hxx | 4 ++--
idlc/source/fehelper.cxx | 4 ++--
sw/inc/AnnotationWin.hxx | 4 ++--
sw/inc/PostItMgr.hxx | 2 +-
sw/inc/dbmgr.hxx | 2 +-
sw/inc/docsh.hxx | 4 ++--
sw/inc/mdiexp.hxx | 20 ++++++++++----------
sw/inc/swmodule.hxx | 4 ++--
sw/inc/viewopt.hxx | 2 +-
sw/source/core/doc/docedt.cxx | 2 +-
sw/source/filter/html/htmlflywriter.cxx | 2 +-
sw/source/filter/html/htmlftn.cxx | 2 +-
sw/source/filter/html/htmltab.cxx | 4 ++--
sw/source/filter/html/wrthtml.hxx | 2 +-
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 14 +++++++-------
sw/source/filter/xml/XMLRedlineImportHelper.hxx | 2 +-
sw/source/filter/xml/swxml.cxx | 4 ++--
sw/source/filter/xml/xmlimp.cxx | 2 +-
sw/source/filter/xml/xmlimp.hxx | 2 +-
sw/source/filter/xml/xmlimpit.cxx | 2 +-
sw/source/uibase/app/appenv.cxx | 2 +-
sw/source/uibase/app/docsh.cxx | 4 ++--
sw/source/uibase/app/docsh2.cxx | 2 +-
sw/source/uibase/app/docstyle.cxx | 4 ++--
sw/source/uibase/app/mainwn.cxx | 10 +++++-----
sw/source/uibase/app/swmodul1.cxx | 6 +++---
sw/source/uibase/config/viewopt.cxx | 2 +-
sw/source/uibase/dbui/dbmgr.cxx | 4 ++--
sw/source/uibase/dbui/mailmergehelper.cxx | 4 ++--
sw/source/uibase/dbui/mmconfigitem.cxx | 4 ++--
sw/source/uibase/dialog/regionsw.cxx | 2 +-
sw/source/uibase/docvw/AnchorOverlayObject.cxx | 2 +-
sw/source/uibase/docvw/AnchorOverlayObject.hxx | 2 +-
sw/source/uibase/docvw/AnnotationWin.cxx | 2 +-
sw/source/uibase/docvw/AnnotationWin2.cxx | 4 ++--
sw/source/uibase/docvw/OverlayRanges.cxx | 2 +-
sw/source/uibase/docvw/OverlayRanges.hxx | 2 +-
sw/source/uibase/docvw/PostItMgr.cxx | 2 +-
sw/source/uibase/docvw/ShadowOverlayObject.cxx | 2 +-
sw/source/uibase/docvw/ShadowOverlayObject.hxx | 2 +-
sw/source/uibase/docvw/edtwin.cxx | 12 ++++++------
sw/source/uibase/docvw/edtwin3.cxx | 12 ++++++------
sw/source/uibase/docvw/romenu.cxx | 2 +-
sw/source/uibase/docvw/romenu.hxx | 2 +-
sw/source/uibase/envelp/labelcfg.cxx | 2 +-
sw/source/uibase/fldui/fldmgr.cxx | 2 +-
sw/source/uibase/inc/basesh.hxx | 2 +-
sw/source/uibase/inc/edtwin.hxx | 2 +-
sw/source/uibase/inc/fldmgr.hxx | 2 +-
sw/source/uibase/inc/hyp.hxx | 2 +-
sw/source/uibase/inc/mailmergehelper.hxx | 4 ++--
sw/source/uibase/inc/mmconfigitem.hxx | 4 ++--
sw/source/uibase/inc/redlndlg.hxx | 2 +-
sw/source/uibase/lingu/hyp.cxx | 2 +-
sw/source/uibase/misc/redlndlg.cxx | 2 +-
56 files changed, 102 insertions(+), 102 deletions(-)
New commits:
commit 8ef6be73325dbb6761b247ff187c709ba0f81bfb
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Sat Aug 5 15:20:21 2017 +0200
loplugin:constparams in sw part6
Change-Id: Ic82946cf9be50d9d9c43338b86dfb700ce5b354c
Reviewed-on: https://gerrit.libreoffice.org/40786
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/idlc/inc/astexception.hxx b/idlc/inc/astexception.hxx
index b69f26f52ff9..12bb642c4004 100644
--- a/idlc/inc/astexception.hxx
+++ b/idlc/inc/astexception.hxx
@@ -24,7 +24,7 @@
class AstException : public AstStruct
{
public:
- AstException(const OString& name, AstException* pBaseType, AstScope* pScope)
+ AstException(const OString& name, AstException const * pBaseType, AstScope* pScope)
: AstStruct(NT_exception, name, pBaseType, pScope)
{}
};
diff --git a/idlc/inc/fehelper.hxx b/idlc/inc/fehelper.hxx
index 730aa05607a1..8ebc1c9f44ce 100644
--- a/idlc/inc/fehelper.hxx
+++ b/idlc/inc/fehelper.hxx
@@ -43,8 +43,8 @@ class FeInheritanceHeader final
{
public:
FeInheritanceHeader(
- NodeType nodeType, OString* pName, OString* pInherits,
- std::vector< OString > * typeParameters);
+ NodeType nodeType, OString* pName, OString const * pInherits,
+ std::vector< OString > const * typeParameters);
~FeInheritanceHeader()
{
diff --git a/idlc/source/fehelper.cxx b/idlc/source/fehelper.cxx
index 1d3fc4154b1b..3a3e5324e303 100644
--- a/idlc/source/fehelper.cxx
+++ b/idlc/source/fehelper.cxx
@@ -58,8 +58,8 @@ AstType const * FeDeclarator::compose(AstDeclaration const * pDecl)
}
FeInheritanceHeader::FeInheritanceHeader(
- NodeType nodeType, OString* pName, OString* pInherits,
- std::vector< OString > * typeParameters)
+ NodeType nodeType, OString* pName, OString const * pInherits,
+ std::vector< OString > const * typeParameters)
: m_nodeType(nodeType)
, m_pName(pName)
, m_pInherits(nullptr)
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 29080823050a..7165f80c48af 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -84,7 +84,7 @@ class SwAnnotationWin : public vcl::Window
/// Calculate parent postit id of current annotation window
sal_uInt32 CalcParent();
- void InitAnswer(OutlinerParaObject* pText);
+ void InitAnswer(OutlinerParaObject const * pText);
bool IsProtected();
@@ -178,7 +178,7 @@ class SwAnnotationWin : public vcl::Window
void SetLanguage(const SvxLanguageItem& rNewItem);
- void ChangeSidebarItem( SwSidebarItem& rSidebarItem );
+ void ChangeSidebarItem( SwSidebarItem const & rSidebarItem );
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
virtual void Draw(OutputDevice* pDev, const Point&, const Size&, DrawFlags) override;
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 98055cf451cd..65209c00d334 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -275,7 +275,7 @@ class SwPostItMgr: public SfxListener
const OUString& GetAnswerText() { return maAnswerText; }
void CheckMetaText();
- sal_uInt16 Replace(SvxSearchItem* pItem);
+ sal_uInt16 Replace(SvxSearchItem const * pItem);
sal_uInt16 SearchReplace(const SwFormatField &pField, const i18nutil::SearchOptions2& rSearchOptions,bool bSrchForward);
sal_uInt16 FinishSearchReplace(const i18nutil::SearchOptions2& rSearchOptions,bool bSrchForward);
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 7282acfb3a7f..2b9cb62c814d 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -309,7 +309,7 @@ public:
bool IsMergeOk() { return MergeStatus::OK == m_aMergeStatus; };
bool IsMergeError() { return MergeStatus::ERROR <= m_aMergeStatus; };
- static std::shared_ptr<SwMailMergeConfigItem> PerformMailMerge(SwView* pView);
+ static std::shared_ptr<SwMailMergeConfigItem> PerformMailMerge(SwView const * pView);
/// Initialize data fields that lack name of database.
bool IsInitDBFields() const { return bInitDBFields; }
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 60b25f9c2918..62f4cf4e56d2 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -226,7 +226,7 @@ public:
/// For inserting document.
Reader* StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
- SwCursorShell* pCursorSh = nullptr, SwPaM* pPaM = nullptr);
+ SwCursorShell const * pCursorSh = nullptr, SwPaM* pPaM = nullptr);
#if defined(_WIN32)
virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType,
@@ -277,7 +277,7 @@ public:
void ToggleLayoutMode(SwView* pView);
- ErrCode LoadStylesFromFile( const OUString& rURL, SwgReaderOption& rOpt,
+ ErrCode LoadStylesFromFile( const OUString& rURL, SwgReaderOption const & rOpt,
bool bUnoCall );
void InvalidateModel();
void ReactivateModel();
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index be76b619db6e..924d44a2f750 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -30,12 +30,12 @@ class SwViewShell;
class SwDoc;
class SwDocShell;
-extern void ScrollMDI(SwViewShell* pVwSh, const SwRect &, sal_uInt16 nRangeX, sal_uInt16 nRangeY);
-extern bool IsScrollMDI(SwViewShell* pVwSh, const SwRect &);
-extern void SizeNotify(SwViewShell* pVwSh, const Size &);
+extern void ScrollMDI(SwViewShell const * pVwSh, const SwRect &, sal_uInt16 nRangeX, sal_uInt16 nRangeY);
+extern bool IsScrollMDI(SwViewShell const * pVwSh, const SwRect &);
+extern void SizeNotify(SwViewShell const * pVwSh, const Size &);
// Update of status bar during an action.
-extern void PageNumNotify( SwViewShell* pVwSh,
+extern void PageNumNotify( SwViewShell const * pVwSh,
sal_uInt16 nPhyNum,
sal_uInt16 nVirtNum,
const OUString& rPg );
@@ -44,17 +44,17 @@ enum FlyMode { FLY_DRAG_START, FLY_DRAG, FLY_DRAG_END };
extern void FrameNotify( SwViewShell* pVwSh, FlyMode eMode = FLY_DRAG );
SW_DLLPUBLIC void StartProgress(const char* pMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = nullptr);
-SW_DLLPUBLIC void EndProgress ( SwDocShell *pDocSh );
-SW_DLLPUBLIC void SetProgressState ( long nPosition, SwDocShell *pDocShell );
-void SetProgressText(const char* pMessId, SwDocShell *pDocShell);
-void RescheduleProgress( SwDocShell *pDocShell );
+SW_DLLPUBLIC void EndProgress ( SwDocShell const *pDocSh );
+SW_DLLPUBLIC void SetProgressState ( long nPosition, SwDocShell const *pDocShell );
+void SetProgressText(const char* pMessId, SwDocShell const *pDocShell);
+void RescheduleProgress( SwDocShell const *pDocShell );
-void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect );
+void RepaintPagePreview( SwViewShell const * pVwSh, const SwRect& rRect );
// Read ChgMode for tables from configuration.
TableChgMode GetTableChgDefaultMode();
-bool JumpToSwMark( SwViewShell* pVwSh, const OUString& rMark );
+bool JumpToSwMark( SwViewShell const * pVwSh, const OUString& rMark );
#endif
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 3c7839ffa6ce..a70e4a24fd5f 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -178,12 +178,12 @@ public:
// Iterate over views.
static SwView* GetFirstView();
- static SwView* GetNextView(SwView*);
+ static SwView* GetNextView(SwView const *);
bool IsEmbeddedLoadSave() const { return m_bEmbeddedLoadSave; }
void SetEmbeddedLoadSave( bool bFlag ) { m_bEmbeddedLoadSave = bFlag; }
- static void ShowDBObj( SwView& rView, const SwDBData& rData);
+ static void ShowDBObj( SwView const & rView, const SwDBData& rData);
// Table modi.
bool IsInsTableFormatNum(bool bHTML) const;
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index eb020b478787..2f51b526cfb2 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -195,7 +195,7 @@ public:
SwViewOption(const SwViewOption&);
~SwViewOption();
- static void Init( vcl::Window *pWin ); // Initializing of static data.
+ static void Init( vcl::Window const *pWin ); // Initializing of static data.
ViewOptFlags1 GetCoreOptions() const {return m_nCoreOptions;}
inline void SetUIOptions( const SwViewOption& );
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 333f301d3add..3532929cd5bf 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -544,7 +544,7 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
nStat = nPageNr - *pPageSt + 1;
else
nStat = nPageNr + *pPageCnt - *pPageSt + 1;
- ::SetProgressState( nStat, const_cast<SwDocShell*>(GetDocShell()) );
+ ::SetProgressState( nStat, GetDocShell() );
}
//Spell() changes the pSpellArgs in case an error is found
sal_Int32 nBeginGrammarCheck = 0;
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index b02c441a31e3..74e74ec201e5 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -1199,7 +1199,7 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat,
const OUString& rGraphicURL,
- Graphic& rGraphic, const OUString& rAlternateText,
+ Graphic const & rGraphic, const OUString& rAlternateText,
const Size &rRealSize, HtmlFrmOpts nFrameOpts,
const sal_Char *pMarkType,
const ImageMap *pAltImgMap )
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index a4e18ab4d753..ef384761f2b3 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -512,7 +512,7 @@ static int lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo,
return nParts;
}
-static void lcl_html_outFootEndNoteInfo( Writer& rWrt, OUString *pParts,
+static void lcl_html_outFootEndNoteInfo( Writer& rWrt, OUString const *pParts,
int nParts, const sal_Char *pName )
{
SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 6fd697426cb4..c595c7bc6f61 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2973,7 +2973,7 @@ class CellSaveStruct : public SectionSaveStruct
public:
- CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, bool bHd,
+ CellSaveStruct( SwHTMLParser& rParser, HTMLTable const *pCurTable, bool bHd,
bool bReadOpt );
void AddContents( HTMLTableCnts *pNewCnts );
@@ -2991,7 +2991,7 @@ public:
void CheckNoBreak( const SwPosition& rPos );
};
-CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
+CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable const *pCurTable,
bool bHd, bool bReadOpt ) :
SectionSaveStruct( rParser ),
m_pCnts( nullptr ),
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index c05634abaf86..a081cd1a8d7b 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -644,7 +644,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrameFormat& rFrameFormat,
Writer& OutHTML_Image( Writer&, const SwFrameFormat& rFormat,
const OUString& rGraphicURL,
- Graphic& rGraphic, const OUString& rAlternateText,
+ Graphic const & rGraphic, const OUString& rAlternateText,
const Size& rRealSize, HtmlFrmOpts nFrameOpts,
const sal_Char *pMarkType,
const ImageMap *pGenImgMap = nullptr );
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 32bd7a5d30e0..8f0bbb674b85 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -88,9 +88,9 @@ class XTextRangeOrNodeIndexPosition
public:
XTextRangeOrNodeIndexPosition();
- void Set( Reference<XTextRange> & rRange );
- void Set( SwNodeIndex& rIndex );
- void SetAsNodeIndex( Reference<XTextRange> & rRange );
+ void Set( Reference<XTextRange> const & rRange );
+ void Set( SwNodeIndex const & rIndex );
+ void SetAsNodeIndex( Reference<XTextRange> const & rRange );
void CopyPositionInto(SwPosition& rPos, SwDoc & rDoc);
SwDoc* GetDoc();
@@ -104,13 +104,13 @@ XTextRangeOrNodeIndexPosition::XTextRangeOrNodeIndexPosition() :
{
}
-void XTextRangeOrNodeIndexPosition::Set( Reference<XTextRange> & rRange )
+void XTextRangeOrNodeIndexPosition::Set( Reference<XTextRange> const & rRange )
{
xRange = rRange->getStart(); // set bookmark
pIndex.reset();
}
-void XTextRangeOrNodeIndexPosition::Set( SwNodeIndex& rIndex )
+void XTextRangeOrNodeIndexPosition::Set( SwNodeIndex const & rIndex )
{
pIndex.reset( new SwNodeIndex(rIndex) );
(*pIndex)-- ; // previous node!!!
@@ -118,7 +118,7 @@ void XTextRangeOrNodeIndexPosition::Set( SwNodeIndex& rIndex )
}
void XTextRangeOrNodeIndexPosition::SetAsNodeIndex(
- Reference<XTextRange> & rRange )
+ Reference<XTextRange> const & rRange )
{
// XTextRange -> XTunnel -> SwXTextRange
SwDoc* pDoc = lcl_GetDocViaTunnel(rRange);
@@ -480,7 +480,7 @@ Reference<XTextCursor> XMLRedlineImportHelper::CreateRedlineTextSection(
void XMLRedlineImportHelper::SetCursor(
const OUString& rId,
bool bStart,
- Reference<XTextRange> & rRange,
+ Reference<XTextRange> const & rRange,
bool bIsOutsideOfParagraph)
{
RedlineMapType::iterator aFind = aRedlineMap.find(rId);
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index 1010af2a847e..01fe6153e625 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -89,7 +89,7 @@ public:
void SetCursor(
const OUString& rId, // ID used in RedlineAdd() call
bool bStart, // start or end Range
- css::uno::Reference<css::text::XTextRange> & rRange, // the actual XTextRange
+ css::uno::Reference<css::text::XTextRange> const & rRange, // the actual XTextRange
// text range is (from an XML view) outside of a paragraph
// (i.e. before a table)
bool bIsOusideOfParagraph);
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 4513028f9765..0de368498c3f 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -131,7 +131,7 @@ ErrCode ReadThroughComponent(
uno::Reference<io::XInputStream> const & xInputStream,
uno::Reference<XComponent> const & xModelComponent,
const OUString& rStreamName,
- uno::Reference<uno::XComponentContext> & rxContext,
+ uno::Reference<uno::XComponentContext> const & rxContext,
const sal_Char* pFilterName,
const Sequence<Any>& rFilterArguments,
const OUString& rName,
@@ -254,7 +254,7 @@ ErrCode ReadThroughComponent(
uno::Reference<XComponent> const & xModelComponent,
const sal_Char* pStreamName,
const sal_Char* pCompatibilityStreamName,
- uno::Reference<uno::XComponentContext> & rxContext,
+ uno::Reference<uno::XComponentContext> const & rxContext,
const sal_Char* pFilterName,
const Sequence<Any>& rFilterArguments,
const OUString& rName,
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index e51efb7b29dc..9b0f79c1c626 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1442,7 +1442,7 @@ void SwXMLImport::initialize(
}
}
-SwDoc* SwImport::GetDocFromXMLImport( SvXMLImport& rImport )
+SwDoc* SwImport::GetDocFromXMLImport( SvXMLImport const & rImport )
{
uno::Reference<lang::XUnoTunnel> xModelTunnel( rImport.GetModel(), uno::UNO_QUERY );
SwXTextDocument *pTextDoc = reinterpret_cast< SwXTextDocument *>(
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index e5f2eaa899cb..769efa031b5e 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -50,7 +50,7 @@ enum class SfxStyleFamily;
#define PROGRESS_BAR_STEP 20
namespace SwImport {
- SwDoc* GetDocFromXMLImport( SvXMLImport& );
+ SwDoc* GetDocFromXMLImport( SvXMLImport const & );
}
// we only need this scoped enum to be flags here, in sw
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 60285aeaa31f..c4ebf67e2162 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -232,7 +232,7 @@ struct BoxHolder
BoxHolder(BoxHolder const&) = delete;
BoxHolder& operator=(BoxHolder const&) = delete;
- explicit BoxHolder(SvxBoxItem& rBox)
+ explicit BoxHolder(SvxBoxItem const & rBox)
{
pTop = rBox.GetTop() == nullptr ?
nullptr : new SvxBorderLine( *rBox.GetTop() );
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index 0f863537e58b..1c5a93a8bf72 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -131,7 +131,7 @@ OUString InsertLabEnvText( SwWrtShell& rSh, SwFieldMgr& rFieldMgr, const OUStrin
return sRet;
}
-static void lcl_CopyCollAttr(SwWrtShell* pOldSh, SwWrtShell* pNewSh, sal_uInt16 nCollId)
+static void lcl_CopyCollAttr(SwWrtShell const * pOldSh, SwWrtShell* pNewSh, sal_uInt16 nCollId)
{
sal_uInt16 nCollCnt = pOldSh->GetTextFormatCollCount();
for( sal_uInt16 nCnt = 0; nCnt < nCollCnt; ++nCnt )
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 894e32d39a70..82c3c8390f35 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -161,7 +161,7 @@ bool SwDocShell::InsertGeneratedStream(SfxMedium & rMedium,
// Prepare loading
Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
- SwCursorShell *pCursorShell,
+ SwCursorShell const *pCursorShell,
SwPaM* pPaM )
{
bool bAPICall = false;
@@ -518,7 +518,7 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
}
// Save all Formats
-static SwSrcView* lcl_GetSourceView( SwDocShell* pSh )
+static SwSrcView* lcl_GetSourceView( SwDocShell const * pSh )
{
// are we in SourceView?
SfxViewFrame* pVFrame = SfxViewFrame::GetFirst( pSh );
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 65b5cae493d4..7dc36f163a1e 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1435,7 +1435,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie
}
ErrCode SwDocShell::LoadStylesFromFile( const OUString& rURL,
- SwgReaderOption& rOpt, bool bUnoCall )
+ SwgReaderOption const & rOpt, bool bUnoCall )
{
ErrCode nErr = ERRCODE_NONE;
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 09ed6e7393ff..084d989ef819 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -1259,7 +1259,7 @@ bool SwDocStyleSheet::SetFollow( const OUString& rStr)
}
static
-std::unique_ptr<SfxItemSet> lcl_SwFormatToFlatItemSet(SwFormat *const pFormat)
+std::unique_ptr<SfxItemSet> lcl_SwFormatToFlatItemSet(SwFormat const *const pFormat)
{
// note: we don't add the odd items that GetItemSet() would add
// because they don't seem relevant for preview
@@ -1778,7 +1778,7 @@ static bool lcl_Contains(const std::vector<void*>& rArr, const void* p)
return std::find( rArr.begin(), rArr.end(), p ) != rArr.end();
}
-static void lcl_DeleteInfoStyles( SfxStyleFamily nFamily, std::vector<void*>& rArr, SwDoc& rDoc )
+static void lcl_DeleteInfoStyles( SfxStyleFamily nFamily, std::vector<void*> const & rArr, SwDoc& rDoc )
{
size_t n, nCnt;
switch( nFamily )
diff --git a/sw/source/uibase/app/mainwn.cxx b/sw/source/uibase/app/mainwn.cxx
index fbc3340990ff..4c690b0ce714 100644
--- a/sw/source/uibase/app/mainwn.cxx
+++ b/sw/source/uibase/app/mainwn.cxx
@@ -35,7 +35,7 @@ struct SwProgress
static std::vector<SwProgress*> *pProgressContainer = nullptr;
-static SwProgress *lcl_SwFindProgress( SwDocShell *pDocShell )
+static SwProgress *lcl_SwFindProgress( SwDocShell const *pDocShell )
{
for (SwProgress* pTmp : *pProgressContainer)
{
@@ -73,7 +73,7 @@ void StartProgress( const char* pMessResId, long nStartValue, long nEndValue,
}
}
-void SetProgressState( long nPosition, SwDocShell *pDocShell )
+void SetProgressState( long nPosition, SwDocShell const *pDocShell )
{
if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() )
{
@@ -83,7 +83,7 @@ void SetProgressState( long nPosition, SwDocShell *pDocShell )
}
}
-void EndProgress( SwDocShell *pDocShell )
+void EndProgress( SwDocShell const *pDocShell )
{
if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() )
{
@@ -116,7 +116,7 @@ void EndProgress( SwDocShell *pDocShell )
}
}
-void SetProgressText(const char* pId, SwDocShell *pDocShell)
+void SetProgressText(const char* pId, SwDocShell const *pDocShell)
{
if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() )
{
@@ -126,7 +126,7 @@ void SetProgressText(const char* pId, SwDocShell *pDocShell)
}
}
-void RescheduleProgress( SwDocShell *pDocShell )
+void RescheduleProgress( SwDocShell const *pDocShell )
{
if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() )
{
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index 109a46198f57..7eaa20e1c422 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -133,9 +133,9 @@ SwView* SwModule::GetFirstView()
return pView;
}
-SwView* SwModule::GetNextView(SwView* pView)
+SwView* SwModule::GetNextView(SwView const * pView)
{
- OSL_ENSURE(dynamic_cast<SwView*>( pView),"return no SwView" );
+ OSL_ENSURE(dynamic_cast<SwView const *>( pView),"return no SwView" );
SwView* pNView = static_cast<SwView*>(SfxViewShell::GetNext(*pView, true, checkSfxViewShell<SwView>));
return pNView;
}
@@ -370,7 +370,7 @@ SwChapterNumRules* SwModule::GetChapterNumRules()
return m_pChapterNumRules;
}
-void SwModule::ShowDBObj(SwView& rView, const SwDBData& rData)
+void SwModule::ShowDBObj(SwView const & rView, const SwDBData& rData)
{
Reference<XFrame> xFrame = rView.GetViewFrame()->GetFrame().GetFrameInterface();
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index 9bc84e223d4d..da71c54ceadb 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -302,7 +302,7 @@ SwViewOption::~SwViewOption()
{
}
-void SwViewOption::Init( vcl::Window *pWin )
+void SwViewOption::Init( vcl::Window const *pWin )
{
if( !m_nPixelTwips && pWin )
{
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index e9240b08a50d..1d691bff3bed 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2682,7 +2682,7 @@ SwDBManager::DBConnURITypes SwDBManager::GetDBunoURI(const OUString &rURI, uno::
}
/// Returns the URL of this SwDoc.
-OUString lcl_getOwnURL(SwDocShell* pDocShell)
+OUString lcl_getOwnURL(SwDocShell const * pDocShell)
{
OUString aRet;
@@ -3156,7 +3156,7 @@ void SwDBManager::ConnectionDisposedListener_Impl::disposing( const lang::EventO
}
}
-std::shared_ptr<SwMailMergeConfigItem> SwDBManager::PerformMailMerge(SwView* pView)
+std::shared_ptr<SwMailMergeConfigItem> SwDBManager::PerformMailMerge(SwView const * pView)
{
std::shared_ptr<SwMailMergeConfigItem> xConfigItem = pView->GetMailMergeConfigItem();
if (!xConfigItem)
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 000e76a3a76b..a1579a8a3311 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -84,7 +84,7 @@ bool CheckMailAddress( const OUString& rMailAddress )
}
uno::Reference< mail::XSmtpService > ConnectToSmtpServer(
- SwMailMergeConfigItem& rConfigItem,
+ SwMailMergeConfigItem const & rConfigItem,
uno::Reference< mail::XMailService >& rxInMailService,
const OUString& rInMailServerPassword,
const OUString& rOutMailServerPassword,
@@ -451,7 +451,7 @@ void SwAddressPreview::DrawText_Impl(vcl::RenderContext& rRenderContext, const O
OUString SwAddressPreview::FillData(
const OUString& rAddress,
- SwMailMergeConfigItem& rConfigItem,
+ SwMailMergeConfigItem const & rConfigItem,
const Sequence< OUString>* pAssignments)
{
//find the column names in the address string (with name assignment!) and
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 2f66526a67b0..f01d6e6bbe4b 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -920,7 +920,7 @@ OUString& SwMailMergeConfigItem::GetFilter() const
return m_pImpl->m_sFilter;
}
-void SwMailMergeConfigItem::SetFilter(OUString& rFilter)
+void SwMailMergeConfigItem::SetFilter(OUString const & rFilter)
{
if(m_pImpl->m_sFilter != rFilter)
{
@@ -1545,7 +1545,7 @@ bool SwMailMergeConfigItem::IsMailAvailable() const
return m_pImpl->m_bIsEMailSupported;
}
-void SwMailMergeConfigItem::AddMergedDocument(SwDocMergeInfo& rInfo)
+void SwMailMergeConfigItem::AddMergedDocument(SwDocMergeInfo const & rInfo)
{
m_pImpl->m_aMergeInfos.push_back(rInfo);
}
diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx
index 856d54f95507..d8888f091d3d 100644
--- a/sw/source/uibase/dialog/regionsw.cxx
+++ b/sw/source/uibase/dialog/regionsw.cxx
@@ -202,7 +202,7 @@ IMPL_LINK( SwWrtShell, InsertRegionDialog, void*, p, void )
}
}
-void SwBaseShell::EditRegionDialog(SfxRequest& rReq)
+void SwBaseShell::EditRegionDialog(SfxRequest const & rReq)
{
const SfxItemSet* pArgs = rReq.GetArgs();
sal_uInt16 nSlot = rReq.GetSlot();
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
index c7f1ee90a617..16acfb845409 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
@@ -173,7 +173,7 @@ bool AnchorPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive
ImplPrimitive2DIDBlock(AnchorPrimitive, PRIMITIVE2D_ID_SWSIDEBARANCHORPRIMITIVE)
/*static*/ AnchorOverlayObject* AnchorOverlayObject::CreateAnchorOverlayObject(
- SwView& rDocView,
+ SwView const & rDocView,
const SwRect& aAnchorRect,
long aPageBorder,
const Point& aLineStart,
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
index 9fcac873d3d9..296856c82394 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
@@ -40,7 +40,7 @@ enum class AnchorState
class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition
{
public:
- static AnchorOverlayObject* CreateAnchorOverlayObject( SwView& rDocView,
+ static AnchorOverlayObject* CreateAnchorOverlayObject( SwView const & rDocView,
const SwRect& aAnchorRect,
long aPageBorder,
const Point& aLineStart,
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 63b5c9e26296..5838e992276f 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -356,7 +356,7 @@ VclPtr<MenuButton> SwAnnotationWin::CreateMenuButton()
return pMenuButton;
}
-void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText)
+void SwAnnotationWin::InitAnswer(OutlinerParaObject const * pText)
{
// If tiled annotations is off in lok case, skip adding additional reply text.
if (comphelper::LibreOfficeKit::isActive() && !comphelper::LibreOfficeKit::isTiledAnnotations())
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index c2cfd0ed29cd..5e94b175579e 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -90,7 +90,7 @@ namespace
{
/// Translate absolute <-> relative twips: LOK wants absolute coordinates as output and gives absolute coordinates as input.
-void lcl_translateTwips(vcl::Window& rParent, vcl::Window& rChild, MouseEvent* pMouseEvent)
+void lcl_translateTwips(vcl::Window const & rParent, vcl::Window& rChild, MouseEvent* pMouseEvent)
{
// Set map mode, so that callback payloads will contain absolute coordinates instead of relative ones.
Point aOffset(rChild.GetOutOffXPixel() - rParent.GetOutOffXPixel(), rChild.GetOutOffYPixel() - rParent.GetOutOffYPixel());
@@ -1454,7 +1454,7 @@ bool SwAnnotationWin::IsScrollbarVisible() const
return HasScrollbar() && mpVScrollbar->IsVisible();
}
-void SwAnnotationWin::ChangeSidebarItem( SwSidebarItem& rSidebarItem )
+void SwAnnotationWin::ChangeSidebarItem( SwSidebarItem const & rSidebarItem )
{
const bool bAnchorChanged = mpAnchorFrame != rSidebarItem.maLayoutInfo.mpAnchorFrame;
if ( bAnchorChanged )
diff --git a/sw/source/uibase/docvw/OverlayRanges.cxx b/sw/source/uibase/docvw/OverlayRanges.cxx
index a04b813c5357..634820eca28f 100644
--- a/sw/source/uibase/docvw/OverlayRanges.cxx
+++ b/sw/source/uibase/docvw/OverlayRanges.cxx
@@ -104,7 +104,7 @@ namespace sw
}
/*static*/ OverlayRanges* OverlayRanges::CreateOverlayRange(
- SwView& rDocView,
+ SwView const & rDocView,
const Color& rColor,
const std::vector< basegfx::B2DRange >& rRanges,
const bool bShowSolidBorder )
diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx
index 941980bceb59..14ffb950f6c2 100644
--- a/sw/source/uibase/docvw/OverlayRanges.hxx
+++ b/sw/source/uibase/docvw/OverlayRanges.hxx
@@ -44,7 +44,7 @@ namespace sw
public:
static OverlayRanges* CreateOverlayRange(
- SwView& rDocView,
+ SwView const & rDocView,
const Color& rColor,
const std::vector< basegfx::B2DRange >& rRanges,
const bool bShowSolidBorder );
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index faac4f4f2832..de56b38bcc28 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -2187,7 +2187,7 @@ void SwPostItMgr::CheckMetaText()
}
-sal_uInt16 SwPostItMgr::Replace(SvxSearchItem* pItem)
+sal_uInt16 SwPostItMgr::Replace(SvxSearchItem const * pItem)
{
SwAnnotationWin* pWin = GetActiveSidebarWin();
sal_uInt16 aResult = pWin->GetOutlinerView()->StartSearchAndReplace( *pItem );
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
index 526a6162aad9..4e4c1b10b3f9 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.cxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
@@ -156,7 +156,7 @@ bool ShadowPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive
ImplPrimitive2DIDBlock(ShadowPrimitive, PRIMITIVE2D_ID_SWSIDEBARSHADOWPRIMITIVE)
-/* static */ ShadowOverlayObject* ShadowOverlayObject::CreateShadowOverlayObject( SwView& rDocView )
+/* static */ ShadowOverlayObject* ShadowOverlayObject::CreateShadowOverlayObject( SwView const & rDocView )
{
ShadowOverlayObject* pShadowOverlayObject( nullptr );
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
index d8a55e92304c..90731b073021 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
@@ -55,7 +55,7 @@ public:
void SetPosition( const basegfx::B2DPoint& rPoint1,
const basegfx::B2DPoint& rPoint2 );
- static ShadowOverlayObject* CreateShadowOverlayObject( SwView& rDocView );
+ static ShadowOverlayObject* CreateShadowOverlayObject( SwView const & rDocView );
static void DestroyShadowOverlayObject( ShadowOverlayObject* pShadow );
};
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 707f525eab6f..5d432fd11fa5 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -185,7 +185,7 @@ QuickHelpData* SwEditWin::m_pQuickHlpData = nullptr;
long SwEditWin::m_nDDStartPosY = 0;
long SwEditWin::m_nDDStartPosX = 0;
-static SfxShell* lcl_GetTextShellFromDispatcher( SwView& rView );
+static SfxShell* lcl_GetTextShellFromDispatcher( SwView const & rView );
/// Check if the selected shape has a TextBox: if so, go into that instead.
static bool lcl_goIntoTextBox(SwEditWin& rEditWin, SwWrtShell& rSh)
@@ -296,7 +296,7 @@ struct QuickHelpData
}
// Fills internal structures with hopefully helpful information.
- void FillStrArr( SwWrtShell& rSh, const OUString& rWord );
+ void FillStrArr( SwWrtShell const & rSh, const OUString& rWord );
void SortAndFilter(const OUString &rOrigWord);
};
@@ -760,7 +760,7 @@ bool SwEditWin::IsInputSequenceCheckingRequired( const OUString &rText, const Sw
//return INVALID_HINT if language should not be explicitly overridden, the correct
//HintId to use for the eBufferLanguage otherwise
-static sal_uInt16 lcl_isNonDefaultLanguage(LanguageType eBufferLanguage, SwView& rView,
+static sal_uInt16 lcl_isNonDefaultLanguage(LanguageType eBufferLanguage, SwView const & rView,
const OUString &rInBuffer)
{
sal_uInt16 nWhich = INVALID_HINT;
@@ -5830,7 +5830,7 @@ void SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
}
}
-static SfxShell* lcl_GetTextShellFromDispatcher( SwView& rView )
+static SfxShell* lcl_GetTextShellFromDispatcher( SwView const & rView )
{
// determine Shell
SfxShell* pShell;
@@ -5989,7 +5989,7 @@ void QuickHelpData::Stop( SwWrtShell& rSh )
ClearContent();
}
-void QuickHelpData::FillStrArr( SwWrtShell& rSh, const OUString& rWord )
+void QuickHelpData::FillStrArr( SwWrtShell const & rSh, const OUString& rWord )
{
enum Capitalization { CASE_LOWER, CASE_UPPER, CASE_SENTENCE, CASE_OTHER };
@@ -6167,7 +6167,7 @@ void QuickHelpData::SortAndFilter(const OUString &rOrigWord)
}
void SwEditWin::ShowAutoTextCorrectQuickHelp(
- const OUString& rWord, SvxAutoCorrCfg* pACfg, SvxAutoCorrect* pACorr,
+ const OUString& rWord, SvxAutoCorrCfg const * pACfg, SvxAutoCorrect* pACorr,
bool bFromIME )
{
SwWrtShell& rSh = m_rView.GetWrtShell();
diff --git a/sw/source/uibase/docvw/edtwin3.cxx b/sw/source/uibase/docvw/edtwin3.cxx
index 32c0e3dcb84c..5f6c304b2ba3 100644
--- a/sw/source/uibase/docvw/edtwin3.cxx
+++ b/sw/source/uibase/docvw/edtwin3.cxx
@@ -37,7 +37,7 @@
#include "uiobject.hxx"
// Core-Notify
-void ScrollMDI( SwViewShell* pVwSh, const SwRect &rRect,
+void ScrollMDI( SwViewShell const * pVwSh, const SwRect &rRect,
sal_uInt16 nRangeX, sal_uInt16 nRangeY)
{
SfxViewShell *pSfxViewShell = pVwSh->GetSfxViewShell();
@@ -47,7 +47,7 @@ void ScrollMDI( SwViewShell* pVwSh, const SwRect &rRect,
}
// Docmdi - movable
-bool IsScrollMDI( SwViewShell* pVwSh, const SwRect &rRect )
+bool IsScrollMDI( SwViewShell const * pVwSh, const SwRect &rRect )
{
SfxViewShell *pSfxViewShell = pVwSh->GetSfxViewShell();
@@ -58,7 +58,7 @@ bool IsScrollMDI( SwViewShell* pVwSh, const SwRect &rRect )
}
// Notify for size change
-void SizeNotify(SwViewShell* pVwSh, const Size &rSize)
+void SizeNotify(SwViewShell const * pVwSh, const Size &rSize)
{
SfxViewShell *pSfxViewShell = pVwSh->GetSfxViewShell();
@@ -69,7 +69,7 @@ void SizeNotify(SwViewShell* pVwSh, const Size &rSize)
}
// Notify for page number update
-void PageNumNotify( SwViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum,
+void PageNumNotify( SwViewShell const * pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum,
const OUString& rPgStr)
{
SfxViewShell *pSfxViewShell = pVwSh->GetSfxViewShell();
@@ -112,7 +112,7 @@ TableChgMode GetTableChgDefaultMode()
return pOpt ? pOpt->GetTableMode() : TableChgMode::VarWidthChangeAbs;
}
-void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect )
+void RepaintPagePreview( SwViewShell const * pVwSh, const SwRect& rRect )
{
SfxViewShell *pSfxViewShell = pVwSh->GetSfxViewShell();
@@ -120,7 +120,7 @@ void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect )
pSwPagePreview->RepaintCoreRect(rRect);
}
-bool JumpToSwMark( SwViewShell* pVwSh, const OUString& rMark )
+bool JumpToSwMark( SwViewShell const * pVwSh, const OUString& rMark )
{
SfxViewShell *pSfxViewShell = pVwSh->GetSfxViewShell();
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 8681e20f33d2..ae242fd7586e 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -59,7 +59,7 @@ SwReadOnlyPopup::~SwReadOnlyPopup()
xMenu.disposeAndClear();
}
-void SwReadOnlyPopup::Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher &rDis )
+void SwReadOnlyPopup::Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher const &rDis )
{
std::unique_ptr<SfxPoolItem> _pItem;
SfxItemState eState = rDis.GetBindings()->QueryState( nSID, _pItem );
diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx
index 946095dbb8a1..e074d41650b1 100644
--- a/sw/source/uibase/docvw/romenu.hxx
+++ b/sw/source/uibase/docvw/romenu.hxx
@@ -70,7 +70,7 @@ class SwReadOnlyPopup
ImageMap* pImageMap;
INetImage* pTargetURL;
- void Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher &rDis );
+ void Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher const &rDis );
OUString SaveGraphic( sal_uInt16 nId );
public:
diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx
index 69cd8881875f..5167b290d8c4 100644
--- a/sw/source/uibase/envelp/labelcfg.cxx
+++ b/sw/source/uibase/envelp/labelcfg.cxx
@@ -214,7 +214,7 @@ static std::unique_ptr<SwLabRec> lcl_CreateSwLabRec(const OUString& rType, const
}
static Sequence<PropertyValue> lcl_CreateProperties(
- Sequence<OUString>& rPropNames, OUString& rMeasure, const SwLabRec& rRec)
+ Sequence<OUString> const & rPropNames, OUString& rMeasure, const SwLabRec& rRec)
{
const OUString* pNames = rPropNames.getConstArray();
Sequence<PropertyValue> aRet(rPropNames.getLength());
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 86ce46c903ce..ab5c79b6aa9d 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -879,7 +879,7 @@ bool SwFieldMgr::GoNextPrev( bool bNext, SwFieldType* pTyp )
}
// insert field types
-void SwFieldMgr::InsertFieldType(SwFieldType& rType)
+void SwFieldMgr::InsertFieldType(SwFieldType const & rType)
{
SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell();
OSL_ENSURE(pSh, "no SwWrtShell found");
diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx
index 04bb8407a511..7056be521576 100644
--- a/sw/source/uibase/inc/basesh.hxx
+++ b/sw/source/uibase/inc/basesh.hxx
@@ -104,7 +104,7 @@ public:
static void StateDisableItems(SfxItemSet &);
- void EditRegionDialog(SfxRequest& rReq);
+ void EditRegionDialog(SfxRequest const & rReq);
void InsertRegionDialog(SfxRequest& rReq);
void ExecField(SfxRequest& rReq);
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 8124664f46c2..28227bfb2bf0 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -206,7 +206,7 @@ protected:
virtual OUString GetSurroundingText() const override;
virtual Selection GetSurroundingTextSelection() const override;
- void ShowAutoTextCorrectQuickHelp( const OUString& rWord, SvxAutoCorrCfg* pACfg,
+ void ShowAutoTextCorrectQuickHelp( const OUString& rWord, SvxAutoCorrCfg const * pACfg,
SvxAutoCorrect* pACorr, bool bFromIME = false );
/// Returns true if in header/footer area, or in the header/footer control.
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index dab4ad58fd35..029dca1559fe 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -134,7 +134,7 @@ public:
// determine a field
SwField* GetCurField();
- void InsertFieldType(SwFieldType& rType);
+ void InsertFieldType(SwFieldType const & rType);
bool ChooseMacro();
void SetMacroPath(const OUString& rPath);
diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx
index e12638fa6575..c614344abcc5 100644
--- a/sw/source/uibase/inc/hyp.hxx
+++ b/sw/source/uibase/inc/hyp.hxx
@@ -45,7 +45,7 @@ protected:
public:
SwHyphWrapper( SwView* pVw,
- css::uno::Reference< css::linguistic2::XHyphenator > &rxHyph,
+ css::uno::Reference< css::linguistic2::XHyphenator > const &rxHyph,
bool bStart, bool bOther, bool bSelect );
virtual ~SwHyphWrapper() override;
};
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index 0f5a36fb2e63..616e02fe4909 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -45,7 +45,7 @@ namespace SwMailMergeHelper
SW_DLLPUBLIC OUString CallSaveAsDialog(OUString& rFilter);
SW_DLLPUBLIC bool CheckMailAddress(const OUString& rMailAddress);
SW_DLLPUBLIC css::uno::Reference<css::mail::XSmtpService> ConnectToSmtpServer(
- SwMailMergeConfigItem& rConfigItem,
+ SwMailMergeConfigItem const & rConfigItem,
css::uno::Reference<css::mail::XMailService>& xInMailService,
const OUString& rInMailServerPassword,
const OUString& rOutMailServerPassword,
@@ -105,7 +105,7 @@ public:
void EnableScrollBar();
// fill the actual data into a string (address block or greeting)
- static OUString FillData(const OUString& rAddress, SwMailMergeConfigItem& rConfigItem,
+ static OUString FillData(const OUString& rAddress, SwMailMergeConfigItem const & rConfigItem,
const css::uno::Sequence<OUString>* pAssignments = nullptr);
void SetSelectHdl (const Link<LinkParamNone*,void>& rLink) { m_aSelectHdl = rLink; }
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index 0e86af95eed2..a885a5844530 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -96,7 +96,7 @@ public:
void DisposeResultSet();
OUString& GetFilter() const;
- void SetFilter(OUString&);
+ void SetFilter(OUString const &);
void SetCurrentDBData( const SwDBData& rDBData);
const SwDBData& GetCurrentDBData() const;
@@ -228,7 +228,7 @@ public:
bool IsMailAvailable() const;
// notify a completed merge, provid the appropriate e-Mail address if available
- void AddMergedDocument(SwDocMergeInfo& rInfo);
+ void AddMergedDocument(SwDocMergeInfo const & rInfo);
//returns the page and database cursor information of each merged document
SwDocMergeInfo& GetDocumentMergeInfo(sal_uInt32 nDocument);
sal_uInt32 GetMergedDocumentCount();
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index 08104b33f0dd..e08b39f69b5c 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -147,7 +147,7 @@ public:
virtual void Activate() override;
virtual void FillInfo(SfxChildWinInfo&) const override;
- void Initialize (SfxChildWinInfo* pInfo);
+ void Initialize (SfxChildWinInfo const * pInfo);
};
class SwRedlineAcceptChild : public SwChildWinWrapper
diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx
index 8947ec8a7c12..9e100d0c155b 100644
--- a/sw/source/uibase/lingu/hyp.cxx
+++ b/sw/source/uibase/lingu/hyp.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star;
// interactive separation
SwHyphWrapper::SwHyphWrapper( SwView* pVw,
- uno::Reference< linguistic2::XHyphenator > &rxHyph,
+ uno::Reference< linguistic2::XHyphenator > const &rxHyph,
bool bStart, bool bOther, bool bSelect ) :
SvxSpellWrapper( &pVw->GetEditWin(), rxHyph, bStart, bOther ),
pView( pVw ),
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 0638544102c5..f3406795c179 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -119,7 +119,7 @@ void SwModelessRedlineAcceptDlg::Activate()
pImplDlg->Activate();
}
-void SwModelessRedlineAcceptDlg::Initialize(SfxChildWinInfo *pInfo)
+void SwModelessRedlineAcceptDlg::Initialize(SfxChildWinInfo const *pInfo)
{
if (pInfo != nullptr)
pImplDlg->Initialize(pInfo->aExtraString);
More information about the Libreoffice-commits
mailing list