Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

13 files changed, 198 insertions, 198 deletions

diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 6ed8f76ddc52..80c4486e5401 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -53,81 +53,81 @@ public:
     // XFilePickerNotifier
 
     virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException ) override;
     virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException ) override;
 
     // XExecutableDialog functions
 
     virtual void SAL_CALL setTitle( const OUString& aTitle )
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException ) override;
 
     virtual sal_Int16 SAL_CALL execute(  )
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException ) override;
 
     // XFilePicker functions
 
     virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException ) override;
 
     virtual void SAL_CALL setDefaultName( const OUString& aName )
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException ) override;
 
     virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
         throw( com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+               ::com::sun::star::uno::RuntimeException ) override;
 
     virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException ) override;
 
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles(  )
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException ) override;
 
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles(  )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XFilterManager functions
 
     virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
-        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) override;
 
     virtual void SAL_CALL setCurrentFilter( const OUString& aTitle )
-        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) override;
 
     virtual OUString SAL_CALL getCurrentFilter(  )
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException ) override;
 
     // XFilterGroupManager functions
 
     virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) override;
 
     // XFilePickerControlAccess functions
 
     virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& aValue )
-        throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException) override;
 
     virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
-        throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException) override;
 
     virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable )
-        throw(::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw(::com::sun::star::uno::RuntimeException ) override;
 
     virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel )
-        throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException) override;
 
     virtual OUString SAL_CALL getLabel( sal_Int16 nControlId )
-        throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException) override;
 
     // XInitialization
 
     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) SAL_OVERRIDE;
+        throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) override;
 
     // XCancellable
 
     virtual void SAL_CALL cancel( )
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException ) override;
 
     // XEventListener
 
@@ -138,13 +138,13 @@ public:
     // XServiceInfo
 
     virtual OUString SAL_CALL getImplementationName(  )
-        throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+        throw(::com::sun::star::uno::RuntimeException) override;
 
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+        throw(::com::sun::star::uno::RuntimeException) override;
 
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+        throw(::com::sun::star::uno::RuntimeException) override;
 
     // FilePicker Event functions
 
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index c23ebd21aea1..89fd1ea6f56a 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -52,53 +52,53 @@ public:
 
 
     virtual void SAL_CALL setTitle( const OUString& aTitle )
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException ) override;
 
     virtual sal_Int16 SAL_CALL execute(  )
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException ) override;
 
 
     // XFolderPicker functions
 
 
     virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory )
-        throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ) override;
 
     virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException ) override;
 
     virtual OUString SAL_CALL getDirectory( )
-        throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException ) override;
 
     virtual void SAL_CALL setDescription( const OUString& rDescription )
-        throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( com::sun::star::uno::RuntimeException ) override;
 
 
     // XServiceInfo
 
 
     virtual OUString SAL_CALL getImplementationName(  )
-        throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+        throw(::com::sun::star::uno::RuntimeException) override;
 
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+        throw(::com::sun::star::uno::RuntimeException) override;
 
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+        throw(::com::sun::star::uno::RuntimeException) override;
 
 
     // XCancellable
 
 
     virtual void SAL_CALL cancel( )
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException ) override;
 
 
     // XEventListener
 
 
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent )
-        throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+        throw(::com::sun::star::uno::RuntimeException) override;
 
 private:
     SalAquaFolderPicker( const SalAquaFolderPicker& ) = delete;
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 8182624233f4..c9b8b78c40f7 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -98,98 +98,98 @@ public:
 
     // XExecutableDialog functions
 
-    virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Int16 SAL_CALL execute(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL execute(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
 
     // XAsynchronousExecutableDialog functions
 
-    virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener )
         throw (::com::sun::star::uno::RuntimeException,
-               std::exception) SAL_OVERRIDE;
+               std::exception) override;
 
 
     // XFilePicker functions
 
 
