diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-04-24 16:41:34 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-24 16:45:40 +0100 |
commit | cb4276278962c2cbd47d0685881fb2460bf31c70 (patch) | |
tree | 9e1cdd099752d517cef86712f80f9399ae8c77e6 /writerfilter/source | |
parent | 7deac4656c53965125c9ec1ca6eb8fcc8d393afa (diff) |
Related: rhbz#1215060 pass std::exceptions through
Change-Id: Ifb3431a50f92b95dfc1e851f9584533271e69324
Diffstat (limited to 'writerfilter/source')
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 48 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 48 |
2 files changed, 48 insertions, 48 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index dc18eaee885c..bb72811ce13d 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -197,7 +197,7 @@ throw (uno::RuntimeException, xml::sax::SAXException, std::exception) void OOXMLFastContextHandler::lcl_startFastElement (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { OOXMLFactory::getInstance()->startAction(this, Element); if( Element == (NMSP_dmlWordDr|XML_positionV) ) @@ -209,7 +209,7 @@ void OOXMLFastContextHandler::lcl_startFastElement void OOXMLFastContextHandler::lcl_endFastElement (Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { OOXMLFactory::getInstance()->endAction(this, Element); } @@ -239,7 +239,7 @@ uno::Reference< xml::sax::XFastContextHandler > OOXMLFastContextHandler::lcl_createFastChildContext (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { return OOXMLFactory::getInstance()->createFastChildContext(this, Element); } @@ -264,7 +264,7 @@ void SAL_CALL OOXMLFastContextHandler::characters void OOXMLFastContextHandler::lcl_characters (const OUString & rString) -throw (uno::RuntimeException, xml::sax::SAXException) +throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { if (!m_bDiscardChildren) OOXMLFactory::getInstance()->characters(this, rString); @@ -949,7 +949,7 @@ OOXMLFastContextHandlerProperties::~OOXMLFastContextHandlerProperties() void OOXMLFastContextHandlerProperties::lcl_endFastElement (Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { endAction(Element); @@ -1095,7 +1095,7 @@ OOXMLFastContextHandlerPropertyTable::~OOXMLFastContextHandlerPropertyTable() void OOXMLFastContextHandlerPropertyTable::lcl_endFastElement (Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { OOXMLPropertySet::Pointer_t pPropSet(mpPropertySet->clone()); OOXMLTableImpl::ValuePointer_t pTmpVal @@ -1136,7 +1136,7 @@ OOXMLValue::Pointer_t OOXMLFastContextHandlerValue::getValue() const void OOXMLFastContextHandlerValue::lcl_endFastElement (Token_t Element) -throw (uno::RuntimeException, xml::sax::SAXException) +throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { sendPropertyToParent(); @@ -1207,7 +1207,7 @@ OOXMLFastContextHandlerTable::createFastChildContext void OOXMLFastContextHandlerTable::lcl_endFastElement (Token_t /*Element*/) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { addCurrentChild(); @@ -1253,7 +1253,7 @@ OOXMLFastContextHandlerXNote::~OOXMLFastContextHandlerXNote() void OOXMLFastContextHandlerXNote::lcl_startFastElement (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { mbForwardEventsSaved = isForwardEvents(); @@ -1268,7 +1268,7 @@ void OOXMLFastContextHandlerXNote::lcl_startFastElement void OOXMLFastContextHandlerXNote::lcl_endFastElement (Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { endAction(Element); @@ -1477,7 +1477,7 @@ OOXMLFastContextHandlerTextTable::~OOXMLFastContextHandlerTextTable() void OOXMLFastContextHandlerTextTable::lcl_startFastElement (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { mpParserState->startTable(); mnTableDepth++; @@ -1496,7 +1496,7 @@ void OOXMLFastContextHandlerTextTable::lcl_startFastElement void OOXMLFastContextHandlerTextTable::lcl_endFastElement (Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { endAction(Element); @@ -1548,7 +1548,7 @@ OOXMLFastContextHandlerShape::~OOXMLFastContextHandlerShape() void OOXMLFastContextHandlerShape::lcl_startFastElement (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { startAction(Element); @@ -1604,7 +1604,7 @@ void OOXMLFastContextHandlerShape::sendShape( Token_t Element ) void OOXMLFastContextHandlerShape::lcl_endFastElement (Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { if (mrShapeContext.is()) { @@ -1633,7 +1633,7 @@ uno::Reference< xml::sax::XFastContextHandler > OOXMLFastContextHandlerShape::lcl_createFastChildContext (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { uno::Reference< xml::sax::XFastContextHandler > xContextHandler; @@ -1705,7 +1705,7 @@ OOXMLFastContextHandlerShape::createUnknownChildContext void OOXMLFastContextHandlerShape::lcl_characters (const OUString & aChars) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { if (mrShapeContext.is()) mrShapeContext->characters(aChars); @@ -1797,7 +1797,7 @@ void OOXMLFastContextHandlerWrapper::addToken( Token_t Token ) void OOXMLFastContextHandlerWrapper::lcl_startFastElement (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { if (mxContext.is()) mxContext->startFastElement(Element, Attribs); @@ -1805,7 +1805,7 @@ void OOXMLFastContextHandlerWrapper::lcl_startFastElement void OOXMLFastContextHandlerWrapper::lcl_endFastElement (Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { if (mxContext.is()) mxContext->endFastElement(Element); @@ -1815,7 +1815,7 @@ uno::Reference< xml::sax::XFastContextHandler > OOXMLFastContextHandlerWrapper::lcl_createFastChildContext (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { uno::Reference< xml::sax::XFastContextHandler > xResult; @@ -1852,7 +1852,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext void OOXMLFastContextHandlerWrapper::lcl_characters (const OUString & aChars) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { if (mxContext.is()) mxContext->characters(aChars); @@ -1987,14 +1987,14 @@ OOXMLFastContextHandlerLinear::OOXMLFastContextHandlerLinear(OOXMLFastContextHan void OOXMLFastContextHandlerLinear::lcl_startFastElement(Token_t Element, const uno::Reference< xml::sax::XFastAttributeList >& Attribs) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { buffer.appendOpeningTag( Element, Attribs ); ++depthCount; } void OOXMLFastContextHandlerLinear::lcl_endFastElement(Token_t Element) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { buffer.appendClosingTag( Element ); if( --depthCount == 0 ) @@ -2004,7 +2004,7 @@ void OOXMLFastContextHandlerLinear::lcl_endFastElement(Token_t Element) uno::Reference< xml::sax::XFastContextHandler > OOXMLFastContextHandlerLinear::lcl_createFastChildContext(Token_t, const uno::Reference< xml::sax::XFastAttributeList >&) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { uno::Reference< xml::sax::XFastContextHandler > xContextHandler; xContextHandler.set( this ); @@ -2012,7 +2012,7 @@ OOXMLFastContextHandlerLinear::lcl_createFastChildContext(Token_t, } void OOXMLFastContextHandlerLinear::lcl_characters(const OUString& aChars) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { buffer.appendCharacters( aChars ); } diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index d6e6933cfb83..a592dd142435 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -216,16 +216,16 @@ protected: unsigned int mnTableDepth; virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); virtual void lcl_characters(const OUString & aChars) - throw (css::uno::RuntimeException, css::xml::sax::SAXException); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); void startAction(Token_t Element); void endAction(Token_t Element); @@ -301,7 +301,7 @@ protected: OOXMLPropertySet::Pointer_t mpPropertySet; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void setParent(OOXMLFastContextHandler * pParent) SAL_OVERRIDE; private: @@ -320,7 +320,7 @@ protected: OOXMLTableImpl mTable; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; }; class OOXMLFastContextHandlerValue : @@ -335,7 +335,7 @@ public: virtual OOXMLValue::Pointer_t getValue() const SAL_OVERRIDE; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual std::string getType() const SAL_OVERRIDE { return "Value"; } @@ -364,7 +364,7 @@ protected: css::uno::Reference<css::xml::sax::XFastContextHandler> mCurrentChild; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return TABLE; } @@ -391,10 +391,10 @@ private: sal_Int32 mnMyXNoteType; virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual ResourceEnum_t getResource() const SAL_OVERRIDE { return STREAM; } }; @@ -440,10 +440,10 @@ public: protected: virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; }; class OOXMLFastContextHandlerShape: public OOXMLFastContextHandlerProperties @@ -482,16 +482,16 @@ protected: ShapeContextRef mrShapeContext; virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void lcl_characters(const OUString & aChars) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; }; @@ -534,16 +534,16 @@ public: protected: virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void lcl_endFastElement(Token_t Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void lcl_characters(const OUString & aChars) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void setId(Id nId) SAL_OVERRIDE; virtual Id getId() const SAL_OVERRIDE; @@ -593,15 +593,15 @@ protected: virtual void process() = 0; virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; - virtual void lcl_endFastElement(Token_t Element) throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + virtual void lcl_endFastElement(Token_t Element) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; - virtual void lcl_characters(const OUString & aChars) throw (css::uno::RuntimeException, css::xml::sax::SAXException) SAL_OVERRIDE; + virtual void lcl_characters(const OUString & aChars) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; // should be private, but not much point in making deep copies of it oox::formulaimport::XmlStreamBuilder buffer; |