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

fix a big pile of the crash tester .doc import failures

wrt the blasted SwIndexReg dtor assert

Change-Id: I4b3eeab76d5d76f7b769b458baeadbc0a9bd4238
üst 9b01059f
...@@ -5404,11 +5404,13 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) ...@@ -5404,11 +5404,13 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
if (mbNewDoc) if (mbNewDoc)
rDoc.getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)( eMode )); rDoc.getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)( eMode ));
UpdatePageDescs(rDoc, nPageDescOffset);
SAL_WARN_IF(mpTableEndPaM, "sw.ww8", "document ended without table ending"); SAL_WARN_IF(mpTableEndPaM, "sw.ww8", "document ended without table ending");
mpTableEndPaM.reset(); //ensure this is deleted before pPaM mpTableEndPaM.reset(); //ensure this is deleted before pPaM
delete pPaM, pPaM = 0; delete pPaM, pPaM = 0;
lastAnchorPos.reset(); //ensure this is deleted before UpdatePageDescs
UpdatePageDescs(rDoc, nPageDescOffset);
return nErrRet; return nErrRet;
} }
......
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