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 /framework/inc/macros | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'framework/inc/macros')
-rw-r--r-- | framework/inc/macros/xinterface.hxx | 6 | ||||
-rw-r--r-- | framework/inc/macros/xserviceinfo.hxx | 6 | ||||
-rw-r--r-- | framework/inc/macros/xtypeprovider.hxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx index 2667ec3286d2..041ead524b11 100644 --- a/framework/inc/macros/xinterface.hxx +++ b/framework/inc/macros/xinterface.hxx @@ -189,9 +189,9 @@ ________________________________________________________________________________ // declaration of XInterface #define FWK_DECLARE_XINTERFACE \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ - virtual void SAL_CALL acquire ( ) throw() SAL_OVERRIDE; \ - virtual void SAL_CALL release ( ) throw() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; \ + virtual void SAL_CALL acquire ( ) throw() override; \ + virtual void SAL_CALL release ( ) throw() override; // public // implementation of XInterface diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index 514f3c8249d8..a41aa8091e70 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -145,9 +145,9 @@ namespace framework{ #define DECLARE_XSERVICEINFO_NOFACTORY \ /* interface XServiceInfo */ \ - virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ - virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ + virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException, std::exception ) override; \ + virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; \ + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException, std::exception ) override; \ /* Helper for XServiceInfo */ \ static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \ static OUString SAL_CALL impl_getStaticImplementationName ( ); \ diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx index f26bc980c168..4f287281cff3 100644 --- a/framework/inc/macros/xtypeprovider.hxx +++ b/framework/inc/macros/xtypeprovider.hxx @@ -203,8 +203,8 @@ ________________________________________________________________________________ // declaration of XTypeProvider #define FWK_DECLARE_XTYPEPROVIDER \ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes () throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;\ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes () throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;\ + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // public // implementation of XTypeProvider |