From 96acebb72211b4718eb3038c427df37b55b17b0b Mon Sep 17 00:00:00 2001 From: Mark Hung Date: Tue, 14 May 2019 01:49:03 +0800 Subject: tdf#124937 reset m_pFirstOfBorderMerge before truncate. SwLinePortion::Truncate() called in SwTextFormatter::FormatReset() delete the portion referred by m_pFirstOfBorderMerge. Change-Id: I68e134c86db617d37ea2efa09dad4409772146b5 Reviewed-on: https://gerrit.libreoffice.org/72300 Tested-by: Jenkins Reviewed-by: Mark Hung --- sw/qa/core/data/doc/tdf124937.doc | Bin 0 -> 172032 bytes sw/source/core/text/itrform2.cxx | 1 + 2 files changed, 1 insertion(+) create mode 100644 sw/qa/core/data/doc/tdf124937.doc diff --git a/sw/qa/core/data/doc/tdf124937.doc b/sw/qa/core/data/doc/tdf124937.doc new file mode 100644 index 000000000000..4a3f91f7c020 Binary files /dev/null and b/sw/qa/core/data/doc/tdf124937.doc differ diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index fa56ada86eba..da17ddeff5da 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1859,6 +1859,7 @@ void SwTextFormatter::FeedInf( SwTextFormatInfo &rInf ) const void SwTextFormatter::FormatReset( SwTextFormatInfo &rInf ) { + m_pFirstOfBorderMerge = nullptr; m_pCurr->Truncate(); m_pCurr->Init(); if( pBlink && m_pCurr->IsBlinking() ) -- cgit