diff options
| author | Mark Hung <marklh9@gmail.com> | 2019-05-14 01:49:03 +0800 |
|---|---|---|
| committer | Mark Hung <marklh9@gmail.com> | 2019-05-18 04:33:35 +0200 |
| commit | 96acebb72211b4718eb3038c427df37b55b17b0b (patch) | |
| tree | 3357544f726f0db48d35f9432328c2afeedc706b | |
| parent | 10d8682e4cf77361e0ebf68a4ea1b565f05e91a9 (diff) | |
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 <marklh9@gmail.com>
| -rw-r--r-- | sw/qa/core/data/doc/tdf124937.doc | bin | 0 -> 172032 bytes | |||
| -rw-r--r-- | sw/source/core/text/itrform2.cxx | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/sw/qa/core/data/doc/tdf124937.doc b/sw/qa/core/data/doc/tdf124937.doc Binary files differnew file mode 100644 index 000000000000..4a3f91f7c020 --- /dev/null +++ b/sw/qa/core/data/doc/tdf124937.doc 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() ) |