sw/source/filter/basflt/fltini.cxx | 4 ++-- sw/source/filter/inc/fltini.hxx | 3 +-- sw/source/filter/ww8/ww8par6.cxx | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)
New commits: commit 3c9777436db6a2600206949951420ccc2387a960 Author: Noel Grandin <[email protected]> AuthorDate: Sat Aug 20 09:16:21 2022 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Aug 20 10:58:31 2022 +0200 SwNodeIndex->SwNode in CalculateFlySize Change-Id: Ieea800ff515fbbbdbe3ba89b6e5d1016955553d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138569 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 05f98efba363..429eda6611cd 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -268,7 +268,7 @@ void StgReader::SetFltName( const OUString& rFltNm ) m_aFltName = rFltNm; } -void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, +void CalculateFlySize(SfxItemSet& rFlySet, const SwNode& rAnchor, SwTwips nPageWidth) { const SwFormatFrameSize* pFrameSizeItem = rFlySet.GetItemIfSet( RES_FRM_SIZE ); @@ -281,7 +281,7 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, SwTwips nWidth; // determine the width; if there is a table use the width of the table; // otherwise use the width of the page - const SwTableNode* pTableNd = rAnchor.GetNode().FindTableNode(); + const SwTableNode* pTableNd = rAnchor.FindTableNode(); if( pTableNd ) nWidth = pTableNd->GetTable().GetFrameFormat()->GetFrameSize().GetWidth(); else diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx index 8106e7ba9e2b..1c0f1639b8e6 100644 --- a/sw/source/filter/inc/fltini.hxx +++ b/sw/source/filter/inc/fltini.hxx @@ -65,8 +65,7 @@ public: void GetWW8Writer(std::u16string_view, const OUString&, WriterRef&); // Get size of fly (if 'automatic' in WW) and check if not too small -SW_DLLPUBLIC void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, - SwTwips nPageWidth); +SW_DLLPUBLIC void CalculateFlySize(SfxItemSet& rFlySet, const SwNode& rAnchor, SwTwips nPageWidth); #endif diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 26e4d1d9419c..56c5fed93857 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2745,7 +2745,7 @@ void SwWW8ImplReader::StopApo() if (!m_bFuzzing) { - CalculateFlySize(aFlySet, m_xSFlyPara->xMainTextPos->GetPoint()->nNode, + CalculateFlySize(aFlySet, m_xSFlyPara->xMainTextPos->GetPoint()->GetNode(), m_xSFlyPara->nWidth); }
