diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
| commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
| tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /oox/source/crypto | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'oox/source/crypto')
| -rw-r--r-- | oox/source/crypto/DocumentDecryption.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx index 1d68344ff66a..3d8d8c27bf5f 100644 --- a/oox/source/crypto/DocumentDecryption.cxx +++ b/oox/source/crypto/DocumentDecryption.cxx @@ -47,12 +47,12 @@ vector<sal_uInt8> convertToVector(Sequence<sal_Int8>& input) class AgileTokenHandler : public cppu::WeakImplHelper< XFastTokenHandler > { public: - virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) throw (RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) throw (RuntimeException, std::exception) override { return FastToken::DONTKNOW; } - virtual Sequence<sal_Int8> SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) throw (RuntimeException, std::exception) SAL_OVERRIDE + virtual Sequence<sal_Int8> SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) throw (RuntimeException, std::exception) override { return Sequence<sal_Int8>(); } @@ -68,20 +68,20 @@ public: {} void SAL_CALL startDocument() - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override {} void SAL_CALL endDocument() - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override {} void SAL_CALL setDocumentLocator( const Reference< XLocator >& /*xLocator*/ ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override {} void SAL_CALL startFastElement( sal_Int32 /*Element*/, const Reference< XFastAttributeList >& /*Attribs*/ ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override {} void SAL_CALL startUnknownElement( const OUString& /*aNamespace*/, const OUString& aName, const Reference< XFastAttributeList >& aAttributeList ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override { if(aName == "keyData") { @@ -163,26 +163,26 @@ public: } void SAL_CALL endFastElement( sal_Int32 /*aElement*/ ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override {} void SAL_CALL endUnknownElement( const OUString& /*aNamespace*/, const OUString& /*aName*/ ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override {} Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 /*aElement*/, const Reference< XFastAttributeList >& /*aAttribs*/ ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override { return NULL; } Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& /*aNamespace*/, const OUString& /*aName*/, const Reference< XFastAttributeList >& /*aAttribs*/ ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override { return this; } void SAL_CALL characters( const OUString& /*aChars*/ ) - throw (RuntimeException, SAXException, std::exception) SAL_OVERRIDE + throw (RuntimeException, SAXException, std::exception) override {} }; |