diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2021-04-30 08:20:03 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2021-05-02 17:02:28 +0200 |
commit | 10d29c390dd58ed629dd27fe5ed35fae28eceec3 (patch) | |
tree | 7476cbb90fff182c5bec0a5a1ef9c41a3ad29f19 /oox | |
parent | a9243e626193ab4efe3a618413886773336a38e6 (diff) |
throw() -> noexcept, part 2/3: Automatic loplugin:noexcept rewrite
Change-Id: I076f16d0536b534abf0ced4d76051eadb4c0e033
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114949
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'oox')
30 files changed, 54 insertions, 54 deletions
diff --git a/oox/inc/drawingml/effectpropertiescontext.hxx b/oox/inc/drawingml/effectpropertiescontext.hxx index 09ec2f02ec80..d6a931043367 100644 --- a/oox/inc/drawingml/effectpropertiescontext.hxx +++ b/oox/inc/drawingml/effectpropertiescontext.hxx @@ -20,7 +20,7 @@ class EffectPropertiesContext final : public ::oox::core::ContextHandler2 { public: EffectPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, - EffectProperties& rEffectProperties ) throw(); + EffectProperties& rEffectProperties ) noexcept; virtual ~EffectPropertiesContext() override; virtual ::oox::core::ContextHandlerRef diff --git a/oox/inc/drawingml/linepropertiescontext.hxx b/oox/inc/drawingml/linepropertiescontext.hxx index fc7326008da9..470a38c68514 100644 --- a/oox/inc/drawingml/linepropertiescontext.hxx +++ b/oox/inc/drawingml/linepropertiescontext.hxx @@ -32,7 +32,7 @@ class LinePropertiesContext final : public ::oox::core::ContextHandler2 public: LinePropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, const ::oox::AttributeList& rAttributes, - LineProperties& rLineProperties ) throw(); + LineProperties& rLineProperties ) noexcept; virtual ~LinePropertiesContext() override; virtual ::oox::core::ContextHandlerRef diff --git a/oox/inc/drawingml/scene3dcontext.hxx b/oox/inc/drawingml/scene3dcontext.hxx index 400cfff98063..30e392f94830 100644 --- a/oox/inc/drawingml/scene3dcontext.hxx +++ b/oox/inc/drawingml/scene3dcontext.hxx @@ -30,7 +30,7 @@ struct Shape3DProperties; class Scene3DRotationPropertiesContext final : public ::oox::core::ContextHandler2 { public: - Scene3DRotationPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, RotationProperties& rRotationProperties ) throw(); + Scene3DRotationPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, RotationProperties& rRotationProperties ) noexcept; ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; @@ -41,7 +41,7 @@ private: class Scene3DPropertiesContext final : public ::oox::core::ContextHandler2 { public: - Scene3DPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, Shape3DProperties& rShape3DProperties ) throw(); + Scene3DPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, Shape3DProperties& rShape3DProperties ) noexcept; ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: @@ -51,7 +51,7 @@ private: class SceneText3DPropertiesContext final : public ::oox::core::ContextHandler2 { public: - SceneText3DPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, Text3DProperties& rText3DProperties ) throw(); + SceneText3DPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, Text3DProperties& rText3DProperties ) noexcept; ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: @@ -61,7 +61,7 @@ private: class Shape3DPropertiesContext final : public ::oox::core::ContextHandler2 { public: - Shape3DPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, const ::oox::AttributeList& rAttribs, Shape3DProperties& r3DProperties ) throw(); + Shape3DPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, const ::oox::AttributeList& rAttribs, Shape3DProperties& r3DProperties ) noexcept; ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; diff --git a/oox/inc/drawingml/transform2dcontext.hxx b/oox/inc/drawingml/transform2dcontext.hxx index 7184210f0c56..f54b0249380d 100644 --- a/oox/inc/drawingml/transform2dcontext.hxx +++ b/oox/inc/drawingml/transform2dcontext.hxx @@ -31,7 +31,7 @@ class Transform2DContext final : public ::oox::core::ContextHandler2 { public: Transform2DContext( ::oox::core::ContextHandler2Helper const & rParent, - const ::oox::AttributeList& rAttributes, Shape& rShape, bool btxXfrm = false ) throw(); + const ::oox::AttributeList& rAttributes, Shape& rShape, bool btxXfrm = false ) noexcept; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx index de00181069a4..fc2b7e8d80b8 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx @@ -39,7 +39,7 @@ DiagramDataFragmentHandler::DiagramDataFragmentHandler( XmlFilterBase& rFilter, { } -DiagramDataFragmentHandler::~DiagramDataFragmentHandler( ) throw () +DiagramDataFragmentHandler::~DiagramDataFragmentHandler( ) noexcept { } @@ -72,7 +72,7 @@ DiagramLayoutFragmentHandler::DiagramLayoutFragmentHandler( XmlFilterBase& rFilt { } -DiagramLayoutFragmentHandler::~DiagramLayoutFragmentHandler( ) throw () +DiagramLayoutFragmentHandler::~DiagramLayoutFragmentHandler( ) noexcept { } diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx index 933f1a0fbbac..f7024f4c440d 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx @@ -30,7 +30,7 @@ class DiagramDataFragmentHandler : public ::oox::core::FragmentHandler2 { public: DiagramDataFragmentHandler(oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr& rDataPtr); - virtual ~DiagramDataFragmentHandler() throw() override; + virtual ~DiagramDataFragmentHandler() noexcept override; virtual void SAL_CALL endDocument() override; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; @@ -44,7 +44,7 @@ class DiagramLayoutFragmentHandler : public ::oox::core::FragmentHandler2 { public: DiagramLayoutFragmentHandler(oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr& rDataPtr); - virtual ~DiagramLayoutFragmentHandler() throw() override; + virtual ~DiagramLayoutFragmentHandler() noexcept override; virtual void SAL_CALL endDocument() override; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx index b7cb03bc08b6..ea972c742ea9 100644 --- a/oox/source/drawingml/effectpropertiescontext.cxx +++ b/oox/source/drawingml/effectpropertiescontext.cxx @@ -23,7 +23,7 @@ using namespace ::com::sun::star::xml::sax; namespace oox::drawingml { EffectPropertiesContext::EffectPropertiesContext( ContextHandler2Helper const& rParent, - EffectProperties& rEffectProperties ) throw() + EffectProperties& rEffectProperties ) noexcept : ContextHandler2( rParent ) , mrEffectProperties( rEffectProperties ) { diff --git a/oox/source/drawingml/linepropertiescontext.cxx b/oox/source/drawingml/linepropertiescontext.cxx index 322f98aad609..19f713421c63 100644 --- a/oox/source/drawingml/linepropertiescontext.cxx +++ b/oox/source/drawingml/linepropertiescontext.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::xml::sax; namespace oox::drawingml { LinePropertiesContext::LinePropertiesContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, - LineProperties& rLineProperties ) throw() + LineProperties& rLineProperties ) noexcept : ContextHandler2( rParent ) , mrLineProperties( rLineProperties ) { diff --git a/oox/source/drawingml/scene3dcontext.cxx b/oox/source/drawingml/scene3dcontext.cxx index 813f9442c901..e17893472bc2 100644 --- a/oox/source/drawingml/scene3dcontext.cxx +++ b/oox/source/drawingml/scene3dcontext.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star::xml::sax; namespace oox::drawingml { -Scene3DPropertiesContext::Scene3DPropertiesContext( ContextHandler2Helper const & rParent, Shape3DProperties& r3DProperties ) throw() +Scene3DPropertiesContext::Scene3DPropertiesContext( ContextHandler2Helper const & rParent, Shape3DProperties& r3DProperties ) noexcept : ContextHandler2( rParent ) , mr3DProperties( r3DProperties ) { @@ -63,7 +63,7 @@ ContextHandlerRef Scene3DPropertiesContext::onCreateContext( sal_Int32 aElementT return nullptr; } -SceneText3DPropertiesContext::SceneText3DPropertiesContext( ContextHandler2Helper const & rParent, Text3DProperties& r3DProperties ) throw() +SceneText3DPropertiesContext::SceneText3DPropertiesContext( ContextHandler2Helper const & rParent, Text3DProperties& r3DProperties ) noexcept : ContextHandler2( rParent ) , mr3DProperties( r3DProperties ) { @@ -120,7 +120,7 @@ ContextHandlerRef SceneText3DPropertiesContext::onCreateContext( sal_Int32 aElem return nullptr; } -Shape3DPropertiesContext::Shape3DPropertiesContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, Shape3DProperties& r3DProperties ) throw() +Shape3DPropertiesContext::Shape3DPropertiesContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, Shape3DProperties& r3DProperties ) noexcept : ContextHandler2( rParent ) , mr3DProperties( r3DProperties ) { @@ -165,7 +165,7 @@ ContextHandlerRef Shape3DPropertiesContext::onCreateContext( sal_Int32 aElementT return nullptr; } -Scene3DRotationPropertiesContext::Scene3DRotationPropertiesContext( ContextHandler2Helper const & rParent, RotationProperties& rRotationProperties ) throw() +Scene3DRotationPropertiesContext::Scene3DRotationPropertiesContext( ContextHandler2Helper const & rParent, RotationProperties& rRotationProperties ) noexcept : ContextHandler2( rParent ) , mrRotationProperties( rRotationProperties ) { diff --git a/oox/source/drawingml/transform2dcontext.cxx b/oox/source/drawingml/transform2dcontext.cxx index fcd7da9dec0a..19945d23f7af 100644 --- a/oox/source/drawingml/transform2dcontext.cxx +++ b/oox/source/drawingml/transform2dcontext.cxx @@ -30,7 +30,7 @@ using ::oox::core::ContextHandlerRef; namespace oox::drawingml { /** context to import a CT_Transform2D */ -Transform2DContext::Transform2DContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, Shape& rShape, bool btxXfrm ) throw() +Transform2DContext::Transform2DContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, Shape& rShape, bool btxXfrm ) noexcept : ContextHandler2( rParent ) , mrShape( rShape ) , mbtxXfrm ( btxXfrm ) diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx index 00adaaa1599c..5f2faf799de7 100644 --- a/oox/source/ppt/animvariantcontext.cxx +++ b/oox/source/ppt/animvariantcontext.cxx @@ -40,7 +40,7 @@ namespace oox::ppt { { } - AnimVariantContext::~AnimVariantContext( ) throw( ) + AnimVariantContext::~AnimVariantContext( ) noexcept { } diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx index 25f7f7dfa9e1..8830e0e6a73a 100644 --- a/oox/source/ppt/animvariantcontext.hxx +++ b/oox/source/ppt/animvariantcontext.hxx @@ -33,7 +33,7 @@ namespace oox::ppt { { public: AnimVariantContext( ::oox::core::FragmentHandler2 const & rParent, ::sal_Int32 aElement, css::uno::Any & aValue ); - virtual ~AnimVariantContext( ) throw( ) override; + virtual ~AnimVariantContext( ) noexcept override; virtual void onEndElement() override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx index f0fd42c9d075..4ba40925a7e2 100644 --- a/oox/source/ppt/commonbehaviorcontext.cxx +++ b/oox/source/ppt/commonbehaviorcontext.cxx @@ -45,7 +45,7 @@ namespace oox::ppt { { } - CommonBehaviorContext::~CommonBehaviorContext( ) throw( ) + CommonBehaviorContext::~CommonBehaviorContext( ) noexcept { } diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx index 423154b802df..eb6bc28fca36 100644 --- a/oox/source/ppt/commonbehaviorcontext.hxx +++ b/oox/source/ppt/commonbehaviorcontext.hxx @@ -42,7 +42,7 @@ namespace oox::ppt { CommonBehaviorContext( ::oox::core::FragmentHandler2 const & rParent, const TimeNodePtr & pNode ); virtual ~CommonBehaviorContext( ) - throw( ) override; + noexcept override; virtual void onEndElement() override; diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx index 649d6eca2f84..e7d1cf1dce44 100644 --- a/oox/source/ppt/commontimenodecontext.cxx +++ b/oox/source/ppt/commontimenodecontext.cxx @@ -579,7 +579,7 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I xAttribs->getOptionalValue( XML_tmFilter ); } - CommonTimeNodeContext::~CommonTimeNodeContext( ) throw ( ) + CommonTimeNodeContext::~CommonTimeNodeContext( ) noexcept { } diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx index 88695509f7ad..80ca749269e5 100644 --- a/oox/source/ppt/commontimenodecontext.hxx +++ b/oox/source/ppt/commontimenodecontext.hxx @@ -31,7 +31,7 @@ namespace oox::ppt { { public: CommonTimeNodeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode); - virtual ~CommonTimeNodeContext( ) throw( ) override; + virtual ~CommonTimeNodeContext( ) noexcept override; virtual void onEndElement() override; diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx index 50e10ae429c8..4a2145e3c540 100644 --- a/oox/source/ppt/conditioncontext.cxx +++ b/oox/source/ppt/conditioncontext.cxx @@ -94,7 +94,7 @@ namespace oox::ppt { } } - CondContext::~CondContext( ) throw( ) + CondContext::~CondContext( ) noexcept { if( maCond.mnType == 0 || maCond.mnType == PPT_TOKEN(tn)) { @@ -159,7 +159,7 @@ namespace oox::ppt { } CondListContext::~CondListContext( ) - throw( ) + noexcept { } diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx index 095dd91ecf06..fd8d4dd109c4 100644 --- a/oox/source/ppt/conditioncontext.hxx +++ b/oox/source/ppt/conditioncontext.hxx @@ -36,7 +36,7 @@ namespace oox::ppt { CondContext( ::oox::core::FragmentHandler2 const & rParent, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode, AnimationCondition & aCond ); - virtual ~CondContext( ) throw( ) override; + virtual ~CondContext( ) noexcept override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: @@ -52,7 +52,7 @@ namespace oox::ppt { CondListContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const TimeNodePtr & pNode, AnimationConditionList & aCondList ); - virtual ~CondListContext( ) throw( ) override; + virtual ~CondListContext( ) noexcept override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx index 9bb24cbbd846..9aad170c1c4c 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.cxx +++ b/oox/source/ppt/extdrawingfragmenthandler.cxx @@ -33,7 +33,7 @@ ExtDrawingFragmentHandler::ExtDrawingFragmentHandler( XmlFilterBase& rFilter, { } -ExtDrawingFragmentHandler::~ExtDrawingFragmentHandler( ) throw () +ExtDrawingFragmentHandler::~ExtDrawingFragmentHandler( ) noexcept { // Empty DrawingML fallback, need to warn the user at the end. if (mpShapePtr && mpShapePtr->getChildren().empty()) diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx index 8d73cbacac13..22406f3d998f 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.hxx +++ b/oox/source/ppt/extdrawingfragmenthandler.hxx @@ -23,7 +23,7 @@ public: const oox::ppt::ShapeLocation eShapeLocation, oox::drawingml::ShapePtr const & pGroupShapePtr, oox::drawingml::ShapePtr const & pShapePtr ); - virtual ~ExtDrawingFragmentHandler() throw() override; + virtual ~ExtDrawingFragmentHandler() noexcept override; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) override; diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index 128ff31d6267..573dbd0c4234 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -133,7 +133,7 @@ bool PowerPointImport::importDocument() } -bool PowerPointImport::exportDocument() throw() +bool PowerPointImport::exportDocument() noexcept { return false; } diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index 9e7308c7c496..a00b825d8c00 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -95,7 +95,7 @@ PresentationFragmentHandler::PresentationFragmentHandler(XmlFilterBase& rFilter, } } -PresentationFragmentHandler::~PresentationFragmentHandler() throw() +PresentationFragmentHandler::~PresentationFragmentHandler() noexcept { } diff --git a/oox/source/ppt/slidetimingcontext.cxx b/oox/source/ppt/slidetimingcontext.cxx index f05caf97cee7..300249446200 100644 --- a/oox/source/ppt/slidetimingcontext.cxx +++ b/oox/source/ppt/slidetimingcontext.cxx @@ -34,13 +34,13 @@ using namespace ::com::sun::star::xml::sax; namespace oox::ppt { -SlideTimingContext::SlideTimingContext( FragmentHandler2 const & rParent, TimeNodePtrList & aTimeNodeList ) throw() +SlideTimingContext::SlideTimingContext( FragmentHandler2 const & rParent, TimeNodePtrList & aTimeNodeList ) noexcept : FragmentHandler2( rParent ) , maTimeNodeList( aTimeNodeList ) { } -SlideTimingContext::~SlideTimingContext() throw() +SlideTimingContext::~SlideTimingContext() noexcept { } diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx index dfd34a272147..8ec8e0fd82a0 100644 --- a/oox/source/ppt/slidetransitioncontext.cxx +++ b/oox/source/ppt/slidetransitioncontext.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::xml::sax; namespace oox::ppt { -SlideTransitionContext::SlideTransitionContext( FragmentHandler2 const & rParent, const AttributeList& rAttribs, PropertyMap & aProperties ) throw() +SlideTransitionContext::SlideTransitionContext( FragmentHandler2 const & rParent, const AttributeList& rAttribs, PropertyMap & aProperties ) noexcept : FragmentHandler2( rParent ) , maSlideProperties( aProperties ) , mbHasTransition( false ) @@ -62,7 +62,7 @@ SlideTransitionContext::SlideTransitionContext( FragmentHandler2 const & rParent maTransition.setOoxAdvanceTime( rAttribs.getInteger( XML_advTm, -1 ) ); } -SlideTransitionContext::~SlideTransitionContext() throw() +SlideTransitionContext::~SlideTransitionContext() noexcept { } diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx index 4c9d242af092..bac5c6641ed9 100644 --- a/oox/source/ppt/soundactioncontext.cxx +++ b/oox/source/ppt/soundactioncontext.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno; namespace oox::ppt { - SoundActionContext::SoundActionContext( FragmentHandler2 const & rParent, PropertyMap & aProperties ) throw() + SoundActionContext::SoundActionContext( FragmentHandler2 const & rParent, PropertyMap & aProperties ) noexcept : FragmentHandler2( rParent ) , maSlideProperties( aProperties ) , mbHasStartSound( false ) @@ -47,7 +47,7 @@ namespace oox::ppt { { } - SoundActionContext::~SoundActionContext() throw() + SoundActionContext::~SoundActionContext() noexcept { } diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 93525ae4879a..13d9a1d090b9 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -223,7 +223,7 @@ namespace oox::ppt { } - virtual ~SetTimeNodeContext() throw () override + virtual ~SetTimeNodeContext() noexcept override { if(maTo.hasValue()) { @@ -442,7 +442,7 @@ namespace oox::ppt { public: AnimColorContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, - const TimeNodePtr & pNode ) throw() + const TimeNodePtr & pNode ) noexcept : TimeNodeContext( rParent, aElement, pNode ) , mnColorSpace( xAttribs->getOptionalValueToken( XML_clrSpc, 0 ) ) , mnDir( xAttribs->getOptionalValueToken( XML_dir, 0 ) ) @@ -533,7 +533,7 @@ namespace oox::ppt { public: AnimContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, - const TimeNodePtr & pNode ) throw() + const TimeNodePtr & pNode ) noexcept : TimeNodeContext( rParent, aElement, pNode ) { NodePropertyMap & aProps( pNode->getNodeProperties() ); @@ -565,7 +565,7 @@ namespace oox::ppt { mnValueType = xAttribs->getOptionalValueToken( XML_valueType, 0 ); } - virtual ~AnimContext() throw () override + virtual ~AnimContext() noexcept override { if (!msFrom.isEmpty()) { @@ -652,7 +652,7 @@ namespace oox::ppt { public: AnimScaleContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, - const TimeNodePtr & pNode ) throw() + const TimeNodePtr & pNode ) noexcept : TimeNodeContext( rParent, aElement, pNode ) , mbZoomContents( false ) { @@ -730,7 +730,7 @@ namespace oox::ppt { public: AnimRotContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, - const TimeNodePtr & pNode ) throw() + const TimeNodePtr & pNode ) noexcept : TimeNodeContext( rParent, aElement, pNode ) { AttributeList attribs( xAttribs ); @@ -777,7 +777,7 @@ namespace oox::ppt { public: AnimMotionContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, - const TimeNodePtr & pNode ) throw() + const TimeNodePtr & pNode ) noexcept : TimeNodeContext( rParent, aElement, pNode ) { pNode->getNodeProperties()[ NP_TRANSFORMTYPE ] @@ -872,7 +872,7 @@ namespace oox::ppt { public: AnimEffectContext( FragmentHandler2 const & rParent, sal_Int32 aElement, const Reference< XFastAttributeList >& xAttribs, - const TimeNodePtr & pNode ) throw() + const TimeNodePtr & pNode ) noexcept : TimeNodeContext( rParent, aElement, pNode ) { sal_Int32 nDir = xAttribs->getOptionalValueToken( XML_transition, 0 ); @@ -961,26 +961,26 @@ namespace oox::ppt { } TimeNodeContext::TimeNodeContext( FragmentHandler2 const & rParent, sal_Int32 aElement, - const TimeNodePtr & pNode ) throw() + const TimeNodePtr & pNode ) noexcept : FragmentHandler2( rParent ) , mnElement( aElement ) , mpNode( pNode ) { } - TimeNodeContext::~TimeNodeContext( ) throw() + TimeNodeContext::~TimeNodeContext( ) noexcept { } TimeNodeListContext::TimeNodeListContext( FragmentHandler2 const & rParent, TimeNodePtrList & aList ) - throw() + noexcept : FragmentHandler2( rParent ) , maList( aList ) { } - TimeNodeListContext::~TimeNodeListContext( ) throw() + TimeNodeListContext::~TimeNodeListContext( ) noexcept { } diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx index 5c1ceb88523f..bf74b3353cfa 100644 --- a/oox/source/ppt/timetargetelementcontext.cxx +++ b/oox/source/ppt/timetargetelementcontext.cxx @@ -107,7 +107,7 @@ namespace oox::ppt { OSL_ENSURE( mpTarget, "no valid target passed" ); } - TimeTargetElementContext::~TimeTargetElementContext( ) throw( ) + TimeTargetElementContext::~TimeTargetElementContext( ) noexcept { } diff --git a/oox/source/ppt/timetargetelementcontext.hxx b/oox/source/ppt/timetargetelementcontext.hxx index db75f6908baa..29fed88b6aa1 100644 --- a/oox/source/ppt/timetargetelementcontext.hxx +++ b/oox/source/ppt/timetargetelementcontext.hxx @@ -31,7 +31,7 @@ namespace oox::ppt { { public: TimeTargetElementContext( ::oox::core::FragmentHandler2 const & rParent, const AnimTargetElementPtr & aValue ); - virtual ~TimeTargetElementContext( ) throw( ) override; + virtual ~TimeTargetElementContext( ) noexcept override; virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.cxx b/oox/source/shape/ShapeDrawingFragmentHandler.cxx index 3c65844f27de..aafe004faf17 100644 --- a/oox/source/shape/ShapeDrawingFragmentHandler.cxx +++ b/oox/source/shape/ShapeDrawingFragmentHandler.cxx @@ -22,7 +22,7 @@ ShapeDrawingFragmentHandler::ShapeDrawingFragmentHandler(oox::core::XmlFilterBas { } -ShapeDrawingFragmentHandler::~ShapeDrawingFragmentHandler() throw() +ShapeDrawingFragmentHandler::~ShapeDrawingFragmentHandler() noexcept { } diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx index 53ce4d1293ba..68b27f9491ec 100644 --- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx +++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx @@ -20,7 +20,7 @@ class ShapeDrawingFragmentHandler : public oox::core::FragmentHandler2 { public: ShapeDrawingFragmentHandler(oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr const & pGroupShapePtr); - virtual ~ShapeDrawingFragmentHandler() throw() override; + virtual ~ShapeDrawingFragmentHandler() noexcept override; virtual void SAL_CALL endDocument() override; virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const AttributeList& rAttribs ) override; |