sw/qa/core/data/doc/tdf124937.doc |binary sw/source/core/text/itrform2.cxx | 1 + 2 files changed, 1 insertion(+)
New commits: commit 2b95e5bdf91204ecc03bcf98375c2620b71f1c3d Author: Mark Hung <[email protected]> AuthorDate: Tue May 14 01:49:03 2019 +0800 Commit: Michael Stahl <[email protected]> CommitDate: Mon May 20 11:34:36 2019 +0200 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 <[email protected]> (cherry picked from commit 96acebb72211b4718eb3038c427df37b55b17b0b) Reviewed-on: https://gerrit.libreoffice.org/72512 Reviewed-by: Michael Stahl <[email protected]> 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 473ed0ad5c63..a0778ad9a064 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1861,6 +1861,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() ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
