[Libreoffice-commits] core.git: sw/qa sw/source

[Caolán McNamara]

 sw/qa/extras/ww8export/data/tdf46441-2.odt |binary
 sw/qa/extras/ww8export/ww8export.cxx       |    5 +++++
 sw/source/filter/ww8/wrtww8.cxx            |    2 ++
 3 files changed, 7 insertions(+)

New commits:
commit d999069ec6ace6e43b054f26a48f99cbec621628
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 14 14:01:12 2016 +0100

    crashtesting: fix ~SwIndexReg assert on exporting tdf46441-2.odt to .doc
    
    Change-Id: I770c1f5ed4ebfb216810e30de83eb053606c2f8d

diff --git a/sw/qa/extras/ww8export/data/tdf46441-2.odt b/sw/qa/extras/ww8export/data/tdf46441-2.odt
new file mode 100644
index 0000000..ed73406
Binary files /dev/null and b/sw/qa/extras/ww8export/data/tdf46441-2.odt differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index 24023a4..15dd31a 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -666,6 +666,11 @@ DECLARE_WW8EXPORT_TEST(testMoveRange, "fdo66304-1.odt")
     //the save must survive without asserting
 }
 
+DECLARE_WW8EXPORT_TEST(testClearFramePams, "tdf46441-2.odt")
+{
+    //the save must survive without asserting
+}
+
 DECLARE_WW8EXPORT_TEST(testTdf94386, "tdf94386.odt")
 {
     // check that the first and next page use different page styles
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index bf92ed1..de83fa4 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3135,6 +3135,8 @@ void MSWordExportBase::ExportDocument( bool bWriteAll )
 
     ExportDocument_Impl();
 
+    m_aFrames.clear();
+
     // park m_pCurPam in a "safe place" now that document is fully exported
     // before toggling redline mode to avoid ~SwIndexReg assert e.g. export
     // ooo103014-1.odt to .doc