summaryrefslogtreecommitdiff
path: root/oox/source/shape
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /oox/source/shape
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'oox/source/shape')
-rw-r--r--oox/source/shape/ShapeContextHandler.cxx33
-rw-r--r--oox/source/shape/ShapeContextHandler.hxx75
-rw-r--r--oox/source/shape/ShapeDrawingFragmentHandler.cxx2
-rw-r--r--oox/source/shape/ShapeDrawingFragmentHandler.hxx2
-rw-r--r--oox/source/shape/ShapeFilterBase.cxx4
-rw-r--r--oox/source/shape/ShapeFilterBase.hxx5
6 files changed, 41 insertions, 80 deletions
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 44262e93488a..9af13d245f0c 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -57,7 +57,6 @@ ShapeContextHandler_getSupportedServiceNames()
uno::Reference< uno::XInterface > SAL_CALL
ShapeContextHandler_createInstance( const uno::Reference< uno::XComponentContext > & context)
- throw (uno::Exception)
{
return static_cast< ::cppu::OWeakObject* >( new ShapeContextHandler(context) );
}
@@ -276,7 +275,6 @@ ShapeContextHandler::getContextHandler(sal_Int32 nElement)
void SAL_CALL ShapeContextHandler::startFastElement
(::sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
mxFilterBase->filter(maMediaDescriptor);
@@ -325,7 +323,6 @@ void SAL_CALL ShapeContextHandler::startFastElement
void SAL_CALL ShapeContextHandler::startUnknownElement
(const OUString & Namespace, const OUString & Name,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if ( getContextHandler() == getDrawingShapeContext() )
mpDrawing->getShapes().pushMark();
@@ -337,7 +334,6 @@ void SAL_CALL ShapeContextHandler::startUnknownElement
}
void SAL_CALL ShapeContextHandler::endFastElement(::sal_Int32 Element)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference<XFastContextHandler> xContextHandler(getContextHandler());
@@ -365,7 +361,6 @@ void SAL_CALL ShapeContextHandler::endFastElement(::sal_Int32 Element)
void SAL_CALL ShapeContextHandler::endUnknownElement
(const OUString & Namespace,
const OUString & Name)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference<XFastContextHandler> xContextHandler(getContextHandler());
@@ -377,7 +372,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
ShapeContextHandler::createFastChildContext
(::sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference< xml::sax::XFastContextHandler > xResult;
uno::Reference< xml::sax::XFastContextHandler > xContextHandler(getContextHandler(Element));
@@ -394,7 +388,6 @@ ShapeContextHandler::createUnknownChildContext
(const OUString & Namespace,
const OUString & Name,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference<XFastContextHandler> xContextHandler(getContextHandler());
@@ -406,7 +399,6 @@ ShapeContextHandler::createUnknownChildContext
}
void SAL_CALL ShapeContextHandler::characters(const OUString & aChars)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference<XFastContextHandler> xContextHandler(getContextHandler());
@@ -416,7 +408,7 @@ void SAL_CALL ShapeContextHandler::characters(const OUString & aChars)
// css::xml::sax::XFastShapeContextHandler:
uno::Reference< drawing::XShape > SAL_CALL
-ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception)
+ShapeContextHandler::getShape()
{
uno::Reference< drawing::XShape > xResult;
uno::Reference< drawing::XShapes > xShapes( mxDrawPage, uno::UNO_QUERY );
@@ -543,20 +535,19 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception)
}
css::uno::Reference< css::drawing::XDrawPage > SAL_CALL
-ShapeContextHandler::getDrawPage() throw (css::uno::RuntimeException, std::exception)
+ShapeContextHandler::getDrawPage()
{
return mxDrawPage;
}
void SAL_CALL ShapeContextHandler::setDrawPage
(const css::uno::Reference< css::drawing::XDrawPage > & the_value)
- throw (css::uno::RuntimeException, std::exception)
{
mxDrawPage = the_value;
}
css::uno::Reference< css::frame::XModel > SAL_CALL
-ShapeContextHandler::getModel() throw (css::uno::RuntimeException, std::exception)
+ShapeContextHandler::getModel()
{
if( !mxFilterBase.is() )
throw uno::RuntimeException();
@@ -565,7 +556,6 @@ ShapeContextHandler::getModel() throw (css::uno::RuntimeException, std::exceptio
void SAL_CALL ShapeContextHandler::setModel
(const css::uno::Reference< css::frame::XModel > & the_value)
- throw (css::uno::RuntimeException, std::exception)
{
if( !mxFilterBase.is() )
throw uno::RuntimeException();
@@ -574,76 +564,67 @@ void SAL_CALL ShapeContextHandler::setModel
}
OUString SAL_CALL ShapeContextHandler::getRelationFragmentPath()
- throw (uno::RuntimeException, std::exception)
{
return msRelationFragmentPath;
}
void SAL_CALL ShapeContextHandler::setRelationFragmentPath(const OUString & the_value)
- throw (uno::RuntimeException, std::exception)
{
msRelationFragmentPath = the_value;
}
-::sal_Int32 SAL_CALL ShapeContextHandler::getStartToken() throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL ShapeContextHandler::getStartToken()
{
return mnStartToken;
}
-void SAL_CALL ShapeContextHandler::setStartToken( ::sal_Int32 _starttoken ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ShapeContextHandler::setStartToken( ::sal_Int32 _starttoken )
{
mnStartToken = _starttoken;
}
-awt::Point SAL_CALL ShapeContextHandler::getPosition() throw (uno::RuntimeException, std::exception)
+awt::Point SAL_CALL ShapeContextHandler::getPosition()
{
return maPosition;
}
-void SAL_CALL ShapeContextHandler::setPosition(const awt::Point& rPosition) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ShapeContextHandler::setPosition(const awt::Point& rPosition)
{
maPosition = rPosition;
}
void SAL_CALL ShapeContextHandler::setDocumentProperties(const uno::Reference<document::XDocumentProperties>& xDocProps)
- throw (css::uno::RuntimeException, std::exception)
{
mxDocumentProperties = xDocProps;
mxFilterBase->checkDocumentProperties(mxDocumentProperties);
}
uno::Reference<document::XDocumentProperties> SAL_CALL ShapeContextHandler::getDocumentProperties()
- throw (css::uno::RuntimeException, std::exception)
{
return mxDocumentProperties;
}
uno::Sequence<beans::PropertyValue> SAL_CALL ShapeContextHandler::getMediaDescriptor()
- throw (uno::RuntimeException, std::exception)
{
return maMediaDescriptor;
}
void SAL_CALL ShapeContextHandler::setMediaDescriptor(const uno::Sequence<beans::PropertyValue>& rMediaDescriptor)
- throw (uno::RuntimeException, std::exception)
{
maMediaDescriptor = rMediaDescriptor;
}
OUString ShapeContextHandler::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
return ShapeContextHandler_getImplementationName();
}
uno::Sequence< OUString > ShapeContextHandler::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
return ShapeContextHandler_getSupportedServiceNames();
}
sal_Bool SAL_CALL ShapeContextHandler::supportsService(const OUString & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index c594288d4d80..3270034e2061 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -57,89 +57,70 @@ public:
virtual ~ShapeContextHandler() override;
// css::lang::XServiceInfo:
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService
- (const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
+ (const OUString & ServiceName) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ getSupportedServiceNames() override;
// css::xml::sax::XFastContextHandler:
virtual void SAL_CALL startFastElement
(::sal_Int32 Element,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
virtual void SAL_CALL startUnknownElement
(const OUString & Namespace,
const OUString & Name,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void SAL_CALL endFastElement(::sal_Int32 Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL endFastElement(::sal_Int32 Element) override;
virtual void SAL_CALL endUnknownElement
(const OUString & Namespace,
- const OUString & Name)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const OUString & Name) override;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext
(::sal_Int32 Element,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createUnknownChildContext
(const OUString & Namespace,
const OUString & Name,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void SAL_CALL characters(const OUString & aChars)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL characters(const OUString & aChars) override;
// css::xml::sax::XFastShapeContextHandler:
- virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getShape()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getShape() override;
- virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() override;
virtual void SAL_CALL setDrawPage
- (const css::uno::Reference< css::drawing::XDrawPage > & the_value)
- throw (css::uno::RuntimeException, std::exception) override;
+ (const css::uno::Reference< css::drawing::XDrawPage > & the_value) override;
- virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() override;
virtual void SAL_CALL setModel
- (const css::uno::Reference< css::frame::XModel > & the_value)
- throw (css::uno::RuntimeException, std::exception) override;
+ (const css::uno::Reference< css::frame::XModel > & the_value) override;
- virtual OUString SAL_CALL getRelationFragmentPath()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getRelationFragmentPath() override;
virtual void SAL_CALL setRelationFragmentPath
- (const OUString & the_value)
- throw (css::uno::RuntimeException, std::exception) override;
-
- virtual ::sal_Int32 SAL_CALL getStartToken() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) throw (css::uno::RuntimeException, std::exception) override;
-
- virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) throw (css::uno::RuntimeException, std::exception) override;
-
- virtual void SAL_CALL setDocumentProperties(const css::uno::Reference<css::document::XDocumentProperties>& xDocProps)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference<css::document::XDocumentProperties> SAL_CALL getDocumentProperties()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getMediaDescriptor()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setMediaDescriptor(const css::uno::Sequence<css::beans::PropertyValue>& rMediaDescriptor)
- throw (css::uno::RuntimeException, std::exception) override;
+ (const OUString & the_value) override;
+
+ virtual ::sal_Int32 SAL_CALL getStartToken() override;
+ virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) override;
+
+ virtual css::awt::Point SAL_CALL getPosition() override;
+ virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) override;
+
+ virtual void SAL_CALL setDocumentProperties(const css::uno::Reference<css::document::XDocumentProperties>& xDocProps) override;
+ virtual css::uno::Reference<css::document::XDocumentProperties> SAL_CALL getDocumentProperties() override;
+ virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getMediaDescriptor() override;
+ virtual void SAL_CALL setMediaDescriptor(const css::uno::Sequence<css::beans::PropertyValue>& rMediaDescriptor) override;
private:
ShapeContextHandler(ShapeContextHandler &) = delete;
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.cxx b/oox/source/shape/ShapeDrawingFragmentHandler.cxx
index 32aa09c6d3b2..d6a7e96cc1cb 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.cxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.cxx
@@ -26,7 +26,7 @@ ShapeDrawingFragmentHandler::~ShapeDrawingFragmentHandler() throw()
{
}
-void SAL_CALL ShapeDrawingFragmentHandler::endDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL ShapeDrawingFragmentHandler::endDocument()
{
}
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
index b4e202b15694..7f894a50f62c 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
@@ -21,7 +21,7 @@ class ShapeDrawingFragmentHandler : public oox::core::FragmentHandler2
public:
ShapeDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr const & pGroupShapePtr ) throw();
virtual ~ShapeDrawingFragmentHandler() throw() override;
- virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL endDocument() override;
virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const AttributeList& rAttribs ) override;
private:
diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx
index a307d5cb8cc4..1f8b78a93230 100644
--- a/oox/source/shape/ShapeFilterBase.cxx
+++ b/oox/source/shape/ShapeFilterBase.cxx
@@ -28,7 +28,7 @@ namespace shape {
using namespace ::com::sun::star;
-ShapeFilterBase::ShapeFilterBase( const uno::Reference< uno::XComponentContext >& rxContext ) throw( uno::RuntimeException ) :
+ShapeFilterBase::ShapeFilterBase( const uno::Reference< uno::XComponentContext >& rxContext ) :
XmlFilterBase( rxContext ),
mxChartConv( new ::oox::drawingml::chart::ChartConverter )
{
@@ -68,7 +68,7 @@ const ::oox::drawingml::table::TableStyleListPtr ShapeFilterBase::getTableStyles
return new ::oox::ole::VbaProject( getComponentContext(), getModel(), "Writer" );
}
-OUString ShapeFilterBase::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString ShapeFilterBase::getImplementationName()
{
return OUString();
}
diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx
index 5bb339b6e41c..64bc926770e2 100644
--- a/oox/source/shape/ShapeFilterBase.hxx
+++ b/oox/source/shape/ShapeFilterBase.hxx
@@ -37,8 +37,7 @@ public:
/// @throws css::uno::RuntimeException
explicit ShapeFilterBase(
- const css::uno::Reference< css::uno::XComponentContext >& rxContext )
- throw( css::uno::RuntimeException );
+ const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~ShapeFilterBase() override;
@@ -62,7 +61,7 @@ public:
private:
virtual ::oox::ole::VbaProject* implCreateVbaProject() const override;
- virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
virtual GraphicHelper* implCreateGraphicHelper() const override;
std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;