Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

11 files changed, 188 insertions, 188 deletions

diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 8de055b8c0b4..dc89399837e2 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -90,62 +90,62 @@ namespace fileaccess {
         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;
+            throw( com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL
         acquire(
             void )
-            throw() SAL_OVERRIDE;
+            throw() override;
 
         virtual void SAL_CALL
         release(
             void )
-            throw() SAL_OVERRIDE;
+            throw() override;
 
 
         // XComponent
         virtual void SAL_CALL
         dispose(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         addEventListener(
             const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
         // XTypeProvider
 
         virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-            throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( css::uno::RuntimeException, std::exception ) override;
         virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
-            throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( css::uno::RuntimeException, std::exception ) override;
 
 
         // XServiceInfo
         virtual OUString SAL_CALL
         getImplementationName()
-            throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         supportsService( const OUString& ServiceName )
-            throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedServiceNames()
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
         // XCommandProcessor
         virtual sal_Int32 SAL_CALL
         createCommandIdentifier(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual com::sun::star::uno::Any SAL_CALL
         execute(
@@ -154,34 +154,34 @@ namespace fileaccess {
             const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment )
             throw( com::sun::star::uno::Exception,
                    com::sun::star::ucb::CommandAbortedException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         abort(
             sal_Int32 CommandId )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
         // XContent
         virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL
         getIdentifier(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual OUString SAL_CALL
         getContentType(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         addContentEventListener(
             const com::sun::star::uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         removeContentEventListener(
             const com::sun::star::uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         // XPropertiesChangeNotifier
 
@@ -190,13 +190,13 @@ namespace fileaccess {
             const com::sun::star::uno::Sequence< OUString >& PropertyNames,
             const com::sun::star::uno::Reference<
             com::sun::star::beans::XPropertiesChangeListener >& Listener )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         removePropertiesChangeListener( const com::sun::star::uno::Sequence< OUString >& PropertyNames,
                                         const com::sun::star::uno::Reference<
                                         com::sun::star::beans::XPropertiesChangeListener >& Listener )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         // XPropertyContainer
 
@@ -208,14 +208,14 @@ namespace fileaccess {
             throw( com::sun::star::beans::PropertyExistException,
                    com::sun::star::beans::IllegalTypeException,
                    com::sun::star::lang::IllegalArgumentException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL
         removeProperty(
             const OUString& Name )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::beans::NotRemoveableException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         // XPropertySetInfoChangeNotifier
 
@@ -223,13 +223,13 @@ namespace fileaccess {
         addPropertySetInfoChangeListener(
             const com::sun::star::uno::Reference<
             com::sun::star::beans::XPropertySetInfoChangeListener >& Listener )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         removePropertySetInfoChangeListener(
             const com::sun::star::uno::Reference<
             com::sun::star::beans::XPropertySetInfoChangeListener >& Listener )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
         // XContentCreator
@@ -237,33 +237,33 @@ namespace fileaccess {
         virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL
         queryCreatableContentsInfo(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL
         createNewContent(
             const com::sun::star::ucb::ContentInfo& Info )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
         // XChild
         virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
         getParent(
-            void ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            void ) throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         // Not supported
         virtual void SAL_CALL
         setParent( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& Parent )
             throw( com::sun::star::lang::NoSupportException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
 
         // Notifier
 
-        ContentEventNotifier*          cDEL() SAL_OVERRIDE;
-        ContentEventNotifier*          cEXC( const OUString& aNewName ) SAL_OVERRIDE;
-        ContentEventNotifier*          cCEL() SAL_OVERRIDE;
-        PropertySetInfoChangeNotifier* cPSL() SAL_OVERRIDE;
-        PropertyChangeNotifier*        cPCL() SAL_OVERRIDE;
+        ContentEventNotifier*          cDEL() override;
+        ContentEventNotifier*          cEXC( const OUString& aNewName ) override;
+        ContentEventNotifier*          cCEL() override;
+        PropertySetInfoChangeNotifier* cPSL() override;
+        PropertyChangeNotifier*        cPCL() override;
 
     private:
         // Data members
diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx
index e33a6de6c084..27daba8a6b1f 100644
--- a/ucb/source/ucp/file/filcmd.hxx
+++ b/ucb/source/ucp/file/filcmd.hxx
@@ -47,46 +47,46 @@ namespace fileaccess {
         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;
+            throw( com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL
         acquire(
             void )
-            throw() SAL_OVERRIDE;
+            throw() override;
 
         virtual void SAL_CALL
         release(
             void )
-            throw() SAL_OVERRIDE;
+            throw() override;
 
         // XCommandInfo
 
         virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > SAL_CALL
         getCommands(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::ucb::CommandInfo SAL_CALL
         getCommandInfoByName(
             const OUString& Name )
             throw( com::sun::star::ucb::UnsupportedCommandException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::ucb::CommandInfo SAL_CALL
         getCommandInfoByHandle(
             sal_Int32 Handle )
             throw( com::sun::star::ucb::UnsupportedCommandException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual sal_Bool SAL_CALL
         hasCommandByName(
             const OUString& Name )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual sal_Bool SAL_CALL
         hasCommandByHandle(
             sal_Int32 Handle )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
     private:
diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx
index 54c25408479e..8d58001f4df0 100644
--- a/ucb/source/ucp/file/filid.hxx
+++ b/ucb/source/ucp/file/filid.hxx
@@ -45,39 +45,39 @@ namespace fileaccess {
         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;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         acquire(
             void )
-            throw() SAL_OVERRIDE;
+            throw() override;
 
         virtual void SAL_CALL
         release(
             void )
-            throw() SAL_OVERRIDE;
+            throw() override;
 
         // XTypeProvider
         virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
         getTypes(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
         getImplementationId(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         // XContentIdentifier
         virtual OUString SAL_CALL
         getContentIdentifier(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual OUString SAL_CALL
         getContentProviderScheme(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     private:
         OUString m_aContentId;              // The URL string
diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx
index 579dd6323fae..d97bca854611 100644
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.hxx
@@ -57,24 +57,24 @@ namespace fileaccess {
         // XTypeProvider
 
         virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-            throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( css::uno::RuntimeException, std::exception ) override;
         virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-            throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( css::uno::RuntimeException, std::exception ) override;
 
         virtual com::sun::star::uno::Any SAL_CALL
         queryInterface(
             const com::sun::star::uno::Type& rType )
-            throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL
         acquire(
             void )
-            throw() SAL_OVERRIDE;
+            throw() override;
 
         virtual void SAL_CALL
         release(
             void )
-            throw() SAL_OVERRIDE;
+            throw() override;
 
         virtual sal_Int32 SAL_CALL
         readBytes(
@@ -83,7 +83,7 @@ namespace fileaccess {
             throw( com::sun::star::io::NotConnectedException,
                    com::sun::star::io::BufferSizeExceededException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Int32 SAL_CALL
         readSomeBytes(
@@ -92,7 +92,7 @@ namespace fileaccess {
             throw( com::sun::star::io::NotConnectedException,
                    com::sun::star::io::BufferSizeExceededException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL
         skipBytes(
@@ -100,40 +100,40 @@ namespace fileaccess {
             throw( com::sun::star::io::NotConnectedException,
                    com::sun::star::io::BufferSizeExceededException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual sal_Int32 SAL_CALL
         available(
             void )
             throw( com::sun::star::io::NotConnectedException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         closeInput(
             void )
             throw( com::sun::star::io::NotConnectedException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         seek(
             sal_Int64 location )
             throw( com::sun::star::lang::IllegalArgumentException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual sal_Int64 SAL_CALL
         getPosition(
             void )
             throw( com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual sal_Int64 SAL_CALL
         getLength(
             void )
             throw( com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
     private:
 
diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx
index 5e142876be2f..4ed056c1b4d1 100644
--- a/ucb/source/ucp/file/filinsreq.hxx
+++ b/ucb/source/ucp/file/filinsreq.hxx
@@ -46,13 +46,13 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper<
         }
 
         virtual void SAL_CALL select()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (::com::sun::star::uno::RuntimeException, std::exception) override
         {
             m_bSelected = true;
         }
 
         void SAL_CALL setName(const OUString& Name)
-            throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw(::com::sun::star::uno::RuntimeException, std::exception) override
         {
             m_aNewName = Name;
         }
@@ -86,7 +86,7 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper<
         }
 
         virtual void SAL_CALL select()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+            throw (::com::sun::star::uno::RuntimeException, std::exception) override
         {
             m_bSelected = true;
         }
diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx
index 7b796654567e..b3c53ea1ae64 100644
--- a/ucb/source/ucp/file/filprp.hxx
+++ b/ucb/source/ucp/file/filprp.hxx
@@ -40,17 +40,17 @@ class XPropertySetInfo_impl : public cppu::WeakImplHelper<
         virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > SAL_CALL
         getProperties(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual com::sun::star::beans::Property SAL_CALL
         getPropertyByName(
             const OUString& aName )
             throw( com::sun::star::beans::UnknownPropertyException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         hasPropertyByName( const OUString& Name )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     private:
         shell*                                                                     m_pMyShell;
diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx
index a2cec70506ef..1e900f1b49a3 100644
--- a/ucb/source/ucp/file/filrow.hxx
+++ b/ucb/source/ucp/file/filrow.hxx
@@ -39,123 +39,123 @@ namespace fileaccess {
         wasNull(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual OUString SAL_CALL
         getString(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         getBoolean(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Int8 SAL_CALL
         getByte(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Int16 SAL_CALL
         getShort(
             sal_Int32 columnIndex )
             throw(
                 com::sun::star::sdbc::SQLException,
-                com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual sal_Int32 SAL_CALL
         getInt(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual sal_Int64 SAL_CALL
         getLong(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual float SAL_CALL
         getFloat(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual double SAL_CALL
         getDouble(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
         getBytes(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::util::Date SAL_CALL
         getDate(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::util::Time SAL_CALL
         getTime(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::util::DateTime SAL_CALL
         getTimestamp(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL
         getBinaryStream(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL
         getCharacterStream(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::uno::Any SAL_CALL
         getObject(
             sal_Int32 columnIndex,
             const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRef > SAL_CALL
         getRef(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob > SAL_CALL
         getBlob(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XClob > SAL_CALL
         getClob(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XArray > SAL_CALL
         getArray(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
     private:
         osl::Mutex                                                              m_aMutex;
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index c8e104a2cba1..26758a4a5541 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -61,27 +61,27 @@ class XResultSet_impl : public Notifier,
 
         virtual ~XResultSet_impl();
 
-        virtual ContentEventNotifier*        cDEL() SAL_OVERRIDE
+        virtual ContentEventNotifier*        cDEL() override
         {
             return 0;
         }
 
-        virtual ContentEventNotifier*        cEXC( const OUString& ) SAL_OVERRIDE
+        virtual ContentEventNotifier*        cEXC( const OUString& ) override
         {
             return 0;
         }
 
-        virtual ContentEventNotifier*          cCEL() SAL_OVERRIDE
+        virtual ContentEventNotifier*          cCEL() override
         {
             return 0;
         }
 
-        virtual PropertySetInfoChangeNotifier* cPSL() SAL_OVERRIDE
+        virtual PropertySetInfoChangeNotifier* cPSL() override
         {
             return 0;
         }
 
-        virtual PropertyChangeNotifier*        cPCL() SAL_OVERRIDE
+        virtual PropertyChangeNotifier*        cPCL() override
         {
             return 0;
         }
@@ -93,22 +93,22 @@ class XResultSet_impl : public Notifier,
         virtual void SAL_CALL
         disposing(
             const com::sun::star::lang::EventObject& Source )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         // XComponent
         virtual void SAL_CALL
         dispose(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         addEventListener(
             const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
         // XRow
@@ -116,7 +116,7 @@ class XResultSet_impl : public Notifier,
         wasNull(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception ) override
         {
             if( 0<= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 m_nWasNull = m_aItems[m_nRow]->wasNull();
@@ -129,7 +129,7 @@ class XResultSet_impl : public Notifier,
         getString(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getString( columnIndex );
@@ -141,7 +141,7 @@ class XResultSet_impl : public Notifier,
         getBoolean(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBoolean( columnIndex );
@@ -153,7 +153,7 @@ class XResultSet_impl : public Notifier,
         getByte(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getByte( columnIndex );
@@ -166,7 +166,7 @@ class XResultSet_impl : public Notifier,
             sal_Int32 columnIndex )
             throw(
                 com::sun::star::sdbc::SQLException,
-                com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getShort( columnIndex );
@@ -178,7 +178,7 @@ class XResultSet_impl : public Notifier,
         getInt(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getInt( columnIndex );
@@ -190,7 +190,7 @@ class XResultSet_impl : public Notifier,
         getLong(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getLong( columnIndex );
@@ -202,7 +202,7 @@ class XResultSet_impl : public Notifier,
         getFloat(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getFloat( columnIndex );
@@ -214,7 +214,7 @@ class XResultSet_impl : public Notifier,
         getDouble(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getDouble( columnIndex );
@@ -226,7 +226,7 @@ class XResultSet_impl : public Notifier,
         getBytes(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBytes( columnIndex );
@@ -238,7 +238,7 @@ class XResultSet_impl : public Notifier,
         getDate(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getDate( columnIndex );
@@ -250,7 +250,7 @@ class XResultSet_impl : public Notifier,
         getTime(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getTime( columnIndex );
@@ -262,7 +262,7 @@ class XResultSet_impl : public Notifier,
         getTimestamp(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getTimestamp( columnIndex );
@@ -274,7 +274,7 @@ class XResultSet_impl : public Notifier,
         getBinaryStream(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBinaryStream( columnIndex );
@@ -286,7 +286,7 @@ class XResultSet_impl : public Notifier,
         getCharacterStream(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getCharacterStream( columnIndex );
@@ -299,7 +299,7 @@ class XResultSet_impl : public Notifier,
             sal_Int32 columnIndex,
             const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getObject( columnIndex,typeMap );
@@ -311,7 +311,7 @@ class XResultSet_impl : public Notifier,
         getRef(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getRef( columnIndex );
@@ -323,7 +323,7 @@ class XResultSet_impl : public Notifier,
         getBlob(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBlob( columnIndex );
@@ -335,7 +335,7 @@ class XResultSet_impl : public Notifier,
         getClob(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getClob( columnIndex );
@@ -347,7 +347,7 @@ class XResultSet_impl : public Notifier,
         getArray(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+                   com::sun::star::uno::RuntimeException, std::exception) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getArray( columnIndex );
@@ -362,110 +362,110 @@ class XResultSet_impl : public Notifier,
         next(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         isBeforeFirst(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         isAfterLast(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         isFirst(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         isLast(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL
         beforeFirst(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL
         afterLast(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         first(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         last(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Int32 SAL_CALL
         getRow(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         absolute(
             sal_Int32 row )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         relative(
             sal_Int32 rows )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         previous(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL
         refreshRow(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         rowUpdated(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         rowInserted(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual sal_Bool SAL_CALL
         rowDeleted(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
 
         virtual  com::sun::star::uno::Reference<  com::sun::star::uno::XInterface > SAL_CALL
         getStatement(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
 
         // XDynamicResultSet
@@ -474,25 +474,25 @@ class XResultSet_impl : public Notifier,
         getStaticResultSet(
             void )
             throw( com::sun::star::ucb::ListenerAlreadySetException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         setListener(
             const com::sun::star::uno::Reference<
             com::sun::star::ucb::XDynamicResultSetListener >& Listener )
             throw( com::sun::star::ucb::ListenerAlreadySetException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         connectToCache( const com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > & xCache )
             throw( com::sun::star::ucb::ListenerAlreadySetException,
                    com::sun::star::ucb::AlreadyInitializedException,
                    com::sun::star::ucb::ServiceNotFoundException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual sal_Int16 SAL_CALL
         getCapabilities()
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
         // XCloseable
@@ -501,37 +501,37 @@ class XResultSet_impl : public Notifier,
         close(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         // XContentAccess
 
         virtual OUString SAL_CALL
         queryContentIdentifierString(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL
         queryContentIdentifier(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL
         queryContent(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         // XResultSetMetaDataSupplier
         virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > SAL_CALL
         getMetaData(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
 
         // XPropertySet
         virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL
         getPropertySetInfo()
-            throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL setPropertyValue(
             const OUString& aPropertyName,
@@ -540,14 +540,14 @@ class XResultSet_impl : public Notifier,
                    com::sun::star::beans::PropertyVetoException,
                    com::sun::star::lang::IllegalArgumentException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual com::sun::star::uno::Any SAL_CALL
         getPropertyValue(
             const OUString& PropertyName )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL
         addPropertyChangeListener(
@@ -555,7 +555,7 @@ class XResultSet_impl : public Notifier,
             const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL
         removePropertyChangeListener(
@@ -563,7 +563,7 @@ class XResultSet_impl : public Notifier,
             const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL
         addVetoableChangeListener(
@@ -571,14 +571,14 @@ class XResultSet_impl : public Notifier,
             const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& PropertyName,
             const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
     private:
 
diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx
index 5b04f1f626a1..df107f20c525 100644
--- a/ucb/source/ucp/file/filstr.hxx
+++ b/ucb/source/ucp/file/filstr.hxx
@@ -64,18 +64,18 @@ class XStream_impl :  public cppu::WeakImplHelper<
 
         virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL
         getInputStream(  )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > SAL_CALL
         getOutputStream(  )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
         // XTruncate
 
         virtual void SAL_CALL truncate()
             throw( com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
         // XInputStream
@@ -87,7 +87,7 @@ class XStream_impl :  public cppu::WeakImplHelper<
             throw( com::sun::star::io::NotConnectedException,
                    com::sun::star::io::BufferSizeExceededException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         sal_Int32 SAL_CALL
         readSomeBytes(
@@ -96,7 +96,7 @@ class XStream_impl :  public cppu::WeakImplHelper<
             throw( com::sun::star::io::NotConnectedException,
                    com::sun::star::io::BufferSizeExceededException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
 
         void SAL_CALL
@@ -105,21 +105,21 @@ class XStream_impl :  public cppu::WeakImplHelper<
             throw( com::sun::star::io::NotConnectedException,
                    com::sun::star::io::BufferSizeExceededException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         sal_Int32 SAL_CALL
         available(
             void )
             throw( com::sun::star::io::NotConnectedException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         void SAL_CALL
         closeInput(
             void )
             throw( com::sun::star::io::NotConnectedException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         // XSeekable
 
@@ -128,19 +128,19 @@ class XStream_impl :  public cppu::WeakImplHelper<
             sal_Int64 location )
             throw( com::sun::star::lang::IllegalArgumentException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         sal_Int64 SAL_CALL
         getPosition(
             void )
             throw( com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         sal_Int64 SAL_CALL
         getLength(
             void )
             throw( com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
         // XOutputStream
@@ -150,7 +150,7 @@ class XStream_impl :  public cppu::WeakImplHelper<
             throw( com::sun::star::io::NotConnectedException,
                    com::sun::star::io::BufferSizeExceededException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
 
 
@@ -159,7 +159,7 @@ class XStream_impl :  public cppu::WeakImplHelper<
             throw( com::sun::star::io::NotConnectedException,
                    com::sun::star::io::BufferSizeExceededException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
 
         void SAL_CALL
@@ -167,12 +167,12 @@ class XStream_impl :  public cppu::WeakImplHelper<
             void )
             throw( com::sun::star::io::NotConnectedException,
                    com::sun::star::io::IOException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL waitForCompletion()
             throw (
                 com::sun::star::io::IOException,
-                com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                com::sun::star::uno::RuntimeException, std::exception) override;
 
     private:
 
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index e0159ad6499e..ba3e638057a8 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -296,33 +296,33 @@ public:
     virtual Any SAL_CALL
     queryInterface(
         const Type& aType )
-        throw( RuntimeException, std::exception) SAL_OVERRIDE;
+        throw( RuntimeException, std::exception) override;
 
     virtual void SAL_CALL
     acquire(
         void )
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     virtual void SAL_CALL
     release(
         void )
-        throw() SAL_OVERRIDE;
+        throw() override;
 
 
     virtual Sequence< Property > SAL_CALL
     getProperties(
         void )
-        throw( RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( RuntimeException, std::exception ) override;
 
     virtual Property SAL_CALL
     getPropertyByName(
         const OUString& aName )
         throw( UnknownPropertyException,
-               RuntimeException, std::exception) SAL_OVERRIDE;
+               RuntimeException, std::exception) override;
 
     virtual sal_Bool SAL_CALL
     hasPropertyByName( const OUString& Name )
-        throw( RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( RuntimeException, std::exception ) override;
 
 
 private:
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index 9c1d5b5476a7..db15667e622d 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -66,17 +66,17 @@ namespace fileaccess {
         virtual OUString SAL_CALL
         getImplementationName(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual sal_Bool SAL_CALL
         supportsService(
             const OUString& ServiceName )
-            throw(com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw(com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedServiceNames(
             void )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
         static com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > SAL_CALL
@@ -91,7 +91,7 @@ namespace fileaccess {
         virtual void SAL_CALL
         initialize(
             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
 
 
         // XContentProvider
@@ -99,27 +99,27 @@ namespace fileaccess {
         queryContent(
             const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier )
             throw( com::sun::star::ucb::IllegalIdentifierException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         // XContentIdentifierFactory
 
         virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL
         createContentIdentifier(
             const OUString& ContentId )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
         virtual sal_Int32 SAL_CALL
         compareContentIds(
             const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id1,
             const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id2 )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         // XProperySet
 
         virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL
         getPropertySetInfo(  )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         setPropertyValue(
@@ -129,14 +129,14 @@ namespace fileaccess {
                    com::sun::star::beans::PropertyVetoException,
                    com::sun::star::lang::IllegalArgumentException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual com::sun::star::uno::Any SAL_CALL
         getPropertyValue(
             const OUString& PropertyName )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         addPropertyChangeListener(
@@ -144,7 +144,7 @@ namespace fileaccess {
             const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL
         removePropertyChangeListener(
@@ -152,7 +152,7 @@ namespace fileaccess {
             const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         addVetoableChangeListener(
@@ -160,7 +160,7 @@ namespace fileaccess {
             const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         removeVetoableChangeListener(
@@ -168,21 +168,21 @@ namespace fileaccess {
             const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   com::sun::star::uno::RuntimeException, std::exception) override;
 
 
         // XFileIdentifierConverter
 
         virtual sal_Int32 SAL_CALL
         getFileProviderLocality( const OUString& BaseURL )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual OUString SAL_CALL getFileURLFromSystemPath( const OUString& BaseURL,
                                                                  const OUString& SystemPath )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
         virtual OUString SAL_CALL getSystemPathFromFileURL( const OUString& URL )
-            throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
     private: