summaryrefslogtreecommitdiff
path: root/include/editeng/unotext.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 /include/editeng/unotext.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 'include/editeng/unotext.hxx')
-rw-r--r--include/editeng/unotext.hxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 6a30b08a9a9b..20ee791c273c 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -170,7 +170,7 @@ class SvxDummyTextSource : public SvxEditSource, public SvxTextForwarder
public:
// SvxEditSource
- virtual ~SvxDummyTextSource();
+ virtual ~SvxDummyTextSource() override;
virtual SvxEditSource* Clone() const override;
virtual SvxTextForwarder* GetTextForwarder() override;
virtual void UpdateData() override;
@@ -363,7 +363,7 @@ private:
public:
SvxUnoTextRange( const SvxUnoTextBase& rParent, bool bPortion = false ) throw();
- virtual ~SvxUnoTextRange() throw();
+ virtual ~SvxUnoTextRange() throw() override;
// css::uno::XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -395,7 +395,7 @@ protected:
SvxUnoTextBase( const SvxItemPropertySet* _pSet ) throw();
SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, css::uno::Reference < css::text::XText > const & xParent ) throw();
SvxUnoTextBase( const SvxUnoTextBase& rText ) throw();
- virtual ~SvxUnoTextBase() throw();
+ virtual ~SvxUnoTextBase() throw() override;
public:
UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextBase )
@@ -464,7 +464,7 @@ public:
SvxUnoText( const SvxItemPropertySet* _pSet ) throw();
SvxUnoText( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, css::uno::Reference < css::text::XText > const & xParent ) throw();
SvxUnoText( const SvxUnoText& rText ) throw();
- virtual ~SvxUnoText() throw();
+ virtual ~SvxUnoText() throw() override;
// Internal
static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
@@ -492,7 +492,7 @@ private:
public:
SvxUnoTextContentEnumeration( const SvxUnoTextBase& _rText ) throw();
- virtual ~SvxUnoTextContentEnumeration() throw();
+ virtual ~SvxUnoTextContentEnumeration() throw() override;
// css::container::XEnumeration
virtual sal_Bool SAL_CALL hasMoreElements( ) throw(css::uno::RuntimeException, std::exception) override;
@@ -526,7 +526,7 @@ protected:
public:
SvxUnoTextContent( const SvxUnoTextBase& rText, sal_Int32 nPara ) throw();
SvxUnoTextContent( const SvxUnoTextContent& rContent ) throw();
- virtual ~SvxUnoTextContent() throw();
+ virtual ~SvxUnoTextContent() throw() override;
// css::uno::XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -588,7 +588,7 @@ private:
public:
SvxUnoTextRangeEnumeration( const SvxUnoTextBase& rText, sal_Int32 nPara ) throw();
- virtual ~SvxUnoTextRangeEnumeration() throw();
+ virtual ~SvxUnoTextRangeEnumeration() throw() override;
// css::container::XEnumeration
virtual sal_Bool SAL_CALL hasMoreElements( ) throw(css::uno::RuntimeException, std::exception) override;
@@ -607,7 +607,7 @@ private:
public:
SvxUnoTextCursor( const SvxUnoTextBase& rText ) throw();
SvxUnoTextCursor( const SvxUnoTextCursor& rCursor ) throw();
- virtual ~SvxUnoTextCursor() throw();
+ virtual ~SvxUnoTextCursor() throw() override;
// css::uno::XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;