1 files changed, 7 insertions, 26 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);
 }