Kaydet (Commit) 597ede6c authored tarafından Noel Grandin's avatar Noel Grandin

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: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 2ed3d691
...@@ -215,12 +215,17 @@ namespace sw { ...@@ -215,12 +215,17 @@ namespace sw {
SwpHints const*const pHints(0 < m_CurrentExtent SwpHints const*const pHints(0 < m_CurrentExtent
? m_pMerged->extents[m_CurrentExtent-1].pNode->GetpSwpHints() ? m_pMerged->extents[m_CurrentExtent-1].pNode->GetpSwpHints()
: nullptr); : nullptr);
m_CurrentHint = pHints ? pHints->Count() : 0; if (pHints)
{
pHints->SortIfNeedBe();
m_CurrentHint = pHints->Count();
}
} }
else else
{ {
if (SwpHints const*const pHints = m_pNode->GetpSwpHints()) if (SwpHints const*const pHints = m_pNode->GetpSwpHints())
{ {
pHints->SortIfNeedBe();
m_CurrentHint = pHints->Count(); m_CurrentHint = pHints->Count();
} }
} }
...@@ -265,6 +270,8 @@ namespace sw { ...@@ -265,6 +270,8 @@ namespace sw {
SwpHints const*const pHints( SwpHints const*const pHints(
m_pMerged->extents[m_CurrentExtent-1].pNode->GetpSwpHints()); m_pMerged->extents[m_CurrentExtent-1].pNode->GetpSwpHints());
m_CurrentHint = pHints ? pHints->Count() : 0; // reset m_CurrentHint = pHints ? pHints->Count() : 0; // reset
if (pHints)
pHints->SortIfNeedBe();
} }
} }
return nullptr; return nullptr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment