[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source

[Noel Grandin (via logerrit)]

 sw/source/core/text/txtfrm.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit e640c1c14f2dd30364d7a52f708e833f92edcdcc
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Jun 5 14:07:18 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jun 6 14:42:38 2019 +0200

    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 at collabora.co.uk>
    (cherry picked from commit 597ede6c2eecd9a3c4dca5ff610050080c0ded7c)
    Reviewed-on: https://gerrit.libreoffice.org/73595

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;