diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
tree | a70f4957c454b443520cbf91250c41d9eea80017 /desktop/source/deployment/registry/sfwk | |
parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) |
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'desktop/source/deployment/registry/sfwk')
-rw-r--r-- | desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx | 16 | ||||
-rw-r--r-- | desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx index 02d9cb43db69..277aa14830d7 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx @@ -48,32 +48,32 @@ public: bool isParsed() { return m_bIsParsed; } // XDocumentHandler virtual void SAL_CALL startDocument() - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ); + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL endDocument() - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ); + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs ) throw ( css::xml::sax::SAXException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL endElement( const OUString & aName ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ); + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL characters( const OUString & aChars ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ); + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ); + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL processingInstruction( const OUString & aTarget, const OUString & aData ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ); + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) - throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ); + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; } } diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index ff89bf124754..788b5e4e408d 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -61,13 +61,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ); + Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ); + Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; public: PackageImpl( @@ -75,8 +75,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend OUString const & url, OUString const & libType, bool bRemoved, OUString const & identifier); // XPackage - virtual OUString SAL_CALL getDescription() throw (RuntimeException, std::exception); - virtual OUString SAL_CALL getLicenseText() throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getDescription() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getLicenseText() throw (RuntimeException, std::exception) SAL_OVERRIDE; }; friend class PackageImpl; @@ -84,7 +84,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, sal_Bool bRemoved, OUString const & identifier, - Reference<XCommandEnvironment> const & xCmdEnv ); + Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; const Reference<deployment::XPackageTypeInfo> m_xTypeInfo; @@ -96,10 +96,10 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception); + getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception); + uno::RuntimeException, std::exception) SAL_OVERRIDE; }; BackendImpl * BackendImpl::PackageImpl::getMyBackend() const |