diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-12-22 10:50:40 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-25 21:55:39 +0100 |
commit | 76e950bfafd8b44ee47d7a9573df1571652c52e1 (patch) | |
tree | 35c6ea2a240ba08ccf2c4faaaaed18c088f75763 /oox | |
parent | 93c96ec5018f723748557975435eb6c27135b60c (diff) |
various coverity exception warnings
Change-Id: I7b3588ad42e17f2f363b6a247e318f23c95e578e
Reviewed-on: https://gerrit.libreoffice.org/46961
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/diagram/diagramfragmenthandler.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/diagram/diagramfragmenthandler.hxx | 4 | ||||
-rw-r--r-- | oox/source/ppt/extdrawingfragmenthandler.cxx | 1 | ||||
-rw-r--r-- | oox/source/ppt/extdrawingfragmenthandler.hxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/layoutfragmenthandler.cxx | 4 | ||||
-rw-r--r-- | oox/source/ppt/presentationfragmenthandler.cxx | 8 | ||||
-rw-r--r-- | oox/source/shape/ShapeDrawingFragmentHandler.cxx | 6 | ||||
-rw-r--r-- | oox/source/shape/ShapeDrawingFragmentHandler.hxx | 2 |
8 files changed, 12 insertions, 17 deletions
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx index 886d494f726b..836faa309eca 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx @@ -34,7 +34,6 @@ namespace oox { namespace drawingml { DiagramDataFragmentHandler::DiagramDataFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr& rDataPtr ) - throw( ) : FragmentHandler2( rFilter, rFragmentPath ) , mpDataPtr( rDataPtr ) { @@ -68,7 +67,6 @@ DiagramDataFragmentHandler::onCreateContext( ::sal_Int32 aElement, DiagramLayoutFragmentHandler::DiagramLayoutFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr& rDataPtr ) - throw( ) : FragmentHandler2( rFilter, rFragmentPath ) , mpDataPtr( rDataPtr ) { diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx index a26ce533c3ec..7783fdfd8f3c 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx @@ -28,7 +28,7 @@ namespace oox { namespace drawingml { class DiagramDataFragmentHandler : public ::oox::core::FragmentHandler2 { public: - DiagramDataFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr& rDataPtr ) throw(); + DiagramDataFragmentHandler(oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr& rDataPtr); virtual ~DiagramDataFragmentHandler() throw() override; virtual void SAL_CALL endDocument() override; @@ -42,7 +42,7 @@ private: class DiagramLayoutFragmentHandler : public ::oox::core::FragmentHandler2 { public: - DiagramLayoutFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr& rDataPtr ) throw(); + DiagramLayoutFragmentHandler(oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr& rDataPtr); virtual ~DiagramLayoutFragmentHandler() throw() override; virtual void SAL_CALL endDocument() override; diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx index 7d1a3cf6a4a7..a0d40ea0412c 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.cxx +++ b/oox/source/ppt/extdrawingfragmenthandler.cxx @@ -25,7 +25,6 @@ ExtDrawingFragmentHandler::ExtDrawingFragmentHandler( XmlFilterBase& rFilter, const oox::ppt::ShapeLocation eShapeLocation, oox::drawingml::ShapePtr const & pGroupShapePtr, oox::drawingml::ShapePtr const & pShapePtr) - throw( ) : FragmentHandler2( rFilter, rFragmentPath ), mpSlidePersistPtr (rSlidePersistPtr ), meShapeLocation( eShapeLocation ), diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx index 7b1fe76de519..48a1f614c0c8 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.hxx +++ b/oox/source/ppt/extdrawingfragmenthandler.hxx @@ -25,7 +25,7 @@ public: const oox::ppt::SlidePersistPtr& rSlidePersistPtr, const oox::ppt::ShapeLocation eShapeLocation, oox::drawingml::ShapePtr const & pGroupShapePtr, - oox::drawingml::ShapePtr const & pShapePtr ) throw(); + oox::drawingml::ShapePtr const & pShapePtr ); virtual ~ExtDrawingFragmentHandler() throw() override; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) override; diff --git a/oox/source/ppt/layoutfragmenthandler.cxx b/oox/source/ppt/layoutfragmenthandler.cxx index 89e82bcb8db2..39bfa34bb912 100644 --- a/oox/source/ppt/layoutfragmenthandler.cxx +++ b/oox/source/ppt/layoutfragmenthandler.cxx @@ -42,14 +42,12 @@ namespace oox { namespace ppt { // CT_SlideLayout -LayoutFragmentHandler::LayoutFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr ) - throw() +LayoutFragmentHandler::LayoutFragmentHandler(XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr) : SlideFragmentHandler( rFilter, rFragmentPath, std::move(pMasterPersistPtr), Layout ) { } LayoutFragmentHandler::~LayoutFragmentHandler() - throw() { } diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index 3c4a3c109b78..d68d3331c062 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -80,10 +80,10 @@ static std::map<PredefinedClrSchemeId, sal_Int32> PredefinedClrTokens = { folHlink, XML_folHlink } }; -PresentationFragmentHandler::PresentationFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath ) throw() -: FragmentHandler2( rFilter, rFragmentPath ) -, mpTextListStyle( new TextListStyle ) -, mbCommentAuthorsRead(false) +PresentationFragmentHandler::PresentationFragmentHandler(XmlFilterBase& rFilter, const OUString& rFragmentPath) + : FragmentHandler2( rFilter, rFragmentPath ) + , mpTextListStyle( new TextListStyle ) + , mbCommentAuthorsRead(false) { TextParagraphPropertiesVector& rParagraphDefaulsVector( mpTextListStyle->getListStyle() ); TextParagraphPropertiesVector::iterator aParagraphDefaultIter( rParagraphDefaulsVector.begin() ); diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.cxx b/oox/source/shape/ShapeDrawingFragmentHandler.cxx index d6a7e96cc1cb..b26bbd7f992a 100644 --- a/oox/source/shape/ShapeDrawingFragmentHandler.cxx +++ b/oox/source/shape/ShapeDrawingFragmentHandler.cxx @@ -16,9 +16,9 @@ using namespace com::sun::star; namespace oox { namespace shape { -ShapeDrawingFragmentHandler::ShapeDrawingFragmentHandler(oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr const & pGroupShapePtr ) throw() - : FragmentHandler2(rFilter, rFragmentPath), - mpGroupShapePtr(pGroupShapePtr) +ShapeDrawingFragmentHandler::ShapeDrawingFragmentHandler(oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr const & pGroupShapePtr) + : FragmentHandler2(rFilter, rFragmentPath) + , mpGroupShapePtr(pGroupShapePtr) { } diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx index 674a15d8f844..b0711f8878a3 100644 --- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx +++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx @@ -19,7 +19,7 @@ namespace oox { namespace shape { class ShapeDrawingFragmentHandler : public oox::core::FragmentHandler2 { public: - ShapeDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr const & pGroupShapePtr ) throw(); + ShapeDrawingFragmentHandler(oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr const & pGroupShapePtr); virtual ~ShapeDrawingFragmentHandler() throw() override; virtual void SAL_CALL endDocument() override; virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const AttributeList& rAttribs ) override; |