Remove SwClients before destruction in some uno wrapper classes

- SwXTextTableCursor, SwXCellRange, SwXTextPortion, SwNavigationMgr,
SwXParaFrameEnumeration
- this was overlooked due to confusion over our bazillion different
debug modes

Change-Id: I0965184b3ffc4854c26838ff78aef06f4544a9b1

1 files changed, 12 insertions, 1 deletions

diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 405d1d4531d9..28fecfbbc8fa 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -42,6 +42,7 @@
 #include <unotext.hxx>
 #include <frmfmt.hxx>
 #include <tuple>
+#include <unocrsr.hxx>
 
 class SwUnoCrsr;
 class SwTable;
@@ -217,7 +218,6 @@ public:
     SwXTextTableCursor(SwFrameFormat* pFormat, SwTableBox* pBox);
     SwXTextTableCursor(SwFrameFormat& rTableFormat,
                         const SwTableCursor* pTableSelection);
-
     DECLARE_XINTERFACE()
 
     //XTextTableCursor
@@ -276,6 +276,12 @@ public:
     SwUnoCrsr*                  GetCrsr();
     std::shared_ptr<SwUnoCrsr> m_pUnoCrsr;
     SwFrameFormat*       GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
+    ~SwXTextTableCursor()
+    {
+        if(m_pUnoCrsr)
+            m_pUnoCrsr->Remove(&aCrsrDepend);
+    }
+
 };
 
 struct SwRangeDescriptor
@@ -469,6 +475,11 @@ public:
     SwXCellRange(std::shared_ptr<SwUnoCrsr> pCrsr, SwFrameFormat& rFrameFormat, SwRangeDescriptor& rDesc);
     void SetLabels(bool bFirstRowAsLabel, bool bFirstColumnAsLabel)
         { m_bFirstRowAsLabel = bFirstRowAsLabel, m_bFirstColumnAsLabel = bFirstColumnAsLabel; }
+    virtual ~SwXCellRange()
+    {
+        if(m_pTableCrsr)
+            m_pTableCrsr->Remove(&aCursorDepend);
+    }
     std::vector< css::uno::Reference< css::table::XCell > > getCells();
 
     TYPEINFO_OVERRIDE();