diff options
author | Noel <noelgrandin@gmail.com> | 2020-10-06 15:32:05 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-06 18:36:28 +0200 |
commit | 9bf762769826a872e196051a9ec0540a598973de (patch) | |
tree | 95021dd9a95eb9099127fb5d77558d9776303e5d | |
parent | 2ac309188820036b1b99f983e8b793445e9b2ab2 (diff) |
loplugin:const* make some params and methods const
Change-Id: I3c8ca72b2b41a4f82ee20cbe025b41425f32e715
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104028
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
28 files changed, 34 insertions, 33 deletions
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 3be381bf3a7c..e55cda17c41c 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -150,12 +150,12 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public vcl::Window bool IsFollow() const { return mbIsFollow; } void SetFollow( bool bIsFollow) { mbIsFollow = bIsFollow; }; - sal_Int32 GetMetaHeight(); + sal_Int32 GetMetaHeight() const; sal_Int32 GetMinimumSizeWithMeta() const; sal_Int32 GetMinimumSizeWithoutMeta() const; sal_Int32 GetMetaButtonAreaWidth() const; sal_Int32 GetScrollbarWidth() const; - sal_Int32 GetNumFields(); + sal_Int32 GetNumFields() const; void SetSpellChecking(); diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 6d2d785dc655..115a08a4b17b 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1146,7 +1146,7 @@ public: bool NumOrNoNum( const SwNodeIndex& rIdx, bool bDel = false); - void StopNumRuleAnimations( OutputDevice* ); + void StopNumRuleAnimations( const OutputDevice* ); /** Insert new table at position @param rPos (will be inserted before Node!). For AutoFormat at input: columns have to be set at predefined width. diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 570597a7e580..0639833d0b1e 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -646,7 +646,7 @@ public: SwTable::SearchType GetTableInsertMode() const { return m_eTableInsertMode; } void SetTableInsertMode( SwTable::SearchType eFlag ) { m_eTableInsertMode = eFlag; } - bool GetTableCopied() { return m_bTableCopied; } + bool GetTableCopied() const { return m_bTableCopied; } void SetTableCopied( bool bCopied ) { m_bTableCopied = bCopied; } bool DeleteTableSel(); ///< Current selection, may be whole table. diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 24c5c9ae3093..68cd955f97c0 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -276,7 +276,7 @@ public: SwFormatField* FindFormatForField(const SwField*) const; SwFormatField* FindFormatForPostItId(sal_uInt32 nPostItId) const; void CollectPostIts(std::vector<SwFormatField*>& rvFormatFields, IDocumentRedlineAccess const& rIDRA, bool HideRedlines); - bool HasHiddenInformationNotes(); + bool HasHiddenInformationNotes() const; void GatherNodeIndex(std::vector<sal_uLong>& rvNodeIndex); void GatherRefFields(std::vector<SwGetRefField*>& rvRFields, const sal_uInt16 nTyp); void GatherFields(std::vector<SwFormatField*>& rvFormatFields, bool bCollectOnlyInDocNodes=true) const; diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index a5fd33f51fe5..ee53db6a7c3c 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -84,7 +84,7 @@ public: /// wrappers for non-const calls at GraphicObject void StartGraphicAnimation(OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData, OutputDevice* pFirstFrameOutDev) { maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, pFirstFrameOutDev); } - void StopGraphicAnimation(OutputDevice* pOut, long nExtraData) { maGrfObj.StopAnimation(pOut, nExtraData); } + void StopGraphicAnimation(const OutputDevice* pOut, long nExtraData) { maGrfObj.StopAnimation(pOut, nExtraData); } virtual Size GetTwipSize() const override; void SetTwipSize( const Size& rSz ); diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 84f2bfba5426..538f1609836a 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -303,7 +303,7 @@ namespace numfunc * or not. This is typically true, unless the numbering levels are invisible and have no * indents. */ - bool NumDownChangesIndent(SwWrtShell& rShell); + bool NumDownChangesIndent(const SwWrtShell& rShell); SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode(); } diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 19a38e083d95..46529ceb7394 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -131,7 +131,7 @@ public: void ResetASCIIOpts() { m_aASCIIOpts.Reset(); } css::uno::Reference<css::io::XInputStream>& GetInputStream() { return m_xInputStream; } - void SetInputStream(css::uno::Reference<css::io::XInputStream>& xInputStream) + void SetInputStream(const css::uno::Reference<css::io::XInputStream>& xInputStream) { m_xInputStream = xInputStream; } diff --git a/sw/source/core/access/AccessibilityCheck.cxx b/sw/source/core/access/AccessibilityCheck.cxx index 15360dd9b82b..e3699d9038b0 100644 --- a/sw/source/core/access/AccessibilityCheck.cxx +++ b/sw/source/core/access/AccessibilityCheck.cxx @@ -339,7 +339,8 @@ class TextContrastCheck : public NodeCheck { private: void checkTextRange(uno::Reference<text::XTextRange> const& xTextRange, - uno::Reference<text::XTextContent> const& xParagraph, SwTextNode* pTextNode) + uno::Reference<text::XTextContent> const& xParagraph, + const SwTextNode* pTextNode) { sal_Int32 nParaBackColor(COL_AUTO); uno::Reference<beans::XPropertySet> xParagraphProperties(xParagraph, uno::UNO_QUERY); diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 0e32692173c8..2511b45bb963 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -1143,7 +1143,7 @@ bool SwDoc::RenameNumRule(const OUString & rOldName, const OUString & rNewName, return bResult; } -void SwDoc::StopNumRuleAnimations( OutputDevice* pOut ) +void SwDoc::StopNumRuleAnimations( const OutputDevice* pOut ) { for( sal_uInt16 n = GetNumRuleTable().size(); n; ) { diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index dd6058d6622c..e61cdf0b6acd 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -1529,7 +1529,7 @@ bool SwNoTextFrame::IsTransparent() const return false; } -void SwNoTextFrame::StopAnimation( OutputDevice* pOut ) const +void SwNoTextFrame::StopAnimation( const OutputDevice* pOut ) const { // Stop animated graphics const SwGrfNode* pGrfNd = GetNode()->GetGrfNode(); diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 5430df621177..f652861d9a6f 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1439,7 +1439,7 @@ namespace numfunc return SwNumberingUIBehaviorConfig::getInstance().ChangeIndentOnTabAtFirstPosOfFirstListItem(); } - bool NumDownChangesIndent(SwWrtShell& rShell) + bool NumDownChangesIndent(const SwWrtShell& rShell) { SwPaM* pCursor = rShell.GetCursor(); if (!pCursor) diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index b932744fb588..ce63d378f3fd 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -173,7 +173,7 @@ void SwFieldType::CollectPostIts(std::vector<SwFormatField*>& rvFormatFields, ID CallSwClientNotify(sw::CollectPostItsHint(rvFormatFields, rIDRA, bHideRedlines)); } -bool SwFieldType::HasHiddenInformationNotes() +bool SwFieldType::HasHiddenInformationNotes() const { bool bHasHiddenInformationNotes = false; CallSwClientNotify(sw::HasHiddenInformationNotesHint(bHasHiddenInformationNotes)); diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx index c958da594e27..d36f359eaba6 100644 --- a/sw/source/core/inc/notxtfrm.hxx +++ b/sw/source/core/inc/notxtfrm.hxx @@ -82,7 +82,7 @@ public: bool IsTransparent() const; - void StopAnimation( OutputDevice* = nullptr ) const; + void StopAnimation( const OutputDevice* = nullptr ) const; bool HasAnimation() const; // RotateFlyFrame3 - Support for Transformations diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 0f96e6676291..577fa8deea26 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -660,7 +660,7 @@ public: void RecalcAllLines(); /// Stops the animations within numberings - void StopAnimation( OutputDevice *pOut ); + void StopAnimation( const OutputDevice *pOut ); /// Visit all portions for Accessibility void VisitPortions( SwPortionHandler& rPH ) const; diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 2efac690cf89..243bc39544f5 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -265,7 +265,7 @@ bool lcl_HasPreviousParaSameNumRule(SwTextFrame const& rTextFrame, const SwTextN return bRet; } -bool lcl_TryMoveToNonHiddenField(SwEditShell& rShell, const SwTextNode& rNd, SwFormatField& rField) +bool lcl_TryMoveToNonHiddenField(SwEditShell& rShell, const SwTextNode& rNd, const SwFormatField& rField) { // 1. Check if the whole paragraph is hidden // 2. Move to the field diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index a2c1fb739255..0c77fdcd09d0 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -803,7 +803,7 @@ SwGrfNumPortion::~SwGrfNumPortion() pBrush.reset(); } -void SwGrfNumPortion::StopAnimation( OutputDevice* pOut ) +void SwGrfNumPortion::StopAnimation( const OutputDevice* pOut ) { if ( IsAnimated() ) { @@ -1034,7 +1034,7 @@ void SwGrfNumPortion::SetBase( long nLnAscent, long nLnDescent, } } -void SwTextFrame::StopAnimation( OutputDevice* pOut ) +void SwTextFrame::StopAnimation( const OutputDevice* pOut ) { OSL_ENSURE( HasAnimation(), "SwTextFrame::StopAnimation: Which Animation?" ); if( !HasPara() ) diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx index c2ba88285a23..cca2b87cf6a8 100644 --- a/sw/source/core/text/porfld.hxx +++ b/sw/source/core/text/porfld.hxx @@ -180,7 +180,7 @@ public: void SetBase( long nLnAscent, long nLnDescent, long nFlyAscent, long nFlyDescent ); - void StopAnimation( OutputDevice* pOut ); + void StopAnimation( const OutputDevice* pOut ); bool IsAnimated() const { return m_bAnimated; } void SetAnimated( bool bNew ) { m_bAnimated = bNew; } diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index 115b59dcb4ba..2d198d893d85 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -527,7 +527,7 @@ static const SwRangeRedline* lcl_GetRedlineAtNodeInsertionOrDeletion( const SwTe return nullptr; } -static void lcl_setRedlineAttr( SwTextFormatInfo &rInf, const SwTextNode& rTextNode, std::unique_ptr<SwFont>& pNumFnt ) +static void lcl_setRedlineAttr( SwTextFormatInfo &rInf, const SwTextNode& rTextNode, const std::unique_ptr<SwFont>& pNumFnt ) { if ( rInf.GetVsh()->GetLayout()->IsHideRedlines() ) return; diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index bd88e3ef843e..fecead1e542e 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -245,7 +245,7 @@ void SwHTMLParser::InsertBasicDocEvent( const OUString& aEvent, const OUString& pDocSh ); } -void SwHTMLWriter::OutBasic(SwHTMLWriter & rHTMLWrt) +void SwHTMLWriter::OutBasic(const SwHTMLWriter & rHTMLWrt) { #if !HAVE_FEATURE_SCRIPTING (void) rHTMLWrt; diff --git a/sw/source/filter/html/htmlreqifreader.cxx b/sw/source/filter/html/htmlreqifreader.cxx index 26119adfed46..2e20e84f06b8 100644 --- a/sw/source/filter/html/htmlreqifreader.cxx +++ b/sw/source/filter/html/htmlreqifreader.cxx @@ -147,7 +147,7 @@ bool ParseOLE2Presentation(SvStream& rOle2, sal_uInt32& nWidth, sal_uInt32& nHei * Inserts an OLE1 header before an OLE2 storage, assuming that the storage has an Ole10Native * stream. */ -OString InsertOLE1HeaderFromOle10NativeStream(tools::SvRef<SotStorage>& xStorage, +OString InsertOLE1HeaderFromOle10NativeStream(const tools::SvRef<SotStorage>& xStorage, SwOLENode& rOLENode, SvStream& rOle1) { tools::SvRef<SotStorageStream> xOle1Stream diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index f3d9ec706149..8227668f8dde 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -445,7 +445,7 @@ public: void OutFootEndNoteSym( const SwFormatFootnote& rFormatFootnote, const OUString& rNum, sal_uInt16 nScript ); - void OutBasic(SwHTMLWriter& rHTMLWrt); + void OutBasic(const SwHTMLWriter& rHTMLWrt); void OutAndSetDefList( sal_uInt16 nNewLvl ); diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index e36b8c598c5a..dbbaceb5e11d 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -1429,14 +1429,14 @@ sal_Int32 SwAnnotationWin::GetMetaButtonAreaWidth() const return long(METABUTTON_AREA_WIDTH * f); } -sal_Int32 SwAnnotationWin::GetMetaHeight() +sal_Int32 SwAnnotationWin::GetMetaHeight() const { const Fraction& f(mrView.GetWrtShellPtr()->GetOut()->GetMapMode().GetScaleY()); const int fields = GetNumFields(); return long(fields*POSTIT_META_FIELD_HEIGHT*f); } -sal_Int32 SwAnnotationWin::GetNumFields() +sal_Int32 SwAnnotationWin::GetNumFields() const { return IsResolved() ? 3 : 2; } diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 77ef2ef4c0c3..bf07a8de5232 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -358,7 +358,7 @@ public: return *m_xTreeView; } - void MoveSelectionTo(weld::TreeIter* pDropTarget); + void MoveSelectionTo(const weld::TreeIter* pDropTarget); void TbxMenuHdl(const OString& rCommand, weld::Menu& rMenu); void InsertRegion( const SwGlblDocContent* pCont, diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 3b7539248444..9406b75803fd 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -290,7 +290,7 @@ public: /// Allows starting or ending a graphic move or resize action. void SetGraphicTwipPosition(bool bStart, const Point& rPosition); - const SwFrame* GetSavedOutlineFrame() { return m_pSavedOutlineFrame; } + const SwFrame* GetSavedOutlineFrame() const { return m_pSavedOutlineFrame; } void SetSavedOutlineFrame(SwFrame* pFrame) { m_pSavedOutlineFrame = pFrame; } void SetOutlineContentVisibilityButtons(); diff --git a/sw/source/uibase/shells/drawdlg.cxx b/sw/source/uibase/shells/drawdlg.cxx index 80fb24123c8f..b08cde80068d 100644 --- a/sw/source/uibase/shells/drawdlg.cxx +++ b/sw/source/uibase/shells/drawdlg.cxx @@ -209,7 +209,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq) namespace { - void lcl_convertStringArguments(sal_uInt16 nSlot, std::unique_ptr<SfxItemSet>& pArgs) + void lcl_convertStringArguments(sal_uInt16 nSlot, const std::unique_ptr<SfxItemSet>& pArgs) { Color aColor; const SfxPoolItem* pItem = nullptr; @@ -316,7 +316,7 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest const & rReq) pView->GetModel()->SetChanged(); } -static void lcl_unifyFillTransparencyItems(SfxItemSet& rSet) +static void lcl_unifyFillTransparencyItems(const SfxItemSet& rSet) { // Transparent fill options are None, Solid, Linear, Axial, Radial, Elliptical, Quadratic, Square. // But this is represented across two items namely XFillTransparenceItem (for None and Solid) diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 929f2c7d6506..9f754443d68d 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -87,7 +87,7 @@ using namespace ::com::sun::star; namespace { - void lcl_convertStringArguments(sal_uInt16 nSlot, std::unique_ptr<SfxItemSet>& pArgs) + void lcl_convertStringArguments(sal_uInt16 nSlot, const std::unique_ptr<SfxItemSet>& pArgs) { Color aColor; OUString sColor; diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index fc9d457a03c0..56c39fa7b25b 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1167,7 +1167,7 @@ namespace } // Handler for Dragging and ContextMenu -static bool lcl_InsertExpandCollapseAllItem(weld::TreeView& rContentTree, weld::TreeIter& rEntry, weld::Menu& rPop) +static bool lcl_InsertExpandCollapseAllItem(const weld::TreeView& rContentTree, const weld::TreeIter& rEntry, weld::Menu& rPop) { if (rContentTree.iter_has_child(rEntry) || rContentTree.get_children_on_demand(rEntry)) { @@ -1177,7 +1177,7 @@ static bool lcl_InsertExpandCollapseAllItem(weld::TreeView& rContentTree, weld:: return true; } -static void lcl_SetOutlineContentEntriesSensitivities(SwContentTree* pThis, weld::TreeView& rContentTree, weld::TreeIter& rEntry, weld::Menu& rPop) +static void lcl_SetOutlineContentEntriesSensitivities(SwContentTree* pThis, const weld::TreeView& rContentTree, const weld::TreeIter& rEntry, weld::Menu& rPop) { rPop.set_sensitive(OString::number(1512), false); rPop.set_sensitive(OString::number(1513), false); diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 751b4b256879..925753c35345 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -387,7 +387,7 @@ void SwGlobalTree::Select() } -void SwGlobalTree::MoveSelectionTo(weld::TreeIter* pDropEntry) +void SwGlobalTree::MoveSelectionTo(const weld::TreeIter* pDropEntry) { int nSource = m_xTreeView->get_selected_index(); |