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

[Caolán McNamara]

 sw/source/filter/ww8/wrtww8.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit d8a527abcecbb8b5783803fa322e0de310967a1b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Apr 11 21:16:13 2015 +0100

    fix assert on export of ooo103014-1.odt to .doc
    
    Change-Id: Ice8bfc098fe539c8c58fd0dc28fdde5ad4a7ad03

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 5836891..f779521 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3076,6 +3076,11 @@ void MSWordExportBase::ExportDocument( bool bWriteAll )
 
     ExportDocument_Impl();
 
+    // park curpam 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
+    *pCurPam = *pOrigPam;
+
     if ( mnRedlineMode != pDoc->getIDocumentRedlineAccess().GetRedlineMode() )
         pDoc->getIDocumentRedlineAccess().SetRedlineMode( (RedlineMode_t)(mnRedlineMode) );
 }