diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-05-05 22:49:52 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-05-26 00:51:03 +0200 |
| commit | ed1d7e2818b0c3e5803599d5b3c86e5f49eb7764 (patch) | |
| tree | f41e0ad0e52203d90da43a53c76c22f010dc4aa2 /sw/inc | |
| parent | 077cd88f2da8538e4e89bce2614d6662ccfedce2 (diff) | |
introduce CreateUnoCrsr2 to migrate to sane memory mngmt
Change-Id: Ia530827daa354555983c3c28c5aeec38bc3dbf11
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/doc.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/unocrsr.hxx | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 77a045880e3b..8f8d1e7847ea 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -334,6 +334,7 @@ class SW_DLLPUBLIC SwDoc : mutable std::unordered_map<OUString, SwNumRule *, OUStringHash> maNumRuleMap; SwUnoCrsrTable *mpUnoCrsrTable; + std::list< std::weak_ptr<SwUnoCrsr> > mvUnoCrsrTbl2; SwPagePreviewPrtData *mpPgPViewPrtData; //< Indenting / spacing for printing of page view. SwPaM *mpExtInputRing; @@ -1495,6 +1496,7 @@ public: // Uno - Interfaces const SwUnoCrsrTable& GetUnoCrsrTable() const { return *mpUnoCrsrTable; } SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTableCrsr = false ); + std::shared_ptr<SwUnoCrsr> CreateUnoCrsr2( const SwPosition& rPos, bool bTableCrsr = false ); // FeShell - Interfaces // !!! These assume always an existing layout !!! diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx index c32905025539..83f04abd06f0 100644 --- a/sw/inc/unocrsr.hxx +++ b/sw/inc/unocrsr.hxx @@ -22,6 +22,14 @@ #include <swcrsr.hxx> #include <calbck.hxx> +namespace sw +{ + struct DocDisposingHint SAL_FINAL : public SfxHint + { + DocDisposingHint() {}; + }; +} + class SwUnoCrsr : public virtual SwCursor, public SwModify { private: |