Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

16 files changed, 285 insertions, 285 deletions

diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx
index 1c2372eb44ec..9cb6940be900 100644
--- a/include/ucbhelper/activedatasink.hxx
+++ b/include/ucbhelper/activedatasink.hxx
@@ -41,10 +41,10 @@ class UCBHELPER_DLLPUBLIC ActiveDataSink :
 public:
     // XActiveDataSink methods.
     virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream )
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream()
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( css::uno::RuntimeException, std::exception ) override;
 };
 
 } /* namespace ucbhelper */
diff --git a/include/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx
index 17db937161b7..89eccba21d05 100644
--- a/include/ucbhelper/activedatastreamer.hxx
+++ b/include/ucbhelper/activedatastreamer.hxx
@@ -43,10 +43,10 @@ public:
     // XActiveDataStreamer methods.
     virtual void SAL_CALL setStream( const css::uno::Reference< css::io::XStream >& xStream )
         throw( css::uno::RuntimeException,
-               std::exception ) SAL_OVERRIDE;
+               std::exception ) override;
     virtual css::uno::Reference< css::io::XStream > SAL_CALL getStream()
         throw( css::uno::RuntimeException,
-               std::exception ) SAL_OVERRIDE;
+               std::exception ) override;
 };
 
 } /* namespace ucbhelper */
diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx
index 7383f03cda87..6f78aed22a6d 100644
--- a/include/ucbhelper/commandenvironment.hxx
+++ b/include/ucbhelper/commandenvironment.hxx
@@ -61,11 +61,11 @@ public:
      // XCommandEnvironemnt
     virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler()
         throw ( css::uno::RuntimeException,
-                std::exception ) SAL_OVERRIDE;
+                std::exception ) override;
 
     virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL getProgressHandler()
         throw ( css::uno::RuntimeException,
-                std::exception ) SAL_OVERRIDE;
+                std::exception ) override;
 };
 
 } /* namespace ucbhelper */
diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index abba7337a1c3..07404a25cc7d 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -325,67 +325,67 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL acquire()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        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< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XServiceInfo
     virtual OUString SAL_CALL
     getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0;
     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 = 0;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0;
 
     // XComponent
     virtual void SAL_CALL
     dispose()
-        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 >& Listener )
-        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 >& Listener )
-        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()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual OUString SAL_CALL
     getContentType()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override = 0;
     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;
 
     // XCommandProcessor
     virtual sal_Int32 SAL_CALL
     createCommandIdentifier()
-        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( const com::sun::star::ucb::Command& aCommand,
              sal_Int32 CommandId,
@@ -393,10 +393,10 @@ public:
                  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 = 0;
+               com::sun::star::uno::RuntimeException, std::exception ) override = 0;
     virtual void SAL_CALL
     abort( sal_Int32 CommandId )
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override = 0;
 
     // XPropertiesChangeNotifier
     virtual void SAL_CALL
@@ -404,25 +404,25 @@ public:
         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;
 
     // XCommandInfoChangeNotifier
     virtual void SAL_CALL
     addCommandInfoChangeListener(
         const com::sun::star::uno::Reference<
             com::sun::star::ucb::XCommandInfoChangeListener >& Listener )
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL
     removeCommandInfoChangeListener(
         const com::sun::star::uno::Reference<
             ::com::sun::star::ucb::XCommandInfoChangeListener >& Listener )
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XPropertyContainer
 
