diff options
| -rw-r--r-- | oox/source/drawingml/chart/plotareaconverter.cxx | 5 | ||||
| -rw-r--r-- | oox/source/drawingml/diagram/layoutnodecontext.cxx | 4 | ||||
| -rw-r--r-- | oox/source/ole/olestorage.cxx | 5 | ||||
| -rw-r--r-- | oox/source/ppt/customshowlistcontext.cxx | 6 | ||||
| -rw-r--r-- | oox/source/ppt/timenodelistcontext.cxx | 27 |
5 files changed, 1 insertions, 46 deletions
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx index 71477a92af8a..19784b392b0a 100644 --- a/oox/source/drawingml/chart/plotareaconverter.cxx +++ b/oox/source/drawingml/chart/plotareaconverter.cxx @@ -65,7 +65,6 @@ class AxesSetConverter : public ConverterBase< AxesSetModel > { public: explicit AxesSetConverter( const ConverterRoot& rParent, AxesSetModel& rModel ); - virtual ~AxesSetConverter() override; /** Converts the axes set model to a chart2 diagram. Returns an automatic chart title from a single series title, if possible. */ @@ -99,10 +98,6 @@ AxesSetConverter::AxesSetConverter( const ConverterRoot& rParent, AxesSetModel& { } -AxesSetConverter::~AxesSetConverter() -{ -} - ModelRef< AxisModel > lclGetOrCreateAxis( const AxesSetModel::AxisMap& rFromAxes, sal_Int32 nAxisIdx, sal_Int32 nDefTypeId, bool bMSO2007Doc ) { ModelRef< AxisModel > xAxis = rFromAxes.get( nAxisIdx ); diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx index 9bb90a8d069c..a028d334416f 100644 --- a/oox/source/drawingml/diagram/layoutnodecontext.cxx +++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx @@ -158,10 +158,6 @@ public: { } - virtual ~LayoutVariablePropertySetContext() override - { - } - virtual ContextHandlerRef onCreateContext( ::sal_Int32 aElement, const AttributeList& rAttribs ) throw (SAXException, RuntimeException) override { diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx index 19c665f11dc8..ee8dc65f32d2 100644 --- a/oox/source/ole/olestorage.cxx +++ b/oox/source/ole/olestorage.cxx @@ -58,7 +58,6 @@ public: const Reference< XComponentContext >& rxContext, const Reference< XNameContainer >& rxStorage, const OUString& rElementName ); - virtual ~OleOutputStream() override; virtual void SAL_CALL seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getPosition() throw( IOException, RuntimeException, std::exception ) override; @@ -96,10 +95,6 @@ OleOutputStream::OleOutputStream( const Reference< XComponentContext >& rxContex } } -OleOutputStream::~OleOutputStream() -{ -} - void SAL_CALL OleOutputStream::seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception ) { ensureSeekable(); diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx index e8839abb5b61..cccd54b7e968 100644 --- a/oox/source/ppt/customshowlistcontext.cxx +++ b/oox/source/ppt/customshowlistcontext.cxx @@ -37,7 +37,7 @@ public: CustomShowContext( ::oox::core::FragmentHandler2& rParent, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, CustomShow& rCustomShow ); - virtual ~CustomShowContext( ) override; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; }; @@ -51,10 +51,6 @@ CustomShowContext::CustomShowContext( FragmentHandler2& rParent, mrCustomShow.mnId = rxAttribs->getOptionalValue( XML_id ); } -CustomShowContext::~CustomShowContext( ) -{ -} - ::oox::core::ContextHandlerRef CustomShowContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) { switch( aElementToken ) diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index e795b6e8b129..483442faac2e 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -240,10 +240,6 @@ namespace oox { namespace ppt { } } - virtual ~CmdTimeNodeContext() throw () override - { - } - virtual void onEndElement() override { if( isCurrentElement( PPT_TOKEN( cmd ) ) ) @@ -353,10 +349,6 @@ namespace oox { namespace ppt { mnPrevAc = xAttribs->getOptionalValueToken( XML_prevAc, 0 ); } - virtual ~SequenceTimeNodeContext() throw() override - { - } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) @@ -426,9 +418,6 @@ namespace oox { namespace ppt { , m_byColor( AnimationColorSpace::RGB, 0, 0, 0) { } - virtual ~AnimColorContext() throw() override - { - } virtual void onEndElement() override { @@ -627,10 +616,6 @@ namespace oox { namespace ppt { = makeAny((sal_Int16)AnimationTransformType::SCALE); } - virtual ~AnimScaleContext( ) throw( ) override - { - } - virtual void onEndElement() override { if( isCurrentElement( mnElement ) ) @@ -726,10 +711,6 @@ namespace oox { namespace ppt { } } - virtual ~AnimRotContext( ) throw( ) override - { - } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) @@ -783,10 +764,6 @@ namespace oox { namespace ppt { // TODO make sure the units are right. Likely not. } - virtual ~AnimMotionContext( ) throw() override - { - } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) @@ -866,10 +843,6 @@ namespace oox { namespace ppt { } } - virtual ~AnimEffectContext( ) throw() override - { - } - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override { switch ( aElementToken ) |