core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/core/inc/txtfrm.hxx   |    2 +-
 sw/source/core/text/frmcrsr.cxx |    2 +-
 sw/source/core/text/txtfrm.cxx  |    6 +++---
 sw/source/core/text/txtftn.cxx  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 6e870c040bb0f550c126f0fdeb2b9cd497658dd0
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Aug 7 21:30:15 2025 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Aug 8 09:38:26 2025 +0200

    expand default argument of unusual SetPara method
    
    Change-Id: I8e6212f1e2b9905929e967ba3da1869d06c43d89
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189140
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 7b61c8029d82..2190dd0f34ff 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -300,7 +300,7 @@ class SW_DLLPUBLIC SwTextFrame final : public SwContentFrame
 
     bool GetDropRect_( SwRect &rRect ) const;
 
-    void SetPara( SwParaPortion *pNew, bool bDelete = true );
+    void SetPara(SwParaPortion *pNew, bool bDelete);
 
     bool IsFootnoteNumFrame_() const;
 
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index a2545c300abf..2324e99daccf 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -129,7 +129,7 @@ bool sw_ChangeOffset(SwTextFrame* pFrame, TextFrameIndex 
nNew)
                     nNew = TextFrameIndex(0);
                 }
                 pFrame->SetOffset( nNew );
-                pFrame->SetPara( nullptr );
+                pFrame->SetPara(nullptr, true);
                 pFrame->GetFormatted();
                 if( pFrame->getFrameArea().HasArea() )
                     pFrame->getRootFrame()->GetCurrShell()->InvalidateWindows( 
pFrame->getFrameArea() );
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index bea6d81e3b44..6e6687faabc8 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -3469,7 +3469,7 @@ SwTestFormat::~SwTestFormat()
         aPrt.setSwRect(aOldPrt);
     }
 
-    pFrame->SetPara( pOldPara );
+    pFrame->SetPara(pOldPara, true);
 }
 
 bool SwTextFrame::TestFormat( const SwFrame* pPrv, SwTwips &rMaxHeight, bool 
&bSplit )
@@ -3721,7 +3721,7 @@ SwTwips SwTextFrame::CalcFitToContent()
         aPrt.Width( nOldPrtWidth );
     }
 
-    SetPara( pOldPara );
+    SetPara(pOldPara, true);
 
     // tdf#164932 handle numbering list offset
     const SwTextNode* pTextNode( GetTextNodeForParaProps() );
@@ -3814,7 +3814,7 @@ void SwTextFrame::CalcAdditionalFirstLineOffset()
     }
 
     // restore paragraph portion
-    SetPara( pOldPara );
+    SetPara(pOldPara, true);
 }
 
 /**
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index cea62efffb6a..a941e5eca2d8 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -166,7 +166,7 @@ bool SwTextFrame::CalcPrepFootnoteAdjust()
             SwTextFormatInfo aInf( getRootFrame()->GetCurrShell()->GetOut(), 
this );
             SwTextFormatter aLine( this, &aInf );
             aLine.TruncLines();
-            SetPara( nullptr ); // May be deleted!
+            SetPara(nullptr, true); // May be deleted!
             ResetPreps();
             return false;
         }