@@ -443,7 +443,7 @@ public:
         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;
 
     /**
       * This method removes a property from the content according to the
@@ -459,19 +459,19 @@ public:
     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
     virtual void SAL_CALL
     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;
 
     // XChild
 
@@ -483,7 +483,7 @@ public:
     virtual com::sun::star::uno::Reference<
                 com::sun::star::uno::XInterface > SAL_CALL
     getParent()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /**
       * The implementation of this method always throws a NoSupportException.
@@ -492,7 +492,7 @@ public:
     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;
 
 
     // Non-interface methods.
diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx
index 12d733ecf9f8..9f05884efff0 100644
--- a/include/ucbhelper/contentidentifier.hxx
+++ b/include/ucbhelper/contentidentifier.hxx
@@ -51,27 +51,27 @@ public:
     // XInterface
     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() throw() SAL_OVERRIDE;
+    acquire() throw() override;
     virtual void SAL_CALL
-    release() throw() SAL_OVERRIDE;
+    release() throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        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< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        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()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual OUString SAL_CALL
     getContentProviderScheme()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
 private:
     ContentIdentifier_Impl* m_pImpl;
diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx
index 032337e5c059..e40c241f7cbb 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -69,32 +69,32 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL acquire()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        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< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XPropertySetInfo
     virtual com::sun::star::uno::Sequence<
                 com::sun::star::beans::Property > SAL_CALL
     getProperties()
-        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;
 
     // Non-Interface methods.
     void reset();
@@ -137,39 +137,39 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL acquire()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        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< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XCommandInfo
     virtual com::sun::star::uno::Sequence<
                 com::sun::star::ucb::CommandInfo > SAL_CALL
     getCommands()
-        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;
 
     // Non-Interface methods.
     void reset();
diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx
index 3c206618d601..0a7351510c84 100644
--- a/include/ucbhelper/fd_inputstream.hxx
+++ b/include/ucbhelper/fd_inputstream.hxx
@@ -59,7 +59,7 @@ namespace ucbhelper
             throw( css::io::NotConnectedException,
                    css::io::BufferSizeExceededException,
                    css::io::IOException,
-                   css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   css::uno::RuntimeException, std::exception) override;
 
         virtual sal_Int32 SAL_CALL
         readSomeBytes(css::uno::Sequence< sal_Int8 >& aData,
@@ -67,26 +67,26 @@ namespace ucbhelper
             throw( css::io::NotConnectedException,
                    css::io::BufferSizeExceededException,
                    css::io::IOException,
-                   css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                   css::uno::RuntimeException, std::exception) override;
 
         virtual void SAL_CALL
         skipBytes(sal_Int32 nBytesToSkip)
             throw(css::io::NotConnectedException,
                   css::io::BufferSizeExceededException,
                   css::io::IOException,
-                  css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                  css::uno::RuntimeException, std::exception ) override;
 
         virtual sal_Int32 SAL_CALL
         available()
             throw(css::io::NotConnectedException,
                   css::io::IOException,
-                  css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                  css::uno::RuntimeException, std::exception ) override;
 
         virtual void SAL_CALL
         closeInput()
             throw(css::io::NotConnectedException,
                   css::io::IOException,
-                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                  css::uno::RuntimeException, std::exception) override;
 
 
         /** XSeekable
@@ -96,19 +96,19 @@ namespace ucbhelper
         seek(sal_Int64 location)
             throw(css::lang::IllegalArgumentException,
                   css::io::IOException,
-                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                  css::uno::RuntimeException, std::exception) override;
 
 
         virtual sal_Int64 SAL_CALL
         getPosition()
             throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                  css::uno::RuntimeException, std::exception) override;
 
 
         virtual sal_Int64 SAL_CALL
         getLength()
             throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                  css::uno::RuntimeException, std::exception) override;
 
     private:
         oslFileHandle m_tmpfl;
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index 2cba1caf8033..6fe8ae3b63e3 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -93,29 +93,29 @@ public:
     // XInterface
     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()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XInteractionRequest
     virtual com::sun::star::uno::Any SAL_CALL
     getRequest()
-        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<
                 com::sun::star::uno::Reference<
                     com::sun::star::task::XInteractionContinuation > > SAL_CALL
     getContinuations()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // Non-interface methods.
 
@@ -191,23 +191,23 @@ public:
     // XInterface
     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()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 };
 
 
@@ -228,23 +228,23 @@ public:
     // XInterface
     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()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 };
 
 
@@ -265,23 +265,23 @@ public:
     // XInterface
     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()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 };
 
 
@@ -302,23 +302,23 @@ public:
     // XInterface
     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()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 };
 
 
@@ -431,76 +431,76 @@ public:
     // XInterface
     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()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XInteractionSupplyAuthentication
     virtual sal_Bool SAL_CALL
     canSetRealm()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL
     setRealm( const OUString& Realm )
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     virtual sal_Bool SAL_CALL
     canSetUserName()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL
     setUserName( const OUString& UserName )
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     virtual sal_Bool SAL_CALL
     canSetPassword()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL
     setPassword( const OUString& Password )
-        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<
                 com::sun::star::ucb::RememberAuthentication > SAL_CALL
     getRememberPasswordModes(
             com::sun::star::ucb::RememberAuthentication& Default )
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL
     setRememberPassword( com::sun::star::ucb::RememberAuthentication Remember )
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     virtual sal_Bool SAL_CALL
     canSetAccount()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL
     setAccount( const OUString& Account )
-        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<
                 com::sun::star::ucb::RememberAuthentication > SAL_CALL
     getRememberAccountModes(
             com::sun::star::ucb::RememberAuthentication& Default )
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL
     setRememberAccount( com::sun::star::ucb::RememberAuthentication Remember )
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XInteractionSupplyAuthentication2
     virtual sal_Bool SAL_CALL canUseSystemCredentials( sal_Bool& Default )
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL setUseSystemCredentials( sal_Bool UseSystemCredentials )
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // Non-interface methods.
 
@@ -625,23 +625,23 @@ public:
     // XInterface
     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()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 };
 
 class UCBHELPER_DLLPUBLIC InteractionAuthFallback:
@@ -657,19 +657,19 @@ public:
     // XInterface
     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()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XAuthFallback
     virtual void SAL_CALL setCode( const OUString& code )
-        throw (::css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE;
+        throw (::css::uno::RuntimeException, ::std::exception) override;
     OUString SAL_CALL getCode()
         throw (::css::uno::RuntimeException, ::std::exception);
 
diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx
index 99f81f072004..e142645bbafd 100644
--- a/include/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
@@ -294,7 +294,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
                     the interaction request, which should be intercepted.
          */
         virtual void SAL_CALL handle(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest)
