summaryrefslogtreecommitdiff
path: root/sw/inc/unotbl.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /sw/inc/unotbl.hxx
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff)
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'sw/inc/unotbl.hxx')
-rw-r--r--sw/inc/unotbl.hxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index d902c84c1e27..498fe5ebbe9b 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -84,7 +84,7 @@ protected:
bool IsValid() const;
- virtual ~SwXCell();
+ virtual ~SwXCell() override;
//SwClient
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
@@ -167,7 +167,7 @@ class SwXTextTableRow final : public cppu::WeakImplHelper
SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
const SwFrameFormat* GetFrameFormat() const { return const_cast<SwXTextTableRow*>(this)->GetFrameFormat(); }
protected:
- virtual ~SwXTextTableRow();
+ virtual ~SwXTextTableRow() override;
//SwClient
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
virtual void SwClientNotify(const SwModify&, const SfxHint&) override;
@@ -272,7 +272,7 @@ public:
SwUnoCursor& GetCursor();
sw::UnoCursorPointer m_pUnoCursor;
SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
- virtual ~SwXTextTableCursor() { };
+ virtual ~SwXTextTableCursor() override { };
};
struct SwRangeDescriptor
@@ -305,7 +305,7 @@ private:
SwXTextTable();
SwXTextTable(SwFrameFormat& rFrameFormat);
- virtual ~SwXTextTable();
+ virtual ~SwXTextTable() override;
public:
static css::uno::Reference<css::text::XTextTable>
@@ -426,7 +426,7 @@ private:
::sw::UnoImplPtr<Impl> m_pImpl;
SwXCellRange(const sw::UnoCursorPointer& pCursor, SwFrameFormat& rFrameFormat, SwRangeDescriptor& rDesc);
- virtual ~SwXCellRange();
+ virtual ~SwXCellRange() override;
public:
static ::rtl::Reference<SwXCellRange> CreateXCellRange(
@@ -514,7 +514,7 @@ private:
SwFrameFormat* GetFrameFormat();
const SwFrameFormat* GetFrameFormat() const { return const_cast<SwXTableRows*>(this)->GetFrameFormat(); }
protected:
- virtual ~SwXTableRows();
+ virtual ~SwXTableRows() override;
public:
SwXTableRows(SwFrameFormat& rFrameFormat);
@@ -552,7 +552,7 @@ private:
::sw::UnoImplPtr<Impl> m_pImpl;
SwFrameFormat* GetFrameFormat() const;
protected:
- virtual ~SwXTableColumns();
+ virtual ~SwXTableColumns() override;
public:
SwXTableColumns(SwFrameFormat& rFrameFormat);