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 /comphelper/source/container | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'comphelper/source/container')
4 files changed, 48 insertions, 48 deletions
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index e5843fbf4e0b..2ab5572332cf 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -42,33 +42,33 @@ public: // XIndexContainer virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // XIndexReplace virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // XElementAccess 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; + throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - static versions (used for component registration) static OUString SAL_CALL getImplementationName_static(); diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index 513813fce232..69f2b384e80e 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -43,35 +43,35 @@ public: // XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNameAccess virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XElementAccess 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; + throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - static versions (used for component registration) static OUString SAL_CALL getImplementationName_static(); diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 6f409e8ca96c..f8f3ea8a9a6d 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -161,31 +161,31 @@ namespace comphelper virtual ~EnumerableMap(); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override; // XEnumerableMap - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createKeyEnumeration( sal_Bool _Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createValueEnumeration( sal_Bool _Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createElementEnumeration( sal_Bool _Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createKeyEnumeration( sal_Bool _Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createValueEnumeration( sal_Bool _Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createElementEnumeration( sal_Bool _Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XMap - virtual Type SAL_CALL getKeyType() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Type SAL_CALL getValueType() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL clear( ) throw (NoSupportException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual Any SAL_CALL get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual Any SAL_CALL put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual Any SAL_CALL remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual Type SAL_CALL getKeyType() throw (RuntimeException, std::exception) override; + virtual Type SAL_CALL getValueType() throw (RuntimeException, std::exception) override; + virtual void SAL_CALL clear( ) throw (NoSupportException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override; + virtual Any SAL_CALL get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override; + virtual Any SAL_CALL put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override; + virtual Any SAL_CALL remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override; // XElementAccess (base of XMap) - 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; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) override; public: // XServiceInfo, static version (used for component registration) @@ -283,8 +283,8 @@ namespace comphelper } // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (RuntimeException, std::exception) override; + virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; protected: virtual ~MapEnumeration() diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index 294a5f7ee7ed..a7b419b9a74d 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -46,30 +46,30 @@ namespace comphelper // XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByName( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; // XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNameAccess virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XElementAccess virtual sal_Bool SAL_CALL hasElements( ) - 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; private: SvGenericNameContainerMapImpl maProperties; |