sw/qa/core/layout/data/tdf122894-4.doc |binary sw/qa/core/layout/layout.cxx | 5 +++++ sw/source/core/layout/objectformattertxtfrm.cxx | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit 4ac83001c38f0ff4696bd204e7baabcb2947725f Author: Caolán McNamara <[email protected]> AuthorDate: Tue Mar 16 10:18:18 2021 +0000 Commit: Michael Stahl <[email protected]> CommitDate: Mon Jun 20 11:24:21 2022 +0200 tdf#122894 skipping anchor in column in footnote a trawl of crash testing document didn't show up another example and it doesn't seem possible to create this scenario directly in out UI Change-Id: Ie65a51bf609e8bacd261f368f0b8037431c116ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112567 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit fa1bcc22921941b2cd8a0b32fe0d15655d12d607) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133903 Tested-by: Michael Stahl <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/qa/core/layout/data/tdf122894-4.doc b/sw/qa/core/layout/data/tdf122894-4.doc new file mode 100644 index 000000000000..4ebdb53de04f Binary files /dev/null and b/sw/qa/core/layout/data/tdf122894-4.doc differ diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx index 02a1a70ac04c..4dcbaa15e5f4 100644 --- a/sw/qa/core/layout/layout.cxx +++ b/sw/qa/core/layout/layout.cxx @@ -29,6 +29,11 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testTdf128195) CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2269), nTxtHeight); } +CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testCrashRemoveFromLayout) +{ + load(DATA_DIRECTORY, "tdf122894-4.doc"); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index e6fc506d73fb..8f311463f898 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -856,7 +856,8 @@ void SwObjectFormatterTextFrame::FormatAnchorFrameAndItsPrevs( SwTextFrame& _rAn // format the content of the previous columns. // Note: It's a very simple format without formatting objects. SwFrame* pColFrameOfAnchor = _rAnchorTextFrame.FindColFrame(); - if ( pColFrameOfAnchor ) + SAL_WARN_IF(pColFrameOfAnchor && _rAnchorTextFrame.IsInFootnote(), "sw.layout", "tdf#122894 skipping anchor in column in footnote"); + if (pColFrameOfAnchor && !_rAnchorTextFrame.IsInFootnote()) { // #i44049# _rAnchorTextFrame.LockJoin();
