diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-03-28 05:52:28 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-03-28 22:14:21 +0100 |
| commit | 132601712ca3922c02b64cef6ea382120dd4511f (patch) | |
| tree | 8e66350f7c6791e9124788860175c71f1e8ed3af /sw/inc | |
| parent | 95f2ba75cb07462e4a53f39795a72cfdaaf36452 (diff) | |
also kill SwIterator here for a Notify call
Change-Id: Ic8e8a581bb38bf064117f74aab7362da318e21c4
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/unotbl.hxx | 12 |
1 files changed, 7 insertions, 5 deletions
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 |