sw/source/filter/ww8/wrtww8.cxx | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 7b9a5e8124328da9d81aed58cf944c91560a7c07
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Apr 9 21:05:08 2016 +0100
valgrind: leak on export of ooo98646-1.doc to docx
Change-Id: Idd1015fd9dfe12c085a61756fb9448fb6df09326
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index a248e85..99cde14 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3329,15 +3329,6 @@ void WW8Export::ExportDocument_Impl()
pFib->WriteHeader( *pStrmTemp );
}
- if (m_pUsedNumTable) // all used NumRules
- {
- // clear the part of the list array that was copied from the document
- // - it's an auto delete array, so the rest of the array which are
- // duplicated lists that were added during the export will be deleted.
- m_pUsedNumTable->erase(m_pUsedNumTable->begin(),
m_pUsedNumTable->begin() + m_pUsedNumTable->size() - m_nUniqueList);
- delete m_pUsedNumTable;
- }
-
DELETEZ( m_pGrf );
DELETEZ( m_pMagicTable );
DELETEZ( m_pFieldFootnote );
@@ -3558,6 +3549,14 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument,
SwPaM *pCurrentPam, SwPaM
MSWordExportBase::~MSWordExportBase()
{
+ if (m_pUsedNumTable) // all used NumRules
+ {
+ // clear the part of the list array that was copied from the document
+ // - it's an auto delete array, so the rest of the array which are
+ // duplicated lists that were added during the export will be deleted.
+ m_pUsedNumTable->erase(m_pUsedNumTable->begin(),
m_pUsedNumTable->begin() + m_pUsedNumTable->size() - m_nUniqueList);
+ delete m_pUsedNumTable;
+ }
delete m_pOLEExp;
delete m_pOCXExp;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
