diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-08-19 16:23:35 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-08-20 16:40:07 +0200 |
| commit | be4320f32a4e5ca46a749a3f9ccc0ffb8e188dbf (patch) | |
| tree | c54c1bbb506bec6d945fa58cc751e5efbf4a55fc /sw | |
| parent | 4f211a0d0c4ef0c248fd3d4493994c1a122c2eb9 (diff) | |
sw: ww8: avoid ~SwIndexReg() assertion
In SwWW8ImplReader::StopApo() the JoinNext() may delete the node that
pPaM points to. It is probably a bad idea to use a non-correctable
SwPaM in an import filter; sadly this filter uses the core API directly,
let's use a SwUnoCrsr which should avoid the problem.
Change-Id: I120a481883b7ecbfa59cc998153fec0e6b9bafe5
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 44658901bdda..0029154786bd 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -87,6 +87,7 @@ #include <swtable.hxx> #include <fchrfmt.hxx> #include <charfmt.hxx> +#include <unocrsr.hxx> #include <IDocumentSettingAccess.hxx> #include <fltini.hxx> @@ -4913,7 +4914,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) pDocShell->SetReadOnlyUI(true); } - pPaM = new SwPaM(rPos); + pPaM = rDoc.CreateUnoCrsr(rPos); pCtrlStck = new SwWW8FltControlStack( &rDoc, nFieldFlags, *this ); |