Kaydet (Commit) 6f3e24ad authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#106261 throw away old node map for table

when generating a new one, otherwise on exporting the same table
twice to two consecutive .doc footnotes will think the second
export of the table is a level lower because it will find it
in the map and

WW8TableNodeInfo::Pointer_t WW8TableInfo::insertTableNodeInfo

does pNodeInfo->setDepth(nDepth + pNodeInfo->getDepth());
using the cached pNodeInfo depth and not a new fresh pNodeInfo of
depth 0

Change-Id: I7aa7ac6a19814910c1d19d78f04cfd9886c444c5
üst ed3b58dc
......@@ -1824,8 +1824,16 @@ void MSWordExportBase::WriteSpecialText( sal_uLong nStart, sal_uLong nEnd, sal_u
// clear linked textboxes since old ones can't be linked to frames in this section
m_aLinkedTextboxesHelper.clear();
// tdf#106261 Reset table infos, otherwise the depth of the cells will be
// incorrect, in case the header/footer had table(s) and we try to export
// the same table second time.
ww8::WW8TableInfo::Pointer_t pOldTableInfo = m_pTableInfo;
m_pTableInfo = std::make_shared<ww8::WW8TableInfo>();
WriteText();
m_pTableInfo = pOldTableInfo;
m_bOutPageDescs = bOldPageDescs;
delete m_pCurPam; // delete Pam
m_pCurPam = pOldPam;
......
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