sc/source/filter/inc/pivottablebuffer.hxx | 6 ++---- sc/source/filter/oox/pivottablebuffer.cxx | 5 +++-- sw/source/core/layout/calcmove.cxx | 2 +- sw/source/core/layout/ftnfrm.cxx | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-)
New commits: commit 58f315dcdd073a740d052207889e245841805311 Author: Mike Kaganski <[email protected]> AuthorDate: Sat Dec 20 08:47:38 2025 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Sat Dec 20 13:25:02 2025 +0100 Pass more concrete type Change-Id: I9990d27c23854046add1a7c6a9785e4c33cca946 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195958 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Jenkins diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index a760d54e423c..fe304a8e3083 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -140,8 +140,7 @@ public: void importPTReferenceItem( SequenceInputStream& rStrm ); /** Finalizes the field after import, creates grouping and other settings. */ - void finalizeImport( - const css::uno::Reference< css::sheet::XDataPilotDescriptor >& rxDPDesc ); + void finalizeImport(const rtl::Reference<ScDataPilotDescriptorBase>& rxDPDesc); /** Finalizes the grouped date field after import. */ void finalizeDateGroupingImport( const css::uno::Reference< css::sheet::XDataPilotField >& rxBaseDPField, @@ -151,8 +150,7 @@ public: const css::uno::Reference< css::sheet::XDataPilotField >& rxBaseDPField, const PivotCacheField& rBaseCacheField, PivotCacheGroupItemVector& orItemNames ); - void finalizeImportBasedOnCache( - const css::uno::Reference< css::sheet::XDataPilotDescriptor >& rxDPDesc); + void finalizeImportBasedOnCache(const rtl::Reference<ScDataPilotDescriptorBase>& rxDPDesc); /** Returns the name of the DataPilot field in the fields collection. */ const OUString& getDPFieldName() const { return maDPFieldName; } diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index 263aa19ea6ab..37a1ddfaf3ce 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -383,7 +383,7 @@ void PivotTableField::importPTReferenceItem( SequenceInputStream& rStrm ) maModel.mnSortRefItem = rStrm.readInt32(); } -void PivotTableField::finalizeImport( const Reference< XDataPilotDescriptor >& rxDPDesc ) +void PivotTableField::finalizeImport(const rtl::Reference<ScDataPilotDescriptorBase>& rxDPDesc) { /* Process all fields based on source data, other fields (e.g. group fields) are processed from here. PivotCache::getCacheDatabaseIndex() @@ -492,7 +492,8 @@ void PivotTableField::finalizeParentGroupingImport( const Reference< XDataPilotF mrPivotTable.finalizeParentGroupingImport( xDPField, *pCacheField, orItemNames ); } -void PivotTableField::finalizeImportBasedOnCache( const Reference< XDataPilotDescriptor >& rxDPDesc) +void PivotTableField::finalizeImportBasedOnCache( + const rtl::Reference<ScDataPilotDescriptorBase>& rxDPDesc) { /* Process all fields based on source data, other fields (e.g. group fields) are processed based on cache fields.*/ commit 79cbc55615fdbc9e94a022a24bc22b2bc6b32cfc Author: Mike Kaganski <[email protected]> AuthorDate: Sat Dec 20 11:53:00 2025 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Sat Dec 20 13:24:51 2025 +0100 Pass correct value to SwFrame::FindFootnoteBossFrame Found by code reading. The method takes a bool, which 'true' value means "footnote", not "endnote". The inverse was passed there ever since commit 84a3db80b4fd66c6854b3135b5f69b61fd828e62 (initial import, 2000-09-18). Change-Id: I83ff33d6678361c9227e83787e58999ebd2f6632 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195949 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 4e7233b040e4..6751ed44f804 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -1390,7 +1390,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) if ( !static_cast<SwTextFrame*>(pFootnote->GetRef())->IsLocked() ) { SwFootnoteBossFrame* pBoss = pFootnote->GetRef()->FindFootnoteBossFrame( - pFootnote->GetAttr()->GetFootnote().IsEndNote() ); + !pFootnote->GetAttr()->GetFootnote().IsEndNote() ); if( !pSct || pSct->IsColLocked() || !pSct->Growable() ) pSaveFootnote.reset( new SwSaveFootnoteHeight( pBoss, static_cast<SwTextFrame*>(pFootnote->GetRef())->GetFootnoteLine( pFootnote->GetAttr() ) ) ); diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 4c8d2419242b..b109a03d8fdc 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -2513,7 +2513,7 @@ void SwFootnoteBossFrame::RearrangeFootnotes( const SwTwips nDeadLine, const boo { SwFootnoteFrame* pFootnoteFrame = pCnt->FindFootnoteFrame(); if( pFootnoteFrame->GetRef()->FindFootnoteBossFrame( - pFootnoteFrame->GetAttr()->GetFootnote().IsEndNote() ) != this ) + !pFootnoteFrame->GetAttr()->GetFootnote().IsEndNote() ) != this ) bMore = false; } else