-            throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 
 
     // helper
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index 09f5564b6397..745712ed629d 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -80,115 +80,115 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL acquire()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        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< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XRow
     virtual sal_Bool SAL_CALL
     wasNull()
         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;
 
     // XColumnLocate
     virtual sal_Int32 SAL_CALL
     findColumn( const OUString& columnName )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
     // Non-interface methods
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index a65b04c6cfb3..d726eef57232 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -143,34 +143,34 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL acquire()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
 
 
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        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< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XServiceInfo
 
 
     virtual OUString SAL_CALL
     getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0;
     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 = 0;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0;
 
 
     // XContentProvider
@@ -192,13 +192,13 @@ public:
     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 = 0;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override = 0;
     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;
 
 
     // Non-interface methods.
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 4646e6242241..727f9789c041 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -109,27 +109,27 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL acquire()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        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< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XServiceInfo
     virtual 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( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( css::uno::RuntimeException, std::exception ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -137,212 +137,212 @@ public:
     // XComponent
     virtual void SAL_CALL
     dispose()
-        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 >& Listener )
-        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 >& Listener )
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XContentAccess
     virtual OUString SAL_CALL
     queryContentIdentifierString()
-        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()
-        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()
-        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()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XResultSet
     virtual sal_Bool SAL_CALL
     next()
         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()
         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()
         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()
         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()
         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()
         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()
         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()
         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()
         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()
         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()
         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()
         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()
         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()
         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()
         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()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XRow
     virtual sal_Bool SAL_CALL
     wasNull()
         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;
 
     // XCloseable
     virtual void SAL_CALL
     close()
         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,
                       const com::sun::star::uno::Any& aValue )
