[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - writerfilter/source
Caolán McNamara
caolanm at redhat.com
Mon Apr 27 14:29:46 PDT 2015
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 48 +++++++++---------
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 48 +++++++++---------
2 files changed, 48 insertions(+), 48 deletions(-)
New commits:
commit 17aa71dd5ae2b88dd452afe171fc494eb61f6f36
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 24 16:41:34 2015 +0100
Related: rhbz#1215060 pass std::exceptions through
Change-Id: Ifb3431a50f92b95dfc1e851f9584533271e69324
Reviewed-on: https://gerrit.libreoffice.org/15519
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 6f03fdc..b51ae35 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -203,7 +203,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) )
@@ -215,7 +215,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);
}
@@ -245,7 +245,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);
}
@@ -270,7 +270,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);
@@ -992,7 +992,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);
@@ -1136,7 +1136,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
@@ -1177,7 +1177,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();
@@ -1248,7 +1248,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();
@@ -1300,7 +1300,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();
@@ -1315,7 +1315,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);
@@ -1524,7 +1524,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++;
@@ -1543,7 +1543,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);
@@ -1593,7 +1593,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);
@@ -1649,7 +1649,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())
{
@@ -1678,7 +1678,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;
@@ -1750,7 +1750,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);
@@ -1842,7 +1842,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);
@@ -1850,7 +1850,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);
@@ -1860,7 +1860,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;
@@ -1894,7 +1894,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);
@@ -2029,14 +2029,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 )
@@ -2046,7 +2046,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 );
@@ -2054,7 +2054,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 33ea6e0..291a644 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -220,16 +220,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);
@@ -307,7 +307,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:
@@ -326,7 +326,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 :
@@ -341,7 +341,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"; }
@@ -371,7 +371,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; }
@@ -398,10 +398,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; }
};
@@ -447,10 +447,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
@@ -489,16 +489,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;
};
@@ -542,16 +542,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;
@@ -601,15 +601,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;
More information about the Libreoffice-commits
mailing list