diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-05-06 16:25:22 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-05-26 00:51:05 +0200 |
commit | ea0962fbb21814db30fef8adaad10a1e4f97b8c3 (patch) | |
tree | 95abc67bd0c9f4e709a3f2c7e8fefa9fa0cb871d | |
parent | ada20978a4e5c26dfe6c4227d310a133e50d9b2e (diff) |
use new unocrsrs in ww8
Change-Id: I7f19c4002f471981b75b88998b31afcd4f30fa8c
-rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 04a1d7699735..8df50e79a26d 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4900,7 +4900,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) pDocShell->SetReadOnlyUI(true); } - m_pPaM = m_rDoc.CreateUnoCrsr(rPos); + mpCrsr = m_rDoc.CreateUnoCrsr2(rPos); + m_pPaM = mpCrsr.get(); m_pCtrlStck = new SwWW8FltControlStack( &m_rDoc, m_nFieldFlags, *this ); @@ -5344,7 +5345,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) SAL_WARN_IF(m_pTableEndPaM, "sw.ww8", "document ended without table ending"); m_pTableEndPaM.reset(); //ensure this is deleted before pPaM - delete m_pPaM, m_pPaM = 0; + mpCrsr.reset(); + m_pPaM = nullptr; m_pLastAnchorPos.reset();//ensure this is deleted before UpdatePageDescs UpdatePageDescs(m_rDoc, nPageDescOffset); diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index afe7125c39f9..cb27db4fca43 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1094,6 +1094,7 @@ private: // allgemeines SwDoc& m_rDoc; + std::shared_ptr<SwUnoCrsr> mpCrsr; SwPaM* m_pPaM; SwWW8FltControlStack* m_pCtrlStck; // Stack fuer die Attribute |