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 /include/oox/ppt | |
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 'include/oox/ppt')
-rw-r--r-- | include/oox/ppt/customshowlistcontext.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/layoutfragmenthandler.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/pptimport.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/pptshape.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/presentationfragmenthandler.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/slidefragmenthandler.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/slidemastertextstylescontext.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/slidetimingcontext.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/slidetransitioncontext.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/soundactioncontext.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/timenodelistcontext.hxx | 4 |
11 files changed, 12 insertions, 12 deletions
diff --git a/include/oox/ppt/customshowlistcontext.hxx b/include/oox/ppt/customshowlistcontext.hxx index 5baea22103e5..34964697181e 100644 --- a/include/oox/ppt/customshowlistcontext.hxx +++ b/include/oox/ppt/customshowlistcontext.hxx @@ -48,7 +48,7 @@ namespace oox { namespace ppt { CustomShowListContext( ::oox::core::FragmentHandler2& rParent, std::vector< CustomShow >& rCustomShowList ); - virtual ~CustomShowListContext( ); + virtual ~CustomShowListContext( ) override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; }; diff --git a/include/oox/ppt/layoutfragmenthandler.hxx b/include/oox/ppt/layoutfragmenthandler.hxx index 5ec9351cda23..1afd0e9e7c45 100644 --- a/include/oox/ppt/layoutfragmenthandler.hxx +++ b/include/oox/ppt/layoutfragmenthandler.hxx @@ -35,7 +35,7 @@ class LayoutFragmentHandler : public SlideFragmentHandler { public: LayoutFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr ) throw(); - virtual ~LayoutFragmentHandler() throw(); + virtual ~LayoutFragmentHandler() throw() override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; }; diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index 2a2860721f5e..0d37d75deecd 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -57,7 +57,7 @@ public: PowerPointImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw( css::uno::RuntimeException ); - virtual ~PowerPointImport(); + virtual ~PowerPointImport() override; // from FilterBase virtual bool importDocument() override; diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx index e31eeab48682..5f147929bdde 100644 --- a/include/oox/ppt/pptshape.hxx +++ b/include/oox/ppt/pptshape.hxx @@ -55,7 +55,7 @@ public: PPTShape( const oox::ppt::ShapeLocation eShapeLocation, const sal_Char* pServiceType = nullptr ); - virtual ~PPTShape(); + virtual ~PPTShape() override; using oox::drawingml::Shape::addShape; // addShape is creating and inserting the corresponding XShape. diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx index 0457235e23ce..aeda119cd2f1 100644 --- a/include/oox/ppt/presentationfragmenthandler.hxx +++ b/include/oox/ppt/presentationfragmenthandler.hxx @@ -42,7 +42,7 @@ class PresentationFragmentHandler : public ::oox::core::FragmentHandler2 { public: PresentationFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath ) throw(); - virtual ~PresentationFragmentHandler() throw(); + virtual ~PresentationFragmentHandler() throw() override; virtual void finalizeImport() override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; diff --git a/include/oox/ppt/slidefragmenthandler.hxx b/include/oox/ppt/slidefragmenthandler.hxx index fb6b6f97917b..b6b4a3d57721 100644 --- a/include/oox/ppt/slidefragmenthandler.hxx +++ b/include/oox/ppt/slidefragmenthandler.hxx @@ -38,7 +38,7 @@ class SlideFragmentHandler : public ::oox::core::FragmentHandler2 { public: SlideFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pPersistPtr, const ShapeLocation eShapeLocation ); - virtual ~SlideFragmentHandler(); + virtual ~SlideFragmentHandler() override; virtual void finalizeImport() override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; diff --git a/include/oox/ppt/slidemastertextstylescontext.hxx b/include/oox/ppt/slidemastertextstylescontext.hxx index f70cbd4768d1..a5ca1c2372b2 100644 --- a/include/oox/ppt/slidemastertextstylescontext.hxx +++ b/include/oox/ppt/slidemastertextstylescontext.hxx @@ -33,7 +33,7 @@ class SlideMasterTextStylesContext : public oox::core::FragmentHandler2 { public: SlideMasterTextStylesContext( ::oox::core::FragmentHandler2& rParent, SlidePersistPtr const & pSlidePersistPtr ); - virtual ~SlideMasterTextStylesContext(); + virtual ~SlideMasterTextStylesContext() override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; protected: diff --git a/include/oox/ppt/slidetimingcontext.hxx b/include/oox/ppt/slidetimingcontext.hxx index b13b8ad43a4a..de936ad2a205 100644 --- a/include/oox/ppt/slidetimingcontext.hxx +++ b/include/oox/ppt/slidetimingcontext.hxx @@ -33,7 +33,7 @@ class SlideTimingContext : public ::oox::core::FragmentHandler2 { public: SlideTimingContext( ::oox::core::FragmentHandler2& rParent, TimeNodePtrList & aTimeNodeList ) throw(); - virtual ~SlideTimingContext() throw(); + virtual ~SlideTimingContext() throw() override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; diff --git a/include/oox/ppt/slidetransitioncontext.hxx b/include/oox/ppt/slidetransitioncontext.hxx index 1588cba3ec13..4edaa3fcae9f 100644 --- a/include/oox/ppt/slidetransitioncontext.hxx +++ b/include/oox/ppt/slidetransitioncontext.hxx @@ -38,7 +38,7 @@ namespace oox { namespace ppt { SlideTransitionContext( ::oox::core::FragmentHandler2& rParent, const AttributeList& rAttributes, PropertyMap & aProperties ) throw(); - virtual ~SlideTransitionContext() throw(); + virtual ~SlideTransitionContext() throw() override; virtual void onEndElement() override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; diff --git a/include/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx index 7d7f714d7803..4680332a4fe4 100644 --- a/include/oox/ppt/soundactioncontext.hxx +++ b/include/oox/ppt/soundactioncontext.hxx @@ -37,7 +37,7 @@ class SoundActionContext : public ::oox::core::FragmentHandler2 { public: SoundActionContext( ::oox::core::FragmentHandler2& rParent, PropertyMap & aProperties ) throw(); - virtual ~SoundActionContext() throw(); + virtual ~SoundActionContext() throw() override; virtual void onEndElement() override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx index fe27bba634e6..1012f7328c7b 100644 --- a/include/oox/ppt/timenodelistcontext.hxx +++ b/include/oox/ppt/timenodelistcontext.hxx @@ -38,7 +38,7 @@ namespace oox { namespace ppt { class TimeNodeContext : public ::oox::core::FragmentHandler2 { public: - virtual ~TimeNodeContext() throw(); + virtual ~TimeNodeContext() throw() override; static TimeNodeContext * SAL_CALL makeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32 aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ); @@ -56,7 +56,7 @@ class TimeNodeListContext : public ::oox::core::FragmentHandler2 public: TimeNodeListContext( ::oox::core::FragmentHandler2& rParent, TimeNodePtrList & aList ) throw(); - virtual ~TimeNodeListContext() throw(); + virtual ~TimeNodeListContext() throw() override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; |