-    virtual void SAL_CALL           setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL           setDefaultName( const OUString& aName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual OUString SAL_CALL    getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL           setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setDefaultName( const OUString& aName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL    getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
     // XFilePickerControlAccess functions
 
 
-    virtual void SAL_CALL           setValue( sal_Int16 ElementID, sal_Int16 ControlAction, const com::sun::star::uno::Any& value ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual com::sun::star::uno::Any SAL_CALL           getValue( sal_Int16 ElementID, sal_Int16 ControlAction ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL           setLabel( sal_Int16 ElementID, const OUString& aValue ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual OUString SAL_CALL    getLabel( sal_Int16 ElementID ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL           enableControl( sal_Int16 ElementID, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL           setValue( sal_Int16 ElementID, sal_Int16 ControlAction, const com::sun::star::uno::Any& value ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual com::sun::star::uno::Any SAL_CALL           getValue( sal_Int16 ElementID, sal_Int16 ControlAction ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setLabel( sal_Int16 ElementID, const OUString& aValue ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL    getLabel( sal_Int16 ElementID ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           enableControl( sal_Int16 ElementID, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
     // XFilePickerNotifier functions
 
 
-    virtual void SAL_CALL           addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL           removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL           addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
     // XFilePreview functions
 
 
-    virtual com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual sal_Int32 SAL_CALL      getTargetColorDepth() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual sal_Int32 SAL_CALL      getAvailableWidth() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual sal_Int32 SAL_CALL      getAvailableHeight() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL           setImage( sal_Int16 aImageFormat, const com::sun::star::uno::Any& aImage ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL       setShowState( sal_Bool bShowState ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL       getShowState() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL      getTargetColorDepth() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL      getAvailableWidth() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL      getAvailableHeight() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setImage( sal_Int16 aImageFormat, const com::sun::star::uno::Any& aImage ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL       setShowState( sal_Bool bShowState ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL       getShowState() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
     // XFilterManager functions
 
 
-    virtual void SAL_CALL           appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL           setCurrentFilter( const OUString& aTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual OUString SAL_CALL    getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL           appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setCurrentFilter( const OUString& aTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL    getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
 
     // XFilterGroupManager functions
 
-    virtual void SAL_CALL           appendFilterGroup( const OUString& sGroupTitle, const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL           appendFilterGroup( const OUString& sGroupTitle, const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
 
 
 
     // these methods are here because they're ambiguous
 
-    virtual void SAL_CALL           cancel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
+    virtual void SAL_CALL           cancel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override
      { ::svt::OCommonPicker::cancel(); }
-    virtual void SAL_CALL           dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
+    virtual void SAL_CALL           dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override
      { ::svt::OCommonPicker::dispose(); }
-    virtual void SAL_CALL           addEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
+    virtual void SAL_CALL           addEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override
      { ::svt::OCommonPicker::addEventListener(l); }
-    virtual void SAL_CALL           removeEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
+    virtual void SAL_CALL           removeEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override
      { ::svt::OCommonPicker::removeEventListener(l); }
 
 
     // XInitialization functions
 
 
-    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;
+    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 ) override;
 
 
     // XServiceInfo functions
 
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL    getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL       supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual OUString SAL_CALL    getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL       supportsService( const OUString& sServiceName ) 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;
+                                    getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /* Helper for XServiceInfo */
     static com::sun::star::uno::Sequence< OUString >
@@ -205,16 +205,16 @@ protected:
 
     // OCommonPicker overridables
 
-    virtual VclPtr<SvtFileDialog_Base> implCreateDialog( vcl::Window* _pParent ) SAL_OVERRIDE;
-    virtual sal_Int16       implExecutePicker( ) SAL_OVERRIDE;
+    virtual VclPtr<SvtFileDialog_Base> implCreateDialog( vcl::Window* _pParent ) override;
+    virtual sal_Int16       implExecutePicker( ) override;
     virtual bool            implHandleInitializationArgument(
                                 const OUString& _rName,
                                 const ::com::sun::star::uno::Any& _rValue
-                            ) SAL_OVERRIDE;
+                            ) override;
 
 protected:
     WinBits             getWinBits( WinBits& rExtraBits );
-    virtual void        notify( sal_Int16 _nEventId, sal_Int16 _nControlId ) SAL_OVERRIDE;
+    virtual void        notify( sal_Int16 _nEventId, sal_Int16 _nControlId ) override;
 
     bool                FilterNameExists( const OUString& rTitle );
     bool                FilterNameExists( const UnoFilterList& _rGroupedFilters );
@@ -233,7 +233,7 @@ class SvtRemoteFilePicker : public SvtFilePicker
 public:
     SvtRemoteFilePicker( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
 
-    virtual VclPtr<SvtFileDialog_Base> implCreateDialog( vcl::Window* _pParent ) SAL_OVERRIDE;
+    virtual VclPtr<SvtFileDialog_Base> implCreateDialog( vcl::Window* _pParent ) override;
 
     // disambiguate XInterface
 
@@ -244,10 +244,10 @@ public:
     DECLARE_XTYPEPROVIDER( )
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) 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;
+                                    getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /* Helper for XServiceInfo */
     static com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index ab72367567ed..762c0f2ea80f 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -56,35 +56,35 @@ public:
     // XFolderPicker2 functions
 
 
-    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual OUString SAL_CALL    getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual OUString SAL_CALL    getDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL           setDescription( const OUString& aDescription ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL    getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL    getDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setDescription( const OUString& aDescription ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL cancel()
-        throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (com::sun::star::uno::RuntimeException, std::exception) override;
 
 
     // XExecutableDialog functions
 
-    virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Int16 SAL_CALL execute(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL execute(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
 
     // XAsynchronousExecutableDialog functions
 
-    virtual void SAL_CALL       setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL       startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL       setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL       startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
 
     // XServiceInfo functions
 
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL    getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL       supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual OUString SAL_CALL    getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL       supportsService( const OUString& sServiceName ) 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;
+                                    getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     /* Helper for XServiceInfo */
     static com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
@@ -99,8 +99,8 @@ protected:
 
     // OCommonPicker overridables
 
-    virtual VclPtr<SvtFileDialog_Base> implCreateDialog( vcl::Window* _pParent ) SAL_OVERRIDE;
-    virtual sal_Int16       implExecutePicker( ) SAL_OVERRIDE;
+    virtual VclPtr<SvtFileDialog_Base> implCreateDialog( vcl::Window* _pParent ) override;
+    virtual sal_Int16       implExecutePicker( ) override;
 };
 
 #endif // INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFOLDERPICKER_HXX
diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx
index fba20feb55be..e7a9a7ac80cf 100644
--- a/fpicker/source/office/PlacesListBox.hxx
+++ b/fpicker/source/office/PlacesListBox.hxx
@@ -29,9 +29,9 @@ class PlacesListBox_Impl : public SvHeaderTabListBox
     public:
         PlacesListBox_Impl( PlacesListBox* pParent, const OUString& rTitle );
         virtual ~PlacesListBox_Impl( );
-        virtual void dispose() SAL_OVERRIDE;
+        virtual void dispose() override;
 
-        virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+        virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
 };
 
 /** ListBox to handle Places.
@@ -51,7 +51,7 @@ class PlacesListBox : public Control
     public:
         PlacesListBox( vcl::Window* pParent, SvtFileDialog* pFileDlg, const OUString& rTitle, WinBits nBits );
         virtual ~PlacesListBox( );
-        virtual void dispose() SAL_OVERRIDE;
+        virtual void dispose() override;
 
         void AppendPlace( PlacePtr pPlace );
         void RemovePlace( sal_uInt16 nPos );
@@ -63,14 +63,14 @@ class PlacesListBox : public Control
         void SetAddHdl( const Link<Button*,void>& rHdl );
         void SetDelHdl( const Link<Button*,void>& rHdl );
         void SetDelEnabled( bool enabled );
-        void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE;
+        void SetSizePixel( const Size& rNewSize ) override;
         void updateView( );
 
         VclPtr<PushButton> GetAddButton() const { return mpAddBtn; }
         VclPtr<PushButton> GetDeleteButton() const { return mpDelBtn; }
         VclPtr<PlacesListBox_Impl> GetPlacesListBox() const { return mpImpl; }
 
-        virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+        virtual bool Notify( NotifyEvent& rNEvt ) override;
 
     private:
 
diff --git a/fpicker/source/office/QueryFolderName.hxx b/fpicker/source/office/QueryFolderName.hxx
index d448f354b3a1..0783b2a86778 100644
--- a/fpicker/source/office/QueryFolderName.hxx
+++ b/fpicker/source/office/QueryFolderName.hxx
@@ -39,7 +39,7 @@ public:
     QueryFolderNameDialog(vcl::Window* _pParent, const OUString& rTitle,
         const OUString& rDefaultText, OUString* pGroupName = NULL);
     virtual ~QueryFolderNameDialog();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
     OUString GetName() const { return m_pNameEdit->GetText(); }
 };
 
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 4a9f910cc3d8..3b10c4339728 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -42,7 +42,7 @@ class FileViewContainer : public vcl::Window
         disposeOnce();
     }
 
-    virtual void dispose() SAL_OVERRIDE
+    virtual void dispose() override
     {
         m_pFileView.clear();
         m_pTreeView.clear();
@@ -65,7 +65,7 @@ class FileViewContainer : public vcl::Window
         m_pFocusWidgets[FocusState::Next] = pNextSibling;
     }
 
-    virtual void Resize() SAL_OVERRIDE
+    virtual void Resize() override
     {
         Window::Resize();
 
@@ -115,7 +115,7 @@ class FileViewContainer : public vcl::Window
         }
     }
 
-    virtual void GetFocus() SAL_OVERRIDE
+    virtual void GetFocus() override
     {
         if( !m_pFileView || !m_pTreeView )
             return;
@@ -134,7 +134,7 @@ class FileViewContainer : public vcl::Window
         }
     }
 
-    virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE
+    virtual bool Notify( NotifyEvent& rNEvt ) override
     {
         if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         {
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx
index 1e54c413cf2f..4e97093c741e 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -74,54 +74,54 @@ public:
     RemoteFilesDialog( vcl::Window* pParent, WinBits nBits );
     virtual ~RemoteFilesDialog();
 
-    virtual void dispose() SAL_OVERRIDE;
-    virtual void Resize() SAL_OVERRIDE;
-    virtual short Execute() SAL_OVERRIDE;
+    virtual void dispose() override;
+    virtual void Resize() override;
+    virtual short Execute() override;
     virtual void Show();
 
     // SvtFileDialog_Base
 
-    virtual SvtFileView* GetView() SAL_OVERRIDE;
-
-    virtual void SetHasFilename( bool ) SAL_OVERRIDE;
-    virtual void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) SAL_OVERRIDE;
-    virtual const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const SAL_OVERRIDE;
-    virtual void SetStandardDir( const OUString& rStdDir ) SAL_OVERRIDE;
-    virtual const OUString& GetStandardDir() const SAL_OVERRIDE;
-    virtual void SetPath( const OUString& rNewURL ) SAL_OVERRIDE;
-    virtual const OUString& GetPath() SAL_OVERRIDE;
-    virtual std::vector<OUString> GetPathList() const SAL_OVERRIDE;
-    virtual bool ContentIsFolder( const OUString& rURL ) SAL_OVERRIDE;
+    virtual SvtFileView* GetView() override;
+
+    virtual void SetHasFilename( bool ) override;
+    virtual void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) override;
+    virtual const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const override;
+    virtual void SetStandardDir( const OUString& rStdDir ) override;
+    virtual const OUString& GetStandardDir() const override;
+    virtual void SetPath( const OUString& rNewURL ) override;
+    virtual const OUString& GetPath() override;
+    virtual std::vector<OUString> GetPathList() const override;
+    virtual bool ContentIsFolder( const OUString& rURL ) override;
     virtual bool ContentIsDocument( const OUString& rURL );
 
-    virtual OUString getCurrentFileText() const SAL_OVERRIDE;
-    virtual void setCurrentFileText( const OUString& rText, bool bSelectAll = false ) SAL_OVERRIDE;
+    virtual OUString getCurrentFileText() const override;
+    virtual void setCurrentFileText( const OUString& rText, bool bSelectAll = false ) override;
 
-    virtual void AddFilter( const OUString& rFilter, const OUString& rType ) SAL_OVERRIDE;
+    virtual void AddFilter( const OUString& rFilter, const OUString& rType ) override;
     virtual void AddFilterGroup( const OUString& _rFilter,
-                                const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& rFilters ) SAL_OVERRIDE;
-    virtual OUString GetCurFilter() const SAL_OVERRIDE;
-    virtual void SetCurFilter( const OUString& rFilter ) SAL_OVERRIDE;
-    virtual void FilterSelect() SAL_OVERRIDE;
+                                const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& rFilters ) override;
+    virtual OUString GetCurFilter() const override;
+    virtual void SetCurFilter( const OUString& rFilter ) override;
+    virtual void FilterSelect() override;
 
-    virtual void SetFileCallback( ::svt::IFilePickerListener *pNotifier ) SAL_OVERRIDE;
-    virtual void onAsyncOperationStarted() SAL_OVERRIDE;
-    virtual void onAsyncOperationFinished() SAL_OVERRIDE;
-    virtual void UpdateControls( const OUString& rURL ) SAL_OVERRIDE;
+    virtual void SetFileCallback( ::svt::IFilePickerListener *pNotifier ) override;
+    virtual void onAsyncOperationStarted() override;
+    virtual void onAsyncOperationFinished() override;
+    virtual void UpdateControls( const OUString& rURL ) override;
 
-    virtual void EnableAutocompletion( bool ) SAL_OVERRIDE;
+    virtual void EnableAutocompletion( bool ) override;
 
-    virtual sal_Int32 getTargetColorDepth() SAL_OVERRIDE;
-    virtual sal_Int32 getAvailableWidth() SAL_OVERRIDE;
-    virtual sal_Int32 getAvailableHeight() SAL_OVERRIDE;
+    virtual sal_Int32 getTargetColorDepth() override;
+    virtual sal_Int32 getAvailableWidth() override;
+    virtual sal_Int32 getAvailableHeight() override;
 
-    virtual void setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& rImage ) SAL_OVERRIDE;
+    virtual void setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& rImage ) override;
 
-    virtual bool getShowState() SAL_OVERRIDE;
+    virtual bool getShowState() override;
 
-    virtual Control* getControl( sal_Int16 nControlId, bool bLabelControl = false ) const SAL_OVERRIDE;
-    virtual void enableControl( sal_Int16 nControlId, bool bEnable ) SAL_OVERRIDE;
-    virtual OUString getCurFilter( ) const SAL_OVERRIDE;
+    virtual Control* getControl( sal_Int16 nControlId, bool bLabelControl = false ) const override;
+    virtual void enableControl( sal_Int16 nControlId, bool bEnable ) override;
+    virtual OUString getCurFilter( ) const override;
 
 private:
     Reference< XComponentContext > m_xContext;
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 6573de0579f0..da0885734790 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -111,27 +111,27 @@ namespace svt
 
         // ComponentHelper/XComponent
 
-        virtual void SAL_CALL disposing() SAL_OVERRIDE;
+        virtual void SAL_CALL disposing() override;
 
 
         // XEventListner
 
-        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
 
         // property set related methods
 
 
         // XPropertySet pure methods
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
         // OPropertySetHelper pure methods
-        virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
+        virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
         // OPropertyArrayUsageHelper pure methods
-        virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
+        virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
         // OPropertySetHelper overridden methods
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
-                sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
+                sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception, std::exception) override;
 
 
         // XExecutableDialog functions
@@ -142,27 +142,27 @@ namespace svt
 
         // XControlAccess functions
 
-        virtual void SAL_CALL setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Any SAL_CALL getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual void SAL_CALL setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Any SAL_CALL getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
 
 
         // XControlInformation functions
 
-        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedControls(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual sal_Bool SAL_CALL isControlSupported( const OUString& aControlName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedControlProperties( const OUString& aControlName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual sal_Bool SAL_CALL isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedControls(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isControlSupported( const OUString& aControlName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedControlProperties( const OUString& aControlName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
 
 
         // XCancellable functions
 
-        virtual void SAL_CALL cancel(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual void SAL_CALL cancel(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
 
         // XInitialization functions
 
 
-        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;
+        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 ) override;
 
 
         // misc
diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx
index 756701809c4d..4acfb9e0057e 100644
--- a/fpicker/source/office/fpinteraction.hxx
+++ b/fpicker/source/office/fpinteraction.hxx
@@ -70,7 +70,7 @@ namespace svt
 
     protected:
         // XInteractionHandler
-        virtual void SAL_CALL handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _rxRequest ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual void SAL_CALL handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _rxRequest ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
     private:
         virtual ~OFilePickerInteractionHandler();
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index d99b36d02bfd..bdeb6d367f54 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -375,7 +375,7 @@ public:
     {
     }
     virtual ~CustomContainer() { disposeOnce(); }
-    virtual void dispose() SAL_OVERRIDE
+    virtual void dispose() override
     {
         _pFileView.clear();
         _pSplitter.clear();
@@ -400,7 +400,7 @@ public:
         m_pFocusWidgets[FocusState::Next] = pNext;
     }
 
-    virtual void Resize() SAL_OVERRIDE
+    virtual void Resize() override
     {
         Window::Resize();
 
@@ -450,7 +450,7 @@ public:
         }
     }
 
-    virtual void GetFocus() SAL_OVERRIDE
+    virtual void GetFocus() override
     {
         if( !_pFileView || !_pImp || !_pImp->_pPlaces )
             return;
@@ -469,7 +469,7 @@ public:
         }
     }
 
-    virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE
+    virtual bool Notify( NotifyEvent& rNEvt ) override
     {
         if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         {
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 98d66c6232c5..a79347c532a2 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -135,7 +135,7 @@ private:
     void    implUpdateImages( );
 
 protected:
-    virtual bool                Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+    virtual bool                Notify( NotifyEvent& rNEvt ) override;
 
     OUString                    _aPath;
     OUString                    _aDefExt;
@@ -163,74 +163,74 @@ public:
                                 SvtFileDialog( vcl::Window* _pParent, WinBits nBits, WinBits nExtraBits );
                                 SvtFileDialog( vcl::Window* _pParent, WinBits nBits );
                                 virtual ~SvtFileDialog();
-    virtual void                dispose() SAL_OVERRIDE;
+    virtual void                dispose() override;
 
-    virtual short               Execute() SAL_OVERRIDE;
-    virtual void                StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
+    virtual short               Execute() override;
+    virtual void                StartExecuteModal( const Link<>& rEndDialogHdl ) override;
 
             void                FileSelect();
-            void                FilterSelect() SAL_OVERRIDE;
+            void                FilterSelect() override;
 
-    void                        SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) SAL_OVERRIDE;
-    const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const SAL_OVERRIDE;
-    void                        SetStandardDir( const OUString& rStdDir ) SAL_OVERRIDE;
-    const OUString&             GetStandardDir() const SAL_OVERRIDE;
-    std::vector<OUString>       GetPathList() const SAL_OVERRIDE;        // for MultiSelection
+    void                        SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) override;
+    const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const override;
+    void                        SetStandardDir( const OUString& rStdDir ) override;
+    const OUString&             GetStandardDir() const override;
+    std::vector<OUString>       GetPathList() const override;        // for MultiSelection
 
             void                AddFilter( const OUString& rFilter,
-                                           const OUString& rType ) SAL_OVERRIDE;
+                                           const OUString& rType ) override;
 
             void                AddFilterGroup(
                                   const OUString& _rFilter,
-                                  const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& rFilters ) SAL_OVERRIDE;
+                                  const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& rFilters ) override;
 
-            void                SetCurFilter( const OUString& rFilter ) SAL_OVERRIDE;
-            OUString            GetCurFilter() const SAL_OVERRIDE;
+            void                SetCurFilter( const OUString& rFilter ) override;
+            OUString            GetCurFilter() const override;
             sal_uInt16          GetFilterCount() const;
             const OUString&     GetFilterName( sal_uInt16 nPos ) const;
 
-    virtual void                Resize() SAL_OVERRIDE;
-    virtual void                DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE;
+    virtual void                Resize() override;
+    virtual void                DataChanged( const DataChangedEvent& _rDCEvt ) override;
 
     void                        PrevLevel_Impl();
     void                        OpenURL_Impl( const OUString& rURL );
 
-    SvtFileView*                GetView() SAL_OVERRIDE;
+    SvtFileView*                GetView() override;
 
     void                        InitSize();
-    void                        UpdateControls( const OUString& rURL ) SAL_OVERRIDE;
-    void                        EnableAutocompletion( bool _bEnable = true ) SAL_OVERRIDE;
+    void                        UpdateControls( const OUString& rURL ) override;
+    void                        EnableAutocompletion( bool _bEnable = true ) override;
 
-    void                        SetFileCallback( ::svt::IFilePickerListener *pNotifier ) SAL_OVERRIDE { _pFileNotifier = pNotifier; }
+    void                        SetFileCallback( ::svt::IFilePickerListener *pNotifier ) override { _pFileNotifier = pNotifier; }
 
-    sal_Int32                   getTargetColorDepth() SAL_OVERRIDE;
-    sal_Int32                   getAvailableWidth() SAL_OVERRIDE;
-    sal_Int32                   getAvailableHeight() SAL_OVERRIDE;
-    void                        setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& rImage ) SAL_OVERRIDE;
-    bool                        getShowState() SAL_OVERRIDE;
+    sal_Int32                   getTargetColorDepth() override;
+    sal_Int32                   getAvailableWidth() override;
+    sal_Int32                   getAvailableHeight() override;
+    void                        setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& rImage ) override;
+    bool                        getShowState() override;
     bool                        isAutoExtensionEnabled();
 
-    OUString                    getCurrentFileText( ) const SAL_OVERRIDE;
-    void                        setCurrentFileText( const OUString& _rText, bool _bSelectAll = false ) SAL_OVERRIDE;
+    OUString                    getCurrentFileText( ) const override;
+    void                        setCurrentFileText( const OUString& _rText, bool _bSelectAll = false ) override;
 
-    void                        onAsyncOperationStarted() SAL_OVERRIDE;
-    void                        onAsyncOperationFinished() SAL_OVERRIDE;
+    void                        onAsyncOperationStarted() override;
+    void                        onAsyncOperationFinished() override;
 
     void                        RemovablePlaceSelected(bool enable = true);
 
     static void                 displayIOException( const OUString& _rURL, ::com::sun::star::ucb::IOErrorCode _eCode );
 
     // inline
-    inline void                 SetPath( const OUString& rNewURL ) SAL_OVERRIDE;
-    inline void                 SetHasFilename( bool bHasFilename ) SAL_OVERRIDE;
-    inline const OUString&      GetPath() SAL_OVERRIDE;
+    inline void                 SetPath( const OUString& rNewURL ) override;
+    inline void                 SetHasFilename( bool bHasFilename ) override;
+    inline const OUString&      GetPath() override;
     inline void                 SetDefaultExt( const OUString& rExt );
     inline void                 EraseDefaultExt( sal_Int32 _nIndex = 0 );
     inline const OUString&      GetDefaultExt() const;
 
     inline Image                GetButtonImage( sal_uInt16 _nButtonId ) const { return m_aImages.GetImage( _nButtonId ); }
 
-    bool                        ContentIsFolder( const OUString& rURL ) SAL_OVERRIDE { return m_aContent.isFolder( rURL ) && m_aContent.isValid(); }
+    bool                        ContentIsFolder( const OUString& rURL ) override { return m_aContent.isFolder( rURL ) && m_aContent.isValid(); }
     bool                        ContentHasParentFolder( const OUString& rURL );
     bool                        ContentCanMakeFolder( const OUString& rURL );
     bool                        ContentGetTitle( const OUString& rURL, OUString& rTitle );
@@ -257,9 +257,9 @@ private:
     sal_uInt16                  adjustFilter( const OUString& _rFilter );
 
     // IFilePickerController, needed by OControlAccess
-    virtual Control*            getControl( sal_Int16 _nControlId, bool _bLabelControl = false ) const SAL_OVERRIDE;
-    virtual void                enableControl( sal_Int16 _nControlId, bool _bEnable ) SAL_OVERRIDE;
-    virtual OUString            getCurFilter( ) const SAL_OVERRIDE;
+    virtual Control*            getControl( sal_Int16 _nControlId, bool _bLabelControl = false ) const override;
+    virtual void                enableControl( sal_Int16 _nControlId, bool _bEnable ) override;
+    virtual OUString            getCurFilter( ) const override;
 
     OUString                    implGetInitialURL( const OUString& _rPath, const OUString& _rFallback );
 
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index feca69663bb0..e89793ce9057 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -81,7 +81,7 @@ class SvtFileDialogURLSelector : public MenuButton
 {
 public:
     virtual ~SvtFileDialogURLSelector();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 private:
     VclPtr<SvtFileDialog>      m_pDlg;
     PopupMenu*          m_pMenu;
@@ -93,7 +93,7 @@ protected:
 
     SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, sal_uInt16 _nButtonId );
 
-    virtual void        Activate() SAL_OVERRIDE;
+    virtual void        Activate() override;
 };
 
 class SvtUpButton_Impl : public SvtFileDialogURLSelector
@@ -106,10 +106,10 @@ public:
     virtual ~SvtUpButton_Impl();
 
 protected:
-    virtual void        FillURLMenu( PopupMenu* _pMenu ) SAL_OVERRIDE;
-    virtual void        Select() SAL_OVERRIDE;
-    virtual void        Click() SAL_OVERRIDE;
-    virtual Size        GetOptimalSize() const SAL_OVERRIDE;
+    virtual void        FillURLMenu( PopupMenu* _pMenu ) override;
+    virtual void        Select() override;
+    virtual void        Click() override;
+    virtual Size        GetOptimalSize() const override;
 };
 
 typedef sal_uInt8 SvtFileDlgState;