From 132601712ca3922c02b64cef6ea382120dd4511f Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sat, 28 Mar 2015 05:52:28 +0100
Subject: also kill SwIterator here for a Notify call

Change-Id: Ic8e8a581bb38bf064117f74aab7362da318e21c4
---
 sw/inc/unotbl.hxx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'sw/inc')

diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index bb2c593a272a..cc4b39d1b367 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -157,7 +157,7 @@ public:
     SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
 };
 
-class SwXTextTableRow : public cppu::WeakImplHelper2
+class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper2
 <
     ::com::sun::star::beans::XPropertySet,
     ::com::sun::star::lang::XServiceInfo
@@ -172,7 +172,8 @@ class SwXTextTableRow : public cppu::WeakImplHelper2
 protected:
     virtual ~SwXTextTableRow();
     //SwClient
-   virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+    virtual void SwClientNotify(const SwModify&, const SfxHint&) SAL_OVERRIDE;
 
 public:
     SwXTextTableRow(SwFrmFmt* pFmt, SwTableLine* pLine);
@@ -549,7 +550,7 @@ public:
 
 };
 
-class SwXTableRows : public cppu::WeakImplHelper2
+class SwXTableRows SAL_FINAL : public cppu::WeakImplHelper2
 <
     ::com::sun::star::table::XTableRows,
     ::com::sun::star::lang::XServiceInfo
@@ -557,7 +558,8 @@ class SwXTableRows : public cppu::WeakImplHelper2
     public SwClient
 
 {
-    SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+    SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
+    const SwFrmFmt* GetFrmFmt() const { return const_cast<SwXTableRows*>(this)->GetFrmFmt(); }
 protected:
     virtual ~SwXTableRows();
 public:
@@ -587,7 +589,7 @@ public:
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     //SwClient
-   virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
+    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
 };
 
 class SwXTableColumns : public cppu::WeakImplHelper2
-- 
cgit