[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Jan 24 09:16:32 UTC 2019
sw/inc/dbmgr.hxx | 4 ++--
sw/inc/textboxhelper.hxx | 2 +-
sw/qa/extras/inc/swmodeltestbase.hxx | 2 +-
sw/source/core/access/acchyperlink.cxx | 2 +-
sw/source/core/access/acchyperlink.hxx | 4 ++--
sw/source/core/doc/docftn.cxx | 2 +-
sw/source/core/doc/tblrwcl.cxx | 8 ++++----
sw/source/core/doc/textboxhelper.cxx | 4 ++--
sw/source/core/inc/frmtool.hxx | 4 ++--
sw/source/core/inc/txtfrm.hxx | 2 +-
sw/source/core/layout/frmtool.cxx | 6 +++---
sw/source/core/txtnode/fntcache.cxx | 2 +-
sw/source/core/txtnode/ndtxt.cxx | 2 +-
sw/source/filter/html/htmlgrin.cxx | 2 +-
sw/source/filter/html/htmlreqifreader.cxx | 2 +-
sw/source/filter/inc/msfilter.hxx | 2 +-
sw/source/filter/ww8/wrtw8sty.cxx | 2 +-
sw/source/filter/ww8/wrtww8.hxx | 2 +-
sw/source/filter/ww8/ww8par3.cxx | 2 +-
sw/source/filter/ww8/ww8scan.cxx | 4 ++--
sw/source/filter/ww8/ww8scan.hxx | 6 +++---
sw/source/ui/index/cnttab.cxx | 2 +-
sw/source/uibase/dbui/dbmgr.cxx | 6 +++---
sw/source/uibase/dialog/regionsw.cxx | 2 +-
sw/source/uibase/docvw/PostItMgr.cxx | 2 +-
sw/source/uibase/inc/envlop.hxx | 2 +-
sw/source/uibase/inc/labimp.hxx | 2 +-
sw/source/uibase/inc/swuicnttab.hxx | 2 +-
sw/source/uibase/inc/wrtsh.hxx | 2 +-
29 files changed, 43 insertions(+), 43 deletions(-)
New commits:
commit 7075ce2fee860daa6affde92b256838aaa3d7d87
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jan 24 09:29:36 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jan 24 10:16:02 2019 +0100
loplugin:constparams in sw
Change-Id: I4a0f51eae28c82eca3c44b9d06c0410f9645f62f
Reviewed-on: https://gerrit.libreoffice.org/66833
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 6dc8f36c0155..c2cba6a57705 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -387,7 +387,7 @@ public:
static css::uno::Reference< css::sdbc::XConnection>
GetConnection(const OUString& rDataSource,
css::uno::Reference< css::sdbc::XDataSource>& rxSource,
- SwView* pView);
+ const SwView* pView);
static css::uno::Reference< css::sdbcx::XColumnsSupplier>
GetColumnSupplier(css::uno::Reference< css::sdbc::XConnection> const & xConnection,
@@ -449,7 +449,7 @@ public:
const OUString& _sCommand,
sal_Int32 _nCommandType,
const css::uno::Reference< css::sdbc::XConnection>& _xConnection,
- SwView* pView);
+ const SwView* pView);
void setEmbeddedName(const OUString& rEmbeddedName, SwDocShell& rDocShell);
const OUString& getEmbeddedName() const;
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index 547141a933ca..db565c2e8915 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -63,7 +63,7 @@ public:
/// Destroy a TextBox for a shape.
static void destroy(SwFrameFormat* pShape);
/// Get interface of a shape's TextBox, if there is any.
- static css::uno::Any queryInterface(SwFrameFormat* pShape, const css::uno::Type& rType);
+ static css::uno::Any queryInterface(const SwFrameFormat* pShape, const css::uno::Type& rType);
/// Sync property of TextBox with the one of the shape.
static void syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID,
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index bbe675e23bbe..b9b6632cea12 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -350,7 +350,7 @@ protected:
}
protected:
- void dumpLayout(uno::Reference< lang::XComponent > & rComponent)
+ void dumpLayout(const uno::Reference< lang::XComponent > & rComponent)
{
// create the xml writer
mpXmlBuffer = xmlBufferCreate();
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index eb98a9f8752a..6861423c5e37 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::com::sun::star::lang::IndexOutOfBoundsException;
-SwAccessibleHyperlink::SwAccessibleHyperlink(SwTextAttr & rTextAttr,
+SwAccessibleHyperlink::SwAccessibleHyperlink(const SwTextAttr & rTextAttr,
SwAccessibleParagraph & rAccPara,
sal_Int32 const nStt, sal_Int32 const nEnd)
: m_pHyperlink(const_cast<SwFormatINetFormat*>(&rTextAttr.GetINetFormat()))
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index 0fec0f8fe229..cc2497c621a0 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -41,9 +41,9 @@ class SwAccessibleHyperlink
sal_Int32 const m_nStartIndex;
sal_Int32 const m_nEndIndex;
- SwAccessibleHyperlink(SwTextAttr &,
+ SwAccessibleHyperlink(const SwTextAttr &,
SwAccessibleParagraph &,
- sal_Int32 nStt, sal_Int32 nEnd );
+ sal_Int32 nStt, sal_Int32 nEnd );
virtual ~SwAccessibleHyperlink() override;
const SwFormatINetFormat* GetTextAttr() const;
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index 3b8948ceb6ef..647b4a3d2884 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -154,7 +154,7 @@ SwCharFormat* SwEndNoteInfo::GetCharFormat(SwDoc& rDoc) const
namespace
{
- void lcl_ResetPoolIdForDocAndSync(const sal_uInt16 nId, SwCharFormat* pFormat, SwEndNoteInfo& rInfo)
+ void lcl_ResetPoolIdForDocAndSync(const sal_uInt16 nId, SwCharFormat* pFormat, const SwEndNoteInfo& rInfo)
{
auto pDoc = pFormat->GetDoc();
if(!pDoc)
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 0092e585359d..cb367c67a04b 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -188,9 +188,9 @@ struct CR_SetLineHeight
{}
};
-static bool lcl_SetSelLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
+static bool lcl_SetSelLineHeight( SwTableLine* pLine, const CR_SetLineHeight& rParam,
SwTwips nDist, bool bCheck );
-static bool lcl_SetOtherLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
+static bool lcl_SetOtherLineHeight( SwTableLine* pLine, const CR_SetLineHeight& rParam,
SwTwips nDist, bool bCheck );
typedef bool (*FN_lcl_SetLineHeight)(SwTableLine*, CR_SetLineHeight&, SwTwips, bool );
@@ -2912,7 +2912,7 @@ static void SetLineHeight( SwTableLine& rLine, SwTwips nOldHeight, SwTwips nNewH
}
}
-static bool lcl_SetSelLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
+static bool lcl_SetSelLineHeight( SwTableLine* pLine, const CR_SetLineHeight& rParam,
SwTwips nDist, bool bCheck )
{
bool bRet = true;
@@ -2934,7 +2934,7 @@ static bool lcl_SetSelLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
return bRet;
}
-static bool lcl_SetOtherLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
+static bool lcl_SetOtherLineHeight( SwTableLine* pLine, const CR_SetLineHeight& rParam,
SwTwips nDist, bool bCheck )
{
bool bRet = true;
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index 59d8eb315c7e..007a568ae7eb 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -259,7 +259,7 @@ SwFrameFormat* SwTextBoxHelper::getOtherTextBoxFormat(uno::Reference<drawing::XS
return getOtherTextBoxFormat(pFormat, RES_DRAWFRMFMT);
}
-template <typename T> static void lcl_queryInterface(SwFrameFormat* pShape, uno::Any& rAny)
+template <typename T> static void lcl_queryInterface(const SwFrameFormat* pShape, uno::Any& rAny)
{
if (SwFrameFormat* pFormat = SwTextBoxHelper::getOtherTextBoxFormat(pShape, RES_DRAWFRMFMT))
{
@@ -269,7 +269,7 @@ template <typename T> static void lcl_queryInterface(SwFrameFormat* pShape, uno:
}
}
-uno::Any SwTextBoxHelper::queryInterface(SwFrameFormat* pShape, const uno::Type& rType)
+uno::Any SwTextBoxHelper::queryInterface(const SwFrameFormat* pShape, const uno::Type& rType)
{
uno::Any aRet;
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 3496b6d5eb59..bb006d56520e 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -59,11 +59,11 @@ void AppendObjs( const SwFrameFormats *pTable, sal_uLong nIndex,
void AppendObjsOfNode(SwFrameFormats const* pTable, sal_uLong nIndex,
SwFrame * pFrame, SwPageFrame * pPage, SwDoc * pDoc,
- std::vector<sw::Extent>::const_iterator * pIter,
+ std::vector<sw::Extent>::const_iterator const* pIter,
std::vector<sw::Extent>::const_iterator const* pEnd);
void RemoveHiddenObjsOfNode(SwTextNode const& rNode,
- std::vector<sw::Extent>::const_iterator * pIter,
+ std::vector<sw::Extent>::const_iterator const* pIter,
std::vector<sw::Extent>::const_iterator const* pEnd);
bool IsAnchoredObjShown(SwTextFrame const& rFrame, SwFormatAnchor const& rAnchor);
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index a998a312745a..7700dae25e65 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -122,7 +122,7 @@ TextFrameIndex UpdateMergedParaForDelete(MergedPara & rMerged,
void MoveMergedFlysAndFootnotes(std::vector<SwTextFrame*> const& rFrames,
SwTextNode const& rFirstNode, SwTextNode & rSecondNode, bool);
-void MoveDeletedPrevFrames(SwTextNode & rDeletedPrev, SwTextNode & rNode);
+void MoveDeletedPrevFrames(const SwTextNode & rDeletedPrev, SwTextNode & rNode);
enum class Recreate { No, ThisNode, Predecessor };
void CheckResetRedlineMergeFlag(SwTextNode & rNode, Recreate eRecreateMerged);
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 29554a5a6607..b4d0948590b0 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1037,7 +1037,7 @@ void AppendObj(SwFrame *const pFrame, SwPageFrame *const pPage, SwFrameFormat *c
static bool IsShown(sal_uLong const nIndex,
const SwFormatAnchor & rAnch,
- std::vector<sw::Extent>::const_iterator *const pIter,
+ std::vector<sw::Extent>::const_iterator const*const pIter,
std::vector<sw::Extent>::const_iterator const*const pEnd)
{
assert(!pIter || *pIter == *pEnd || (*pIter)->pNode->GetIndex() == nIndex);
@@ -1081,7 +1081,7 @@ static bool IsShown(sal_uLong const nIndex,
}
void RemoveHiddenObjsOfNode(SwTextNode const& rNode,
- std::vector<sw::Extent>::const_iterator *const pIter,
+ std::vector<sw::Extent>::const_iterator const*const pIter,
std::vector<sw::Extent>::const_iterator const*const pEnd)
{
std::vector<SwFrameFormat*> const*const pFlys(rNode.GetAnchoredFlys());
@@ -1107,7 +1107,7 @@ void RemoveHiddenObjsOfNode(SwTextNode const& rNode,
void AppendObjsOfNode(SwFrameFormats const*const pTable, sal_uLong const nIndex,
SwFrame *const pFrame, SwPageFrame *const pPage, SwDoc *const pDoc,
- std::vector<sw::Extent>::const_iterator *const pIter,
+ std::vector<sw::Extent>::const_iterator const*const pIter,
std::vector<sw::Extent>::const_iterator const*const pEnd)
{
#if OSL_DEBUG_LEVEL > 0
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index ee6735ec3244..953d47106094 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -101,7 +101,7 @@ long EvalGridWidthAdd( const SwTextGridItem *const pGrid, const SwDrawTextInfo &
* Pre-calculates glyph items for the rendered subset of rKey's text, assuming
* outdev state does not change between the outdev calls.
*/
-SalLayoutGlyphs* lcl_CreateLayout(SwTextGlyphsKey& rKey, SalLayoutGlyphs& rTextGlyphs)
+SalLayoutGlyphs* lcl_CreateLayout(const SwTextGlyphsKey& rKey, SalLayoutGlyphs& rTextGlyphs)
{
// Use pre-calculated result.
if (rTextGlyphs.IsValid())
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 7a2a4cdf0ee1..f02c2a636546 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -838,7 +838,7 @@ namespace sw {
/// if first node is deleted & second survives, then the first node's frame
/// will be deleted too; prevent this by moving the frame to the second node
/// if necessary.
-void MoveDeletedPrevFrames(SwTextNode & rDeletedPrev, SwTextNode & rNode)
+void MoveDeletedPrevFrames(const SwTextNode & rDeletedPrev, SwTextNode & rNode)
{
std::vector<SwTextFrame*> frames;
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aIter(rDeletedPrev);
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index ba1d99f99456..7eb09296a6dd 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -303,7 +303,7 @@ void SwHTMLParser::GetDefaultScriptType( ScriptType& rType,
namespace
{
- bool allowAccessLink(SwDoc& rDoc)
+ bool allowAccessLink(const SwDoc& rDoc)
{
OUString sReferer;
SfxObjectShell * sh = rDoc.GetPersist();
diff --git a/sw/source/filter/html/htmlreqifreader.cxx b/sw/source/filter/html/htmlreqifreader.cxx
index 1b602475920d..f065528da3a5 100644
--- a/sw/source/filter/html/htmlreqifreader.cxx
+++ b/sw/source/filter/html/htmlreqifreader.cxx
@@ -216,7 +216,7 @@ OString InsertOLE1Header(SvStream& rOle2, SvStream& rOle1, sal_uInt32& nWidth, s
}
/// Writes rGraphic with size from rOLENode to rRtf as an RTF hexdump.
-void WrapOleGraphicInRtf(SvStream& rRtf, SwOLENode& rOLENode, const Graphic& rGraphic)
+void WrapOleGraphicInRtf(SvStream& rRtf, const SwOLENode& rOLENode, const Graphic& rGraphic)
{
// Start result.
rRtf.WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_RESULT);
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 8a79ae919c3f..82cae2073536 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -326,7 +326,7 @@ namespace sw
const SwPosition &mrPos;
public:
explicit SetEndIfOpen(const SwPosition &rPos) : mrPos(rPos) {}
- void operator()(std::unique_ptr<SwFltStackEntry> & pEntry) const
+ void operator()(const std::unique_ptr<SwFltStackEntry> & pEntry) const
{
if (pEntry->bOpen)
pEntry->SetEndPos(mrPos);
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index af39bf4ef063..b3b2edb700fa 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1246,7 +1246,7 @@ bool WW8_SepInfo::IsProtected() const
return bRet;
}
-void MSWordSections::CheckForFacinPg( WW8Export& rWrt ) const
+void MSWordSections::CheckForFacinPg( const WW8Export& rWrt ) const
{
// 2 values getting set
// Dop.fFacingPages == Header and Footer different
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 9ad0d0bfb1c5..9102b6ab7627 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -200,7 +200,7 @@ protected:
bool mbDocumentIsProtected;
std::vector<WW8_SepInfo> aSects;
- void CheckForFacinPg( WW8Export& rWrt ) const;
+ void CheckForFacinPg( const WW8Export& rWrt ) const;
void NeedsDocumentProtected(const WW8_SepInfo &rInfo);
//No copy, no assign
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 9777bba56ff1..38a349fb5dc2 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -401,7 +401,7 @@ struct WW8LSTInfo // sorted by nIdLst (in WW8 used list-Id)
bool bUsedInDoc :1;// Flag, if this NumRule is used in the Doc,
// or is supposed to be deleted on Reader-End
- WW8LSTInfo(SwNumRule* pNumRule_, WW8LST& aLST)
+ WW8LSTInfo(SwNumRule* pNumRule_, const WW8LST& aLST)
: pNumRule(pNumRule_), nIdLst(aLST.nIdLst),
bSimpleList(aLST.bSimpleList), bUsedInDoc(false)
{
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 976fe8971f27..11fbf877612e 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -918,7 +918,7 @@ void WW8SprmIter::UpdateMyMembers()
}
}
-SprmResult WW8SprmIter::FindSprm(sal_uInt16 nId, sal_uInt8* pNextByteMatch)
+SprmResult WW8SprmIter::FindSprm(sal_uInt16 nId, const sal_uInt8* pNextByteMatch)
{
while (GetSprms())
{
@@ -4884,7 +4884,7 @@ sal_uInt16 WW8PLCFMan::GetId(const WW8PLCFxDesc* p) const
return nId;
}
-WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp,
+WW8PLCFMan::WW8PLCFMan(const WW8ScannerBase* pBase, ManTypes nType, long nStartCp,
bool bDoingDrawTextBox)
: maSprmParser(*pBase->m_pWw8Fib),
mbDoingDrawTextBox(bDoingDrawTextBox)
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 5aa3dc596798..a6fa398d9076 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -282,7 +282,7 @@ public:
explicit WW8SprmIter(const sal_uInt8* pSprms_, sal_Int32 nLen_,
const wwSprmParser &rSprmParser);
void SetSprms(const sal_uInt8* pSprms_, sal_Int32 nLen_);
- SprmResult FindSprm(sal_uInt16 nId, sal_uInt8* pNextByteMatch = nullptr);
+ SprmResult FindSprm(sal_uInt16 nId, const sal_uInt8* pNextByteMatch = nullptr);
void advance();
const sal_uInt8* GetSprms() const
{ return ( pSprms && (0 < nRemLen) ) ? pSprms : nullptr; }
@@ -968,7 +968,7 @@ private:
sal_uInt16 GetId(const WW8PLCFxDesc* p ) const;
public:
- WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp,
+ WW8PLCFMan(const WW8ScannerBase* pBase, ManTypes nType, long nStartCp,
bool bDoingDrawTextBox = false);
~WW8PLCFMan();
@@ -1033,7 +1033,7 @@ friend WW8PLCFx_PCDAttrs::WW8PLCFx_PCDAttrs(const WW8Fib& rFib,
friend WW8PLCFx_Cp_FKP::WW8PLCFx_Cp_FKP( SvStream*, SvStream*, SvStream*,
const WW8ScannerBase&, ePLCFT );
-friend WW8PLCFMan::WW8PLCFMan(WW8ScannerBase*, ManTypes, long, bool);
+friend WW8PLCFMan::WW8PLCFMan(const WW8ScannerBase*, ManTypes, long, bool);
friend class SwWW8FltControlStack;
private:
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index da6ff83f6e6e..a521961dc243 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3010,7 +3010,7 @@ void SwTokenWindow::InsertAtSelection(const SwFormToken& rToken)
AdjustPositions();
}
-void SwTokenWindow::RemoveControl(SwTOXButton* pDel, bool bInternalCall)
+void SwTokenWindow::RemoveControl(const SwTOXButton* pDel, bool bInternalCall)
{
if (bInternalCall && TOX_AUTHORITIES == m_pForm->GetTOXType())
m_pParent->PreTokenButtonRemoved(pDel->GetFormToken());
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 7162c70b0b45..5137003c9da7 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1946,7 +1946,7 @@ sal_Int32 SwDBManager::GetColumnType( const OUString& rDBName,
}
uno::Reference< sdbc::XConnection> SwDBManager::GetConnection(const OUString& rDataSource,
- uno::Reference<sdbc::XDataSource>& rxSource, SwView *pView)
+ uno::Reference<sdbc::XDataSource>& rxSource, const SwView *pView)
{
uno::Reference< sdbc::XConnection> xConnection;
uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
@@ -2970,7 +2970,7 @@ namespace
{
// tdf#117824 switch the embedded database away from using its current storage and point it to temporary storage
// which allows the original storage to be deleted
- void switchEmbeddedDatabaseStorage(uno::Reference<sdb::XDatabaseContext>& rDatabaseContext, const OUString& rName)
+ void switchEmbeddedDatabaseStorage(const uno::Reference<sdb::XDatabaseContext>& rDatabaseContext, const OUString& rName)
{
uno::Reference<sdb::XDocumentDataSource> xDS(rDatabaseContext->getByName(rName), uno::UNO_QUERY);
if (!xDS)
@@ -3201,7 +3201,7 @@ uno::Reference<sdbc::XResultSet> SwDBManager::createCursor(const OUString& _sDat
const OUString& _sCommand,
sal_Int32 _nCommandType,
const uno::Reference<sdbc::XConnection>& _xConnection,
- SwView* pView)
+ const SwView* pView)
{
uno::Reference<sdbc::XResultSet> xResultSet;
try
diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx
index 56c2db1e9f5f..28f0ede5b7f5 100644
--- a/sw/source/uibase/dialog/regionsw.cxx
+++ b/sw/source/uibase/dialog/regionsw.cxx
@@ -169,7 +169,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
}
}
-void SwWrtShell::StartInsertRegionDialog(SwSectionData& rSectionData)
+void SwWrtShell::StartInsertRegionDialog(const SwSectionData& rSectionData)
{
SfxItemSet aSet(
GetView().GetPool(),
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 19bdcd385679..ce9a65ad8eda 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -1388,7 +1388,7 @@ private:
public:
IsFieldNotDeleted(IDocumentRedlineAccess const& rIDRA,
- FilterFunctor & rNext)
+ const FilterFunctor & rNext)
: m_rIDRA(rIDRA)
, m_rNext(rNext)
{
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index 30f9fc221f21..630f79b862b3 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -28,7 +28,7 @@
#define GetFieldVal(rField) (rField).Denormalize((rField).GetValue(FieldUnit::TWIP))
#define SetFieldVal(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FieldUnit::TWIP)
-inline int getfieldval(weld::MetricSpinButton& rField)
+inline int getfieldval(const weld::MetricSpinButton& rField)
{
return rField.denormalize(rField.get_value(FieldUnit::TWIP));
}
diff --git a/sw/source/uibase/inc/labimp.hxx b/sw/source/uibase/inc/labimp.hxx
index 273f9c992ed5..2b3f7b73f9d3 100644
--- a/sw/source/uibase/inc/labimp.hxx
+++ b/sw/source/uibase/inc/labimp.hxx
@@ -26,7 +26,7 @@
#define GETFLDVAL(rField) (rField).Denormalize((rField).GetValue(FieldUnit::TWIP))
#define SETFLDVAL(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FieldUnit::TWIP)
-inline int getfldval(weld::MetricSpinButton& rField)
+inline int getfldval(const weld::MetricSpinButton& rField)
{
return rField.denormalize(rField.get_value(FieldUnit::TWIP));
}
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 902a8fbdc511..6072df352f6d 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -305,7 +305,7 @@ public:
SwTOXWidget* GetActiveControl() { return m_pActiveCtrl; }
void InsertAtSelection(const SwFormToken& aToken);
- void RemoveControl(SwTOXButton* pDel, bool bInternalCall = false);
+ void RemoveControl(const SwTOXButton* pDel, bool bInternalCall = false);
bool Contains(FormTokenType) const;
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index a3e82df5fa34..e99c89542482 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -448,7 +448,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
void AutoUpdatePara(SwTextFormatColl* pColl, const SfxItemSet& rStyleSet, SwPaM* pPaM = nullptr );
// starts dialog for inserting ranges via Drag&Drop/Clipboard
- void StartInsertRegionDialog(SwSectionData&);
+ void StartInsertRegionDialog(const SwSectionData&);
// ctor, the first one is a kind of a controlled copy ctor for more views of a document
SwWrtShell( SwWrtShell&, vcl::Window *pWin, SwView &rShell);
More information about the Libreoffice-commits
mailing list