sw/source/core/layout/frmtool.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 23ff149f36e65f762ed13ce19521427342604c7e
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Feb 19 11:07:12 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Feb 19 16:00:49 2024 +0100

    OSL_ENSURE->assert, these are unconditional null-derefs otherwise
    
    so might as well make it an assert
    
    Change-Id: Ic0a91bf92c84e50e6c476524b5c3320cd67d1c8a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163592
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index 635ed3ee3aec..45fefde5ed62 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2999,7 +2999,7 @@ static void lcl_AddObjsToPage( SwFrame* _pFrame, 
SwPageFrame* _pPage )
 
 void RestoreContent( SwFrame *pSav, SwLayoutFrame *pParent, SwFrame *pSibling )
 {
-    OSL_ENSURE( pSav && pParent, "no Save or Parent provided for 
RestoreContent." );
+    assert(pSav && pParent && "no Save or Parent provided for 
RestoreContent.");
     SwRectFnSet aRectFnSet(pParent);
 
     // If there are already FlowFrames below the new parent, so add the chain 
(starting with pSav)

Reply via email to