@@ -350,40 +350,40 @@ public:
                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( const OUString& aPropertyName,
                                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( const OUString& aPropertyName,
                                   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( 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;
     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;
 
 
     // Non-interface methods.
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index 5c7f9e23e1d3..2442066c4597 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -136,27 +136,27 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL acquire()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        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< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XServiceInfo
     virtual 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( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( css::uno::RuntimeException, std::exception ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -164,34 +164,34 @@ public:
     // XComponent ( base class of XDynamicResultSet )
     virtual void SAL_CALL
     dispose()
-        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 >& Listener )
-        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 >& Listener )
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XDynamicResultSet
     virtual com::sun::star::uno::Reference<
                 com::sun::star::sdbc::XResultSet > SAL_CALL
     getStaticResultSet()
         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;
 
     /**
       * The implementation of this method always returns 0. Override this
@@ -199,7 +199,7 @@ public:
       */
     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;
 
 };
 
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 248a0fa4fb9c..9fcbfd425dbd 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -195,19 +195,19 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL acquire()
-        throw() SAL_OVERRIDE;
+        throw() override;
     virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
+        throw() override;
 
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        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< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XResultSetMetaData
 
@@ -219,7 +219,7 @@ public:
     virtual sal_Int32 SAL_CALL
     getColumnCount()
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Checks whether column is automatically numbered, which makes it
       * read-only.
@@ -231,7 +231,7 @@ public:
     virtual sal_Bool SAL_CALL
     isAutoIncrement( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Checks whether column is case sensitive.
       *
@@ -242,7 +242,7 @@ public:
     virtual sal_Bool SAL_CALL
     isCaseSensitive( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Checks whether the value stored in column can be used in a
       * WHERE clause.
@@ -254,7 +254,7 @@ public:
     virtual sal_Bool SAL_CALL
     isSearchable( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Checks whether column is a cash value.
       *
@@ -265,7 +265,7 @@ public:
     virtual sal_Bool SAL_CALL
     isCurrency( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Checks whether a NULL can be stored in column.
       *
@@ -279,7 +279,7 @@ public:
     virtual sal_Int32 SAL_CALL
     isNullable( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Checks whether the value stored in column is a signed number.
       *
@@ -290,7 +290,7 @@ public:
     virtual sal_Bool SAL_CALL
     isSigned( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Gets the normal maximum width in characters for column.
       *
@@ -301,7 +301,7 @@ public:
     virtual sal_Int32 SAL_CALL
     getColumnDisplaySize( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Gets the suggested column title for column, to be used in print-
       * outs and displays.
@@ -313,7 +313,7 @@ public:
     virtual OUString SAL_CALL
     getColumnLabel( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Gets the name of column.
       *
@@ -324,7 +324,7 @@ public:
     virtual OUString SAL_CALL
     getColumnName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Gets the schema name for the table from which column of this
       * result set was derived.
@@ -338,7 +338,7 @@ public:
     virtual OUString SAL_CALL
     getSchemaName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * For number types, getprecision gets the number of decimal digits
       * in column.
@@ -353,7 +353,7 @@ public:
     virtual sal_Int32 SAL_CALL
     getPrecision( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Gets the number of digits to the right of the decimal point for
       * values in column.
@@ -365,7 +365,7 @@ public:
     virtual sal_Int32 SAL_CALL
     getScale( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Gets the name of the table from which column of this result set
       * was derived or "" if there is none (for example, for a join).
@@ -379,7 +379,7 @@ public:
     virtual OUString SAL_CALL
     getTableName( sal_Int32 column )
         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
     /**
       * Gets the catalog name for the table from which column of this
@@ -393,7 +393,7 @@ public:
       */
     getCatalogName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Gets the JDBC type for the value stored in column. ... The STRUCT
       * and DISTINCT type codes are always returned for structured and
@@ -408,7 +408,7 @@ public:
     virtual sal_Int32 SAL_CALL
     getColumnType( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Gets the type name used by this particular data source for the
       * values stored in column. If the type code for the type of value
@@ -422,7 +422,7 @@ public:
     virtual OUString SAL_CALL
     getColumnTypeName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Indicates whether a column is definitely not writable.
       *
@@ -433,7 +433,7 @@ public:
     virtual sal_Bool SAL_CALL
     isReadOnly( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Indicates whether it is possible for a write on the column to succeed.
       *
@@ -444,7 +444,7 @@ public:
     virtual sal_Bool SAL_CALL
     isWritable( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Indicates whether a write on the column will definitely succeed.
       *
@@ -455,7 +455,7 @@ public:
     virtual sal_Bool SAL_CALL
     isDefinitelyWritable( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
     /**
       * Returns the fully-qualified name of the service whose instances
       * are manufactured if the method
@@ -470,7 +470,7 @@ public:
     virtual OUString SAL_CALL
     getColumnServiceName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException, std::exception ) override;
 };
 
 } // namespace ucbhelper
diff --git a/include/ucbhelper/std_inputstream.hxx b/include/ucbhelper/std_inputstream.hxx
index bb30206e4ba6..d442c34088a3 100644
--- a/include/ucbhelper/std_inputstream.hxx
+++ b/include/ucbhelper/std_inputstream.hxx
@@ -39,11 +39,11 @@ namespace ucbhelper
             virtual ~StdInputStream();
 
             virtual css::uno::Any SAL_CALL queryInterface ( const css::uno::Type& rType )
-                throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                throw ( css::uno::RuntimeException, std::exception ) override;
 
-            virtual void SAL_CALL acquire( ) throw ( ) SAL_OVERRIDE;
+            virtual void SAL_CALL acquire( ) throw ( ) override;
 
-            virtual void SAL_CALL release( ) throw ( ) SAL_OVERRIDE;
+            virtual void SAL_CALL release( ) throw ( ) override;
 
             virtual sal_Int32 SAL_CALL
             readBytes ( css::uno::Sequence< sal_Int8 >& aData,
@@ -51,7 +51,7 @@ namespace ucbhelper
                 throw ( css::io::NotConnectedException,
                         css::io::BufferSizeExceededException,
                         css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                        css::uno::RuntimeException, std::exception ) override;
 
             virtual sal_Int32 SAL_CALL
             readSomeBytes ( css::uno::Sequence< sal_Int8 >& aData,
@@ -59,26 +59,26 @@ namespace ucbhelper
                 throw ( css::io::NotConnectedException,
                         css::io::BufferSizeExceededException,
                         css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                        css::uno::RuntimeException, std::exception ) override;
 
             virtual void SAL_CALL
             skipBytes ( sal_Int32 nBytesToSkip )
                 throw ( css::io::NotConnectedException,
                         css::io::BufferSizeExceededException,
                         css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                        css::uno::RuntimeException, std::exception ) override;
 
             virtual sal_Int32 SAL_CALL
             available ( )
                 throw ( css::io::NotConnectedException,
                         css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                        css::uno::RuntimeException, std::exception ) override;
 
             virtual void SAL_CALL
             closeInput ( )
                 throw ( css::io::NotConnectedException,
                         css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                        css::uno::RuntimeException, std::exception ) override;
 
 
             /** XSeekable
@@ -88,18 +88,18 @@ namespace ucbhelper
             seek ( sal_Int64 location )
                 throw ( css::lang::IllegalArgumentException,
                         css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                        css::uno::RuntimeException, std::exception ) override;
 
 
             virtual sal_Int64 SAL_CALL
             getPosition ( )
-                throw ( css::io::IOException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                throw ( css::io::IOException, css::uno::RuntimeException, std::exception ) override;
 
 
             virtual sal_Int64 SAL_CALL
             getLength ( )
                 throw ( css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                        css::uno::RuntimeException, std::exception ) override;
 
         private:
 
diff --git a/include/ucbhelper/std_outputstream.hxx b/include/ucbhelper/std_outputstream.hxx
index 126015b79010..c945b479b6c3 100644
--- a/include/ucbhelper/std_outputstream.hxx
+++ b/include/ucbhelper/std_outputstream.hxx
@@ -35,29 +35,29 @@ namespace ucbhelper
             virtual ~StdOutputStream( );
 
             virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-                throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                throw ( css::uno::RuntimeException, std::exception ) override;
 
-            virtual void SAL_CALL acquire ( ) throw ( ) SAL_OVERRIDE;
+            virtual void SAL_CALL acquire ( ) throw ( ) override;
 
-            virtual void SAL_CALL release ( ) throw ( ) SAL_OVERRIDE;
+            virtual void SAL_CALL release ( ) throw ( ) override;
 
             virtual void SAL_CALL writeBytes ( const css::uno::Sequence< sal_Int8 >& aData )
                 throw ( css::io::NotConnectedException,
                         css::io::BufferSizeExceededException,
                         css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                        css::uno::RuntimeException, std::exception ) override;
 
             virtual void SAL_CALL flush ( )
                 throw ( css::io::NotConnectedException,
                         css::io::BufferSizeExceededException,
                         css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                        css::uno::RuntimeException, std::exception ) override;
 
             virtual void SAL_CALL closeOutput ( )
                 throw ( css::io::NotConnectedException,
                         css::io::BufferSizeExceededException,
                         css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                        css::uno::RuntimeException, std::exception ) override;
 
         private: