diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /sc/inc/textuno.hxx | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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 'sc/inc/textuno.hxx')
-rw-r--r-- | sc/inc/textuno.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index d70f17f26426..eafda68ba6be 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -67,7 +67,7 @@ private: public: ScHeaderFooterContentObj(); - virtual ~ScHeaderFooterContentObj(); + virtual ~ScHeaderFooterContentObj() override; // for ScPageHFItem (using getImplementation) const EditTextObject* GetLeftEditObject() const; @@ -157,7 +157,7 @@ private: public: ScHeaderFooterTextObj( css::uno::WeakReference<css::sheet::XHeaderFooterContent> xContent, ScHeaderFooterPart nP, const EditTextObject* pTextObj); - virtual ~ScHeaderFooterTextObj(); + virtual ~ScHeaderFooterTextObj() override; const EditTextObject* GetTextObject() const; const SvxUnoText& GetUnoText(); @@ -240,7 +240,7 @@ class ScCellTextCursor : public SvxUnoTextCursor public: ScCellTextCursor(const ScCellTextCursor& rOther); ScCellTextCursor(ScCellObj& rText); - virtual ~ScCellTextCursor() throw(); + virtual ~ScCellTextCursor() throw() override; ScCellObj& GetCellObj() const { return rTextObj; } @@ -268,7 +268,7 @@ private: public: ScHeaderFooterTextCursor(const ScHeaderFooterTextCursor& rOther); ScHeaderFooterTextCursor(ScHeaderFooterTextObj& rText); - virtual ~ScHeaderFooterTextCursor() throw(); + virtual ~ScHeaderFooterTextCursor() throw() override; // SvxUnoTextCursor methods reimplemented here: virtual css::uno::Reference< css::text::XText > SAL_CALL @@ -295,7 +295,7 @@ public: ScDrawTextCursor(const ScDrawTextCursor& rOther); ScDrawTextCursor( const css::uno::Reference< css::text::XText >& xParent, const SvxUnoTextBase& rText ); - virtual ~ScDrawTextCursor() throw(); + virtual ~ScDrawTextCursor() throw() override; // SvxUnoTextCursor methods reimplemented here: virtual css::uno::Reference< css::text::XText > SAL_CALL @@ -336,7 +336,7 @@ class ScEditEngineTextObj : public ScSimpleEditSourceHelper, public SvxUnoText { public: ScEditEngineTextObj(); - virtual ~ScEditEngineTextObj() throw(); + virtual ~ScEditEngineTextObj() throw() override; void SetText( const EditTextObject& rTextObject ); EditTextObject* CreateTextObject(); @@ -359,7 +359,7 @@ protected: public: ScCellTextData(ScDocShell* pDocSh, const ScAddress& rP); - virtual ~ScCellTextData(); + virtual ~ScCellTextData() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -382,7 +382,7 @@ class ScCellTextObj : public ScCellTextData, public SvxUnoText { public: ScCellTextObj(ScDocShell* pDocSh, const ScAddress& rP); - virtual ~ScCellTextObj() throw(); + virtual ~ScCellTextObj() throw() override; }; #endif |