summaryrefslogtreecommitdiff
path: root/forms/source/richtext
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 /forms/source/richtext
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 'forms/source/richtext')
-rw-r--r--forms/source/richtext/attributedispatcher.hxx2
-rw-r--r--forms/source/richtext/clipboarddispatcher.hxx2
-rw-r--r--forms/source/richtext/featuredispatcher.hxx2
-rw-r--r--forms/source/richtext/parametrizedattributedispatcher.hxx2
-rw-r--r--forms/source/richtext/richtextcontrol.hxx4
-rw-r--r--forms/source/richtext/richtextengine.hxx2
-rw-r--r--forms/source/richtext/richtextunowrapper.hxx4
-rw-r--r--forms/source/richtext/richtextvclcontrol.hxx2
-rw-r--r--forms/source/richtext/rtattributehandler.hxx2
-rw-r--r--forms/source/richtext/specialdispatchers.hxx2
10 files changed, 12 insertions, 12 deletions
diff --git a/forms/source/richtext/attributedispatcher.hxx b/forms/source/richtext/attributedispatcher.hxx
index 358a2df57513..a2e89f829be2 100644
--- a/forms/source/richtext/attributedispatcher.hxx
+++ b/forms/source/richtext/attributedispatcher.hxx
@@ -55,7 +55,7 @@ namespace frm
);
protected:
- virtual ~OAttributeDispatcher( );
+ virtual ~OAttributeDispatcher( ) override;
// XDispatch
virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx
index d0041b3963d0..b3ecf9006d5b 100644
--- a/forms/source/richtext/clipboarddispatcher.hxx
+++ b/forms/source/richtext/clipboarddispatcher.hxx
@@ -73,7 +73,7 @@ namespace frm
explicit OPasteClipboardDispatcher( EditView& _rView );
protected:
- virtual ~OPasteClipboardDispatcher();
+ virtual ~OPasteClipboardDispatcher() override;
// OClipboardDispatcher
virtual bool implIsEnabled( ) const override;
diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx
index a15558cb5455..425735b582ac 100644
--- a/forms/source/richtext/featuredispatcher.hxx
+++ b/forms/source/richtext/featuredispatcher.hxx
@@ -55,7 +55,7 @@ namespace frm
protected:
ORichTextFeatureDispatcher( EditView& _rView, const css::util::URL& _rURL );
- virtual ~ORichTextFeatureDispatcher( );
+ virtual ~ORichTextFeatureDispatcher( ) override;
public:
/// clean up resources associated with this instance
diff --git a/forms/source/richtext/parametrizedattributedispatcher.hxx b/forms/source/richtext/parametrizedattributedispatcher.hxx
index 0b531f78cf4b..0dbe9d48ca34 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.hxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.hxx
@@ -38,7 +38,7 @@ namespace frm
);
protected:
- virtual ~OParametrizedAttributeDispatcher();
+ virtual ~OParametrizedAttributeDispatcher() override;
// XDispatch
virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index 5bda91b38949..993bd21edff5 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -49,7 +49,7 @@ namespace frm
ORichTextControl();
protected:
- virtual ~ORichTextControl();
+ virtual ~ORichTextControl() override;
public:
// XServiceInfo - static version
@@ -106,7 +106,7 @@ namespace frm
protected:
ORichTextPeer();
- virtual ~ORichTextPeer();
+ virtual ~ORichTextPeer() override;
// XView
void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx
index e2beb7fc35c9..63b08a3765e5 100644
--- a/forms/source/richtext/richtextengine.hxx
+++ b/forms/source/richtext/richtextengine.hxx
@@ -49,7 +49,7 @@ namespace frm
static RichTextEngine* Create();
RichTextEngine* Clone();
- virtual ~RichTextEngine( );
+ virtual ~RichTextEngine( ) override;
// for multiplexing the StatusChanged events of the edit engine
void registerEngineStatusListener( IEngineStatusListener* _pListener );
diff --git a/forms/source/richtext/richtextunowrapper.hxx b/forms/source/richtext/richtextunowrapper.hxx
index 4de0d6ffb2d5..7f2fba8cedf9 100644
--- a/forms/source/richtext/richtextunowrapper.hxx
+++ b/forms/source/richtext/richtextunowrapper.hxx
@@ -42,7 +42,7 @@ namespace frm
ORichTextUnoWrapper( EditEngine& _rEngine, IEngineTextChangeListener* _pTextChangeListener );
protected:
- virtual ~ORichTextUnoWrapper() throw();
+ virtual ~ORichTextUnoWrapper() throw() override;
private:
@@ -66,7 +66,7 @@ namespace frm
virtual void UpdateData() override;
protected:
- virtual ~RichTextEditSource();
+ virtual ~RichTextEditSource() override;
private:
RichTextEditSource( const RichTextEditSource& _rSource ) = delete;
diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx
index 9d9ce3bdbb05..6725ab78bd5f 100644
--- a/forms/source/richtext/richtextvclcontrol.hxx
+++ b/forms/source/richtext/richtextvclcontrol.hxx
@@ -52,7 +52,7 @@ namespace frm
ITextSelectionListener* _pSelectionListener
);
- virtual ~RichTextControl( );
+ virtual ~RichTextControl( ) override;
virtual void dispose() override;
/* enables the change notifications for a particular attribute
diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx
index 70118a8bbca4..c8c2fcb6cf73 100644
--- a/forms/source/richtext/rtattributehandler.hxx
+++ b/forms/source/richtext/rtattributehandler.hxx
@@ -62,7 +62,7 @@ namespace frm
virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const;
protected:
- virtual ~AttributeHandler();
+ virtual ~AttributeHandler() override;
};
namespace AttributeHandlerFactory
diff --git a/forms/source/richtext/specialdispatchers.hxx b/forms/source/richtext/specialdispatchers.hxx
index df56daffa464..f7b2e0f0a169 100644
--- a/forms/source/richtext/specialdispatchers.hxx
+++ b/forms/source/richtext/specialdispatchers.hxx
@@ -32,7 +32,7 @@ namespace frm
OSelectAllDispatcher( EditView& _rView, const css::util::URL& _rURL );
protected:
- virtual ~OSelectAllDispatcher();
+ virtual ~OSelectAllDispatcher() override;
// XDispatch
virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments )