diff options
Diffstat (limited to 'cppuhelper')
-rw-r--r-- | cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx | 2 | ||||
-rw-r--r-- | cppuhelper/source/component_context.cxx | 24 | ||||
-rw-r--r-- | cppuhelper/source/exc_thrower.cxx | 10 | ||||
-rw-r--r-- | cppuhelper/source/factory.cxx | 80 | ||||
-rw-r--r-- | cppuhelper/source/macro_expander.cxx | 10 | ||||
-rw-r--r-- | cppuhelper/source/propertysetmixin.cxx | 6 | ||||
-rw-r--r-- | cppuhelper/source/propshlp.cxx | 6 | ||||
-rw-r--r-- | cppuhelper/source/servicemanager.cxx | 22 | ||||
-rw-r--r-- | cppuhelper/source/servicemanager.hxx | 54 | ||||
-rw-r--r-- | cppuhelper/source/tdmgr.cxx | 2 | ||||
-rw-r--r-- | cppuhelper/source/typemanager.cxx | 254 | ||||
-rw-r--r-- | cppuhelper/source/typemanager.hxx | 26 | ||||
-rw-r--r-- | cppuhelper/source/weak.cxx | 20 |
13 files changed, 258 insertions, 258 deletions
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx index ff7c7925276c..847b3b877968 100644 --- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx +++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx @@ -50,7 +50,7 @@ public: : m_pStats(pStats) { m_pStats->m_nAlive++; } virtual ~ContainerListener() { m_pStats->m_nAlive--; } virtual void SAL_CALL disposing( const EventObject& ) - throw (RuntimeException, std::exception) SAL_OVERRIDE + throw (RuntimeException, std::exception) override { m_pStats->m_nDisposed++; } diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index f5d5e9795f16..d6e6aaa21541 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -302,7 +302,7 @@ public: Reference< lang::XComponent > const & xTarget ); virtual void SAL_CALL disposing( lang::EventObject const & rSource ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; }; inline void DisposingForwarder::listen( @@ -356,7 +356,7 @@ protected: protected: Any lookupMap( OUString const & rName ); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; public: ComponentContext( ContextEntry_Init const * pEntries, sal_Int32 nEntries, @@ -365,34 +365,34 @@ public: // XComponentContext virtual Any SAL_CALL getValueByName( OUString const & rName ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual Reference<lang::XMultiComponentFactory> SAL_CALL getServiceManager() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; // XNameContainer virtual void SAL_CALL insertByName( OUString const & name, Any const & element ) throw (lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + lang::WrappedTargetException, RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( OUString const & name ) throw (container::NoSuchElementException, - lang::WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + lang::WrappedTargetException, RuntimeException, std::exception) override; // XNameReplace virtual void SAL_CALL replaceByName( OUString const & name, Any const & element ) throw (lang::IllegalArgumentException,container::NoSuchElementException, - lang::WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + lang::WrappedTargetException, RuntimeException, std::exception) override; // XNameAccess virtual Any SAL_CALL getByName( OUString const & name ) throw (container::NoSuchElementException, - lang::WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + lang::WrappedTargetException, RuntimeException, std::exception) override; virtual Sequence<OUString> SAL_CALL getElementNames() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( OUString const & name ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; // XElementAccess - virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception) override; }; // XNameContainer diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx index 177b1ba8872c..6b8e4d837c79 100644 --- a/cppuhelper/source/exc_thrower.cxx +++ b/cppuhelper/source/exc_thrower.cxx @@ -54,13 +54,13 @@ struct ExceptionThrower : public uno_Interface, XExceptionThrower // XInterface virtual Any SAL_CALL queryInterface( Type const & type ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; // XExceptionThrower - virtual void SAL_CALL throwException( Any const & exc ) throw (Exception, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL rethrowException() throw (Exception, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL throwException( Any const & exc ) throw (Exception, std::exception) override; + virtual void SAL_CALL rethrowException() throw (Exception, std::exception) override; }; extern "C" diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 2c086277015f..0a1e1252582f 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -83,29 +83,29 @@ public: // XInterface Any SAL_CALL queryInterface( const Type & rType ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XSingleServiceFactory Reference<XInterface > SAL_CALL createInstance() - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments) - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XSingleComponentFactory virtual Reference< XInterface > SAL_CALL createInstanceWithContext( Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; + throw (Exception, RuntimeException, std::exception) override; virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; + throw (Exception, RuntimeException, std::exception) override; // XServiceInfo OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; protected: /** @@ -272,40 +272,40 @@ public: // XInterface Any SAL_CALL queryInterface( const Type & rType ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL acquire() throw() SAL_OVERRIDE + throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL acquire() throw() override { OComponentHelper::acquire(); } - void SAL_CALL release() throw() SAL_OVERRIDE + void SAL_CALL release() throw() override { OComponentHelper::release(); } // XSingleServiceFactory Reference<XInterface > SAL_CALL createInstance() - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; Reference<XInterface > SAL_CALL createInstanceWithArguments( const Sequence<Any>& Arguments ) - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XSingleComponentFactory virtual Reference< XInterface > SAL_CALL createInstanceWithContext( Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; + throw (Exception, RuntimeException, std::exception) override; virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; + throw (Exception, RuntimeException, std::exception) override; // XTypeProvider - virtual Sequence< Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; // XAggregation Any SAL_CALL queryAggregation( const Type & rType ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XUnloadingPreference virtual sal_Bool SAL_CALL releaseOnNotification() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // OComponentHelper - void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; private: Reference<XInterface > xTheInstance; @@ -484,49 +484,49 @@ public: // XInterface virtual Any SAL_CALL queryInterface( Type const & type ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; // XTypeProvider virtual Sequence< Type > SAL_CALL getTypes() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; // XPropertySet virtual Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; // OPropertySetHelper - virtual IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual IPropertyArrayHelper & SAL_CALL getInfoHelper() override; virtual sal_Bool SAL_CALL convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, Any const & rValue ) - throw (lang::IllegalArgumentException) SAL_OVERRIDE; + throw (lang::IllegalArgumentException) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, Any const & rValue ) - throw (Exception, std::exception) SAL_OVERRIDE; + throw (Exception, std::exception) override; using OPropertySetHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( - Any & rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + Any & rValue, sal_Int32 nHandle ) const override; // OSingleFactoryHelper Reference<XInterface > createInstanceEveryTime( Reference< XComponentContext > const & xContext ) - throw(css::uno::Exception, css::uno::RuntimeException) SAL_OVERRIDE; + throw(css::uno::Exception, css::uno::RuntimeException) override; // XSingleServiceFactory Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments) - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XSingleComponentFactory Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; + throw (Exception, RuntimeException, std::exception) override; // XServiceInfo Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XUnloadingPreference sal_Bool SAL_CALL releaseOnNotification() - throw( RuntimeException, std::exception) SAL_OVERRIDE; + throw( RuntimeException, std::exception) override; private: @@ -882,20 +882,20 @@ public: // XSingleServiceFactory Reference<XInterface > SAL_CALL createInstance() - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments) - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XServiceInfo OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; //XUnloadingPreference sal_Bool SAL_CALL releaseOnNotification() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; }; diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 3b950622ca65..78c4fe99158b 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -123,7 +123,7 @@ struct mutex_holder class Bootstrap_MacroExpander : public mutex_holder, public t_uno_impl { protected: - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; public: inline Bootstrap_MacroExpander() @@ -133,14 +133,14 @@ public: // XMacroExpander impl virtual OUString SAL_CALL expandMacros( OUString const & exp ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override; // XServiceInfo impl virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; }; diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx index b20cfe20cb95..4b42d33e3368 100644 --- a/cppuhelper/source/propertysetmixin.cxx +++ b/cppuhelper/source/propertysetmixin.cxx @@ -280,15 +280,15 @@ public: explicit Info(Data * data): m_data(data) {} virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::beans::Property SAL_CALL getPropertyByName( rtl::OUString const & name) throw ( - css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & name) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: rtl::Reference< Data > m_data; diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index 91f07bf29aaa..fac09dd906a6 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -79,9 +79,9 @@ public: explicit OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ); // XPropertySetInfo-methods - virtual Sequence< Property > SAL_CALL getProperties() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< Property > SAL_CALL getProperties() throw(css::uno::RuntimeException, std::exception) override; + virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(css::uno::RuntimeException, std::exception) override; }; diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index c58caf891da2..97a831dfeddf 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -446,12 +446,12 @@ private: virtual ~ContentEnumeration() {} virtual sal_Bool SAL_CALL hasMoreElements() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL nextElement() throw ( css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; osl::Mutex mutex_; std::vector< css::uno::Any > factories_; @@ -505,13 +505,13 @@ private: virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::ServiceManager > manager_; std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > @@ -559,30 +559,30 @@ private: virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - createInstance() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createInstance() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( css::uno::Sequence< css::uno::Any > const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual rtl::OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::ServiceManager > manager_; std::weak_ptr< cppuhelper::ServiceManager::Data::Implementation > diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx index 03ed72abe2c8..d888d0c75179 100644 --- a/cppuhelper/source/servicemanager.hxx +++ b/cppuhelper/source/servicemanager.hxx @@ -206,70 +206,70 @@ public: private: virtual ~ServiceManager() {} - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; virtual rtl::OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( rtl::OUString const & aServiceSpecifier) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( rtl::OUString const & ServiceSpecifier, css::uno::Sequence< css::uno::Any > const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( rtl::OUString const & aServiceSpecifier, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( rtl::OUString const & ServiceSpecifier, css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL has(css::uno::Any const & aElement) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insert(css::uno::Any const & aElement) throw ( css::lang::IllegalArgumentException, - css::container::ElementExistException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL remove(css::uno::Any const & aElement) throw ( css::lang::IllegalArgumentException, - css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createContentEnumeration(rtl::OUString const & aServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( rtl::OUString const & aPropertyName, css::uno::Any const & aValue) @@ -277,13 +277,13 @@ private: css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getPropertyValue( rtl::OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( rtl::OUString const & aPropertyName, @@ -291,7 +291,7 @@ private: xListener) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( rtl::OUString const & aPropertyName, @@ -299,7 +299,7 @@ private: aListener) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( rtl::OUString const & PropertyName, @@ -307,7 +307,7 @@ private: aListener) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( rtl::OUString const & PropertyName, @@ -315,21 +315,21 @@ private: aListener) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::beans::Property SAL_CALL getPropertyByName( rtl::OUString const & aName) throw ( - css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & Name) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL disposing(css::lang::EventObject const & Source) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // needs to be called with rBHelper.rMutex locked: bool isDisposed() { return rBHelper.bDisposed || rBHelper.bInDispose; } diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index 6aaf34e6ece5..65f111359259 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -625,7 +625,7 @@ public: // XEventListener virtual void SAL_CALL disposing( lang::EventObject const & rEvt ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; }; void EventListenerImpl::disposing( lang::EventObject const & rEvt ) diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx index 02de9ff43371..aa93761db2b1 100644 --- a/cppuhelper/source/typemanager.cxx +++ b/cppuhelper/source/typemanager.cxx @@ -93,10 +93,10 @@ private: virtual ~SimpleTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return typeClass_; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } css::uno::TypeClass typeClass_; @@ -117,14 +117,14 @@ private: virtual ~SequenceTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_SEQUENCE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getReferencedType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getReferencedType() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(componentType_); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -141,7 +141,7 @@ protected: virtual ~PublishableDescription() {} private: - virtual sal_Bool SAL_CALL isPublished() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isPublished() throw (css::uno::RuntimeException, std::exception) override { return published_; } bool published_; @@ -162,16 +162,16 @@ private: virtual ~ModuleDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_MODULE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMembers() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMembers() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -214,21 +214,21 @@ private: virtual ~EnumTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_ENUM; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual sal_Int32 SAL_CALL getDefaultEnumValue() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return entity_->getMembers()[0].value; } virtual css::uno::Sequence< rtl::OUString > SAL_CALL getEnumNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< sal_Int32 > SAL_CALL getEnumValues() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; rtl::OUString name_; rtl::Reference< unoidl::EnumTypeEntity > entity_; @@ -276,14 +276,14 @@ private: virtual ~PlainStructTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_STRUCT; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + getBaseType() throw (css::uno::RuntimeException, std::exception) override { return entity_->getDirectBase().isEmpty() ? css::uno::Reference< css::reflection::XTypeDescription >() : manager_->resolve(entity_->getDirectBase()); @@ -292,19 +292,19 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< rtl::OUString >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >(); } @@ -352,10 +352,10 @@ private: virtual ~ParameterizedMemberTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_UNKNOWN; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return typeParameterName_; } rtl::OUString typeParameterName_; @@ -382,31 +382,31 @@ private: virtual ~PolymorphicStructTypeTemplateDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_STRUCT; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getBaseType() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::reflection::XTypeDescription >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >(); } @@ -480,32 +480,32 @@ private: virtual ~InstantiatedPolymorphicStructTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_STRUCT; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getBaseType() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::reflection::XTypeDescription >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< rtl::OUString >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -585,14 +585,14 @@ private: virtual ~ExceptionTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_EXCEPTION; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + getBaseType() throw (css::uno::RuntimeException, std::exception) override { return entity_->getDirectBase().isEmpty() ? css::uno::Reference< css::reflection::XTypeDescription >() : manager_->resolve(entity_->getDirectBase()); @@ -601,10 +601,10 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -653,38 +653,38 @@ private: virtual ~AttributeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_INTERFACE_ATTRIBUTE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual rtl::OUString SAL_CALL getMemberName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return attribute_.name; } - virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override { return position_; } - virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override { return attribute_.readOnly; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getType() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(attribute_.type); } - virtual sal_Bool SAL_CALL isBound() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isBound() throw (css::uno::RuntimeException, std::exception) override { return attribute_.bound; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XCompoundTypeDescription > > - SAL_CALL getGetExceptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getGetExceptions() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XCompoundTypeDescription > > - SAL_CALL getSetExceptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getSetExceptions() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -736,14 +736,14 @@ public: private: virtual ~MethodParameter() {} - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return parameter_.name; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getType() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(parameter_.type); } - virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException, std::exception) override { return (parameter_.direction == unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_IN) @@ -752,7 +752,7 @@ private: DIRECTION_IN_OUT); } - virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException, std::exception) override { return (parameter_.direction == unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_OUT) @@ -761,7 +761,7 @@ private: DIRECTION_IN_OUT); } - virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override { return position_; } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -785,35 +785,35 @@ private: virtual ~MethodDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_INTERFACE_METHOD; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual rtl::OUString SAL_CALL getMemberName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return method_.name; } - virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override { return position_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getReturnType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getReturnType() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(method_.returnType); } - virtual sal_Bool SAL_CALL isOneway() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isOneway() throw (css::uno::RuntimeException, std::exception) override { return false; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XMethodParameter > > - SAL_CALL getParameters() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getParameters() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getExceptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getExceptions() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -917,37 +917,37 @@ private: virtual ~InterfaceTypeDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_INTERFACE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getBaseType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + getBaseType() throw (css::uno::RuntimeException, std::exception) override { return entity_->getDirectMandatoryBases().empty() ? css::uno::Reference< css::reflection::XTypeDescription >() : manager_->resolve(entity_->getDirectMandatoryBases()[0].name); } - virtual css::uno::Uik SAL_CALL getUik() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Uik SAL_CALL getUik() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Uik(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceMemberTypeDescription > > - SAL_CALL getMembers() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMembers() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getBaseTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getBaseTypes() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > - SAL_CALL getOptionalBaseTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getOptionalBaseTypes() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -1021,14 +1021,14 @@ private: virtual ~ConstantDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_CONSTANT; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Any SAL_CALL getConstantValue() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return value_; } rtl::OUString name_; @@ -1093,16 +1093,16 @@ private: virtual ~ConstantGroupDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_CONSTANTS; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XConstantTypeDescription > > - SAL_CALL getConstants() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getConstants() throw (css::uno::RuntimeException, std::exception) override; rtl::OUString name_; rtl::Reference< unoidl::ConstantGroupEntity > entity_; @@ -1139,14 +1139,14 @@ private: virtual ~TypedefDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_TYPEDEF; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getReferencedType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getReferencedType() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(entity_->getType()); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1169,24 +1169,24 @@ public: private: virtual ~ConstructorParameter() {} - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return parameter_.name; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getType() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(parameter_.type); } - virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException, std::exception) override { return true; } - virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException, std::exception) override { return false; } - virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override { return position_; } virtual sal_Bool SAL_CALL isRestParameter() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return parameter_.rest; } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1211,21 +1211,21 @@ private: virtual ~ConstructorDescription() {} virtual sal_Bool SAL_CALL isDefaultConstructor() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return constructor_.defaultConstructor; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return constructor_.name; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XParameter > > - SAL_CALL getParameters() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getParameters() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XCompoundTypeDescription > > - SAL_CALL getExceptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getExceptions() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; unoidl::SingleInterfaceBasedServiceEntity::Constructor constructor_; @@ -1280,16 +1280,16 @@ private: virtual ~SingleInterfaceBasedServiceDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_SERVICE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > > - SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > >(); @@ -1298,7 +1298,7 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > > - SAL_CALL getOptionalServices() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getOptionalServices() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > >(); @@ -1307,7 +1307,7 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceTypeDescription > > - SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< @@ -1317,7 +1317,7 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceTypeDescription > > - SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< @@ -1327,7 +1327,7 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::reflection::XPropertyTypeDescription > > - SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< @@ -1335,17 +1335,17 @@ private: } virtual sal_Bool SAL_CALL isSingleInterfaceBased() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return true; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getInterface() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getInterface() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(entity_->getBase()); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceConstructorDescription > > - SAL_CALL getConstructors() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getConstructors() throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< cppuhelper::TypeManager > manager_; rtl::OUString name_; @@ -1383,18 +1383,18 @@ private: virtual ~PropertyDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_PROPERTY; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return property_.name; } virtual sal_Int16 SAL_CALL getPropertyFlags() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return property_.attributes; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getPropertyTypeDescription() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getPropertyTypeDescription() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(property_.type); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1422,49 +1422,49 @@ private: virtual ~AccumulationBasedServiceDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_SERVICE; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > > - SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceTypeDescription > > - SAL_CALL getOptionalServices() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getOptionalServices() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceTypeDescription > > - SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XInterfaceTypeDescription > > - SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::reflection::XPropertyTypeDescription > > - SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isSingleInterfaceBased() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return false; } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL - getInterface() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getInterface() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::reflection::XTypeDescription >(); } virtual css::uno::Sequence< css::uno::Reference< css::reflection::XServiceConstructorDescription > > - SAL_CALL getConstructors() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getConstructors() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence< css::uno::Reference< @@ -1592,25 +1592,25 @@ private: virtual ~InterfaceBasedSingletonDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_SINGLETON; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XServiceTypeDescription > - SAL_CALL getService() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getService() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::reflection::XServiceTypeDescription >(); } virtual sal_Bool SAL_CALL isInterfaceBased() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return true; } virtual css::uno::Reference< css::reflection::XTypeDescription > - SAL_CALL getInterface() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getInterface() throw (css::uno::RuntimeException, std::exception) override { return manager_->resolve(entity_->getBase()); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1638,25 +1638,25 @@ private: virtual ~ServiceBasedSingletonDescription() {} virtual css::uno::TypeClass SAL_CALL getTypeClass() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::TypeClass_SINGLETON; } - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return name_; } virtual css::uno::Reference< css::reflection::XServiceTypeDescription > - SAL_CALL getService() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getService() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::reflection::XServiceTypeDescription >( manager_->resolve(entity_->getBase()), css::uno::UNO_QUERY_THROW); } virtual sal_Bool SAL_CALL isInterfaceBased() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return false; } virtual css::uno::Reference< css::reflection::XTypeDescription > - SAL_CALL getInterface() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + SAL_CALL getInterface() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::reflection::XTypeDescription >(); } rtl::Reference< cppuhelper::TypeManager > manager_; @@ -1684,19 +1684,19 @@ private: virtual ~Enumeration() {} virtual sal_Bool SAL_CALL hasMoreElements() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return !positions_.empty(); } virtual css::uno::Any SAL_CALL nextElement() throw ( css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { return css::uno::makeAny(nextTypeDescription()); } virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL nextTypeDescription() throw ( - css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; bool matches(css::uno::TypeClass tc) const; diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx index d6dfbc0fdfa1..c47fb6f6e489 100644 --- a/cppuhelper/source/typemanager.hxx +++ b/cppuhelper/source/typemanager.hxx @@ -66,45 +66,45 @@ public: private: virtual ~TypeManager() throw (); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; virtual rtl::OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getByHierarchicalName( rtl::OUString const & aName) throw ( - css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByHierarchicalName(rtl::OUString const & aName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL - createEnumeration() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createEnumeration() throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL has(css::uno::Any const & aElement) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insert(css::uno::Any const & aElement) throw ( css::lang::IllegalArgumentException, - css::container::ElementExistException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL remove(css::uno::Any const & aElement) throw ( css::lang::IllegalArgumentException, - css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::reflection::XTypeDescriptionEnumeration > SAL_CALL createTypeDescriptionEnumeration( @@ -114,7 +114,7 @@ private: throw ( css::reflection::NoSuchTypeNameException, css::reflection::InvalidTypeNameException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; void readRdbs(rtl::OUString const & uris); diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx index ee6c09748e8b..d0d8a11b58ae 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -58,14 +58,14 @@ public: {} // XInterface - Any SAL_CALL queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL acquire() throw() SAL_OVERRIDE; - void SAL_CALL release() throw() SAL_OVERRIDE; + Any SAL_CALL queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL acquire() throw() override; + void SAL_CALL release() throw() override; // XAdapter - css::uno::Reference< css::uno::XInterface > SAL_CALL queryAdapted() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL addReference( const css::uno::Reference< css::uno::XReference >& xRef ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL removeReference( const css::uno::Reference< css::uno::XReference >& xRef ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::Reference< css::uno::XInterface > SAL_CALL queryAdapted() throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addReference( const css::uno::Reference< css::uno::XReference >& xRef ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL removeReference( const css::uno::Reference< css::uno::XReference >& xRef ) throw(css::uno::RuntimeException, std::exception) override; /// Called from the weak object if the reference count goes to zero. void SAL_CALL dispose() throw(css::uno::RuntimeException); @@ -324,12 +324,12 @@ public: virtual ~OWeakRefListener(); // XInterface - Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL acquire() throw() SAL_OVERRIDE; - void SAL_CALL release() throw() SAL_OVERRIDE; + Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException, std::exception) override; + void SAL_CALL acquire() throw() override; + void SAL_CALL release() throw() override; // XReference - void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; /// The reference counter. oslInterlockedCount m_aRefCount; |