sc/source/filter/excel/xestream.cxx | 6 ++---- sc/source/filter/inc/xestream.hxx | 4 +--- sw/inc/reffld.hxx | 2 +- sw/source/core/fields/reffld.cxx | 6 +++--- sw/source/ui/fldui/fldref.cxx | 4 ++-- 5 files changed, 9 insertions(+), 13 deletions(-)
New commits: commit be30ca42e4e7552899e72d1211daf64f4006aacd Author: Noel Grandin <[email protected]> AuthorDate: Fri Jan 23 20:13:02 2026 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Jan 26 08:35:11 2026 +0100 loplugin:constantparam in XclExpXmlStream Change-Id: I2a8264e920766d2d46adad027cf1fccf4910aae5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198023 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 0540c779f40d..f8f5ed32b273 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -955,9 +955,7 @@ sax_fastparser::FSHelperPtr XclExpXmlStream::CreateOutputStream ( const uno::Reference< XOutputStream >& xParentRelation, const char* sContentType, const OUString& sRelationshipType, - OUString* pRelationshipId, - // if bNoHeader is true, don't create a header (<?xml... ) line - bool bNoHeader /* = false */ ) + OUString* pRelationshipId ) { OUString sRelationshipId; if (xParentRelation.is()) @@ -969,7 +967,7 @@ sax_fastparser::FSHelperPtr XclExpXmlStream::CreateOutputStream ( *pRelationshipId = sRelationshipId; sax_fastparser::FSHelperPtr p = openFragmentStreamWithSerializer( - sFullStream, OUString::createFromAscii( sContentType ), bNoHeader ); + sFullStream, OUString::createFromAscii( sContentType ), /*bNoHeader*/false ); maOpenedStreamMap[ sFullStream ] = std::make_pair( sRelationshipId, p ); diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 4da0e0b6067a..bd0129590244 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -313,9 +313,7 @@ public: const css::uno::Reference< css::io::XOutputStream >& xParentRelation, const char* sContentType, const OUString& sRelationshipType, - OUString* pRelationshipId = nullptr, - // if bNoHeader is true, don't create a header (<?xml... ) line - bool bNoHeader = false); + OUString* pRelationshipId = nullptr); // ignore virtual bool exportDocument() override; commit 237e54bed955c43131a5f907f8d8774c00895a33 Author: Noel Grandin <[email protected]> AuthorDate: Fri Jan 23 19:02:33 2026 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Jan 26 08:35:02 2026 +0100 loplugin:constantparam in GetReferencedTextNode Change-Id: Iff28dcb71391ee54fd85ce673fbefb3dbdbaf2f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198022 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index fcd1f3af7a3e..ca0c4aa1d068 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -161,7 +161,7 @@ public: // --> #i81002# SW_DLLPUBLIC bool IsRefToHeadingCrossRefBookmark() const; SW_DLLPUBLIC bool IsRefToNumItemCrossRefBookmark() const; - SW_DLLPUBLIC const SwTextNode* GetReferencedTextNode(const SwTextNode* pTextNode, SwFrame* pFrame) const; + SW_DLLPUBLIC const SwTextNode* GetReferencedTextNode() const; // #i85090# SW_DLLPUBLIC OUString GetExpandedTextOfReferencedTextNode(SwRootFrame const& rLayout) const; diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 4c2d267ed948..4af8d66dc8cc 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -395,14 +395,14 @@ bool SwGetRefField::IsRefToNumItemCrossRefBookmark() const ::sw::mark::CrossRefNumItemBookmark::IsLegalName(m_sSetRefName); } -const SwTextNode* SwGetRefField::GetReferencedTextNode(const SwTextNode* pTextNode, SwFrame* pFrame) const +const SwTextNode* SwGetRefField::GetReferencedTextNode() const { SwGetRefFieldType *pTyp = dynamic_cast<SwGetRefFieldType*>(GetTyp()); if (!pTyp) return nullptr; sal_Int32 nDummy = -1; return SwGetRefFieldType::FindAnchor( &pTyp->GetDoc(), m_sSetRefName, m_nSubType, m_nSeqNo, m_nFlags, &nDummy, - nullptr, nullptr, pTextNode, pFrame ); + nullptr, nullptr, /*pTextNode*/nullptr, /*pFrame*/nullptr ); } // strikethrough for tooltips using Unicode combining character @@ -420,7 +420,7 @@ static OUString lcl_formatStringByCombiningCharacter(std::u16string_view sText, OUString SwGetRefField::GetExpandedTextOfReferencedTextNode( SwRootFrame const& rLayout) const { - const SwTextNode* pReferencedTextNode( GetReferencedTextNode(/*pTextNode*/nullptr, /*pFrame*/nullptr) ); + const SwTextNode* pReferencedTextNode( GetReferencedTextNode() ); if ( !pReferencedTextNode ) return OUString(); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 842255acb6ac..a9108a7de17d 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -649,7 +649,7 @@ void SwFieldRefPage::UpdateSubType(const OUString& filterString) m_xSelectionToolTipLB->append(sId, pIDoc->getOutlineText(nOutlIdx, pSh->GetLayout(), true, true, false)); if ((IsFieldEdit() && pRefField - && pRefField->GetReferencedTextNode(nullptr, nullptr) == maOutlineNodes[nOutlIdx]) + && pRefField->GetReferencedTextNode() == maOutlineNodes[nOutlIdx]) || mpSavedSelectedTextNode == maOutlineNodes[nOutlIdx]) { m_sSelectionToolTipLBId = sId; @@ -684,7 +684,7 @@ void SwFieldRefPage::UpdateSubType(const OUString& filterString) m_xSelectionToolTipLB->append(sId, pIDoc->getListItemText(*maNumItems[nNumItemIdx], *pSh->GetLayout())); if ((IsFieldEdit() && pRefField - && pRefField->GetReferencedTextNode(nullptr, nullptr) == maNumItems[nNumItemIdx]->GetTextNode()) + && pRefField->GetReferencedTextNode() == maNumItems[nNumItemIdx]->GetTextNode()) || mpSavedSelectedTextNode == maNumItems[nNumItemIdx]->GetTextNode()) { m_sSelectionToolTipLBId = sId;
