sw/source/core/layout/tabfrm.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ca8c079aa1b42c9a7d582dc04be0437aca1084a5
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Dec 30 20:59:35 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Dec 31 00:28:53 2024 +0100
crashtesting: assert on loading ooo56980-8.odt
in lcl_MoveRowContent since:
commit 6b09bec95747d3bd9871bab3f49142a2fca2d368
CommitDate: Thu Dec 26 18:26:32 2024 +0100
sw: use SAL_RET_MAYBENULL in Lower()
RemoveFromLayout invalidates the Lower() so it must be refetched
Change-Id: Ie8722fba8b1765b13969c03f10711ade26b04080
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179571
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 9b2590b88ec7..683eb18dd7c1 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -473,7 +473,8 @@ static void lcl_MoveRowContent( SwRowFrame& rSourceLine,
SwRowFrame& rDestLine )
pTmpSourceRow->InsertBefore( pCurrDestCell, nullptr );
}
- pTmpSourceRow = static_cast<SwRowFrame*>(pLower);
+ // RemoveFromLayout invalidates Lower() so it must be refetched
+ pTmpSourceRow =
static_cast<SwRowFrame*>(pCurrSourceCell->Lower());
}
}
else
