diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-06-05 14:07:18 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-06-05 20:48:56 +0200 |
commit | 597ede6c2eecd9a3c4dca5ff610050080c0ded7c (patch) | |
tree | 7ed9629f930c732b3738a45582e609ae2c8945ed /sw | |
parent | 2ed3d691b42525f6c1cc430d5863febcb102816e (diff) |
crash testing export of ooo72915-2.odt to ooo72915-2.doc
blind fix
Change-Id: I670b851405a1a41dbb7c85d495de9144dffd0194
Reviewed-on: https://gerrit.libreoffice.org/73542
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/text/txtfrm.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 3125b2362510..5dc660ba0d4a 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -215,12 +215,17 @@ namespace sw { SwpHints const*const pHints(0 < m_CurrentExtent ? m_pMerged->extents[m_CurrentExtent-1].pNode->GetpSwpHints() : nullptr); - m_CurrentHint = pHints ? pHints->Count() : 0; + if (pHints) + { + pHints->SortIfNeedBe(); + m_CurrentHint = pHints->Count(); + } } else { if (SwpHints const*const pHints = m_pNode->GetpSwpHints()) { + pHints->SortIfNeedBe(); m_CurrentHint = pHints->Count(); } } @@ -265,6 +270,8 @@ namespace sw { SwpHints const*const pHints( m_pMerged->extents[m_CurrentExtent-1].pNode->GetpSwpHints()); m_CurrentHint = pHints ? pHints->Count() : 0; // reset + if (pHints) + pHints->SortIfNeedBe(); } } return nullptr; |