summaryrefslogtreecommitdiff
path: root/oox/source/crypto
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-25 21:31:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-26 18:22:20 +0100
commit5e21a413c788f839a66d9e4c14e745ed18058db8 (patch)
treed4451246461346a425ad6f796e08bf1514cdd942 /oox/source/crypto
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'oox/source/crypto')
-rw-r--r--oox/source/crypto/DocumentDecryption.cxx28
1 files changed, 14 insertions, 14 deletions
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index c3549b2195e1..b78842955cc4 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -47,22 +47,22 @@ vector<sal_uInt8> convertToVector(Sequence<sal_Int8>& input)
class AgileTokenHandler : public cppu::WeakImplHelper1< XFastTokenHandler >
{
public:
- virtual sal_Int32 SAL_CALL getToken( const OUString& /*nIdentifier*/ ) throw (RuntimeException)
+ virtual sal_Int32 SAL_CALL getToken( const OUString& /*nIdentifier*/ ) throw (RuntimeException, std::exception)
{
return FastToken::DONTKNOW;
}
- virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) throw (RuntimeException)
+ virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) throw (RuntimeException, std::exception)
{
return FastToken::DONTKNOW;
}
- virtual OUString SAL_CALL getIdentifier( sal_Int32 /*nToken*/ ) throw (RuntimeException)
+ virtual OUString SAL_CALL getIdentifier( sal_Int32 /*nToken*/ ) throw (RuntimeException, std::exception)
{
return OUString();
}
- virtual Sequence<sal_Int8> SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) throw (RuntimeException)
+ virtual Sequence<sal_Int8> SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) throw (RuntimeException, std::exception)
{
return Sequence<sal_Int8>();
}
@@ -78,20 +78,20 @@ public:
{}
void SAL_CALL startDocument()
- throw (RuntimeException, SAXException)
+ throw (RuntimeException, SAXException, std::exception)
{}
void SAL_CALL endDocument()
- throw (RuntimeException, SAXException)
+ throw (RuntimeException, SAXException, std::exception)
{}
void SAL_CALL setDocumentLocator( const Reference< XLocator >& /*xLocator*/ )
- throw (RuntimeException, SAXException)
+ throw (RuntimeException, SAXException, std::exception)
{}
void SAL_CALL startFastElement( sal_Int32 /*Element*/, const Reference< XFastAttributeList >& /*Attribs*/ )
- throw (RuntimeException, SAXException)
+ throw (RuntimeException, SAXException, std::exception)
{}
void SAL_CALL startUnknownElement( const OUString& /*aNamespace*/, const OUString& aName, const Reference< XFastAttributeList >& aAttributeList )
- throw (RuntimeException, SAXException)
+ throw (RuntimeException, SAXException, std::exception)
{
if(aName == "keyData")
{
@@ -173,26 +173,26 @@ public:
}
void SAL_CALL endFastElement( sal_Int32 /*aElement*/ )
- throw (RuntimeException, SAXException)
+ throw (RuntimeException, SAXException, std::exception)
{}
void SAL_CALL endUnknownElement( const OUString& /*aNamespace*/, const OUString& /*aName*/ )
- throw (RuntimeException, SAXException)
+ throw (RuntimeException, SAXException, std::exception)
{}
Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 /*aElement*/, const Reference< XFastAttributeList >& /*aAttribs*/ )
- throw (RuntimeException, SAXException)
+ throw (RuntimeException, SAXException, std::exception)
{
return NULL;
}
Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& /*aNamespace*/, const OUString& /*aName*/, const Reference< XFastAttributeList >& /*aAttribs*/ )
- throw (RuntimeException, SAXException)
+ throw (RuntimeException, SAXException, std::exception)
{
return this;
}
void SAL_CALL characters( const OUString& /*aChars*/ )
- throw (RuntimeException, SAXException)
+ throw (RuntimeException, SAXException, std::exception)
{}
};