Second batch of adding SAL_OVERRIDE to overriding function declarations

...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.

Change-Id: Ie656f9d653fc716f72ac175925272696d509038f

23 files changed, 108 insertions, 108 deletions

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 58700919638e..776cbc8de771 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -72,14 +72,14 @@ class Desktop : public Application
 
                                 Desktop();
                                 ~Desktop();
-        virtual int             Main( );
-        virtual void            Init();
-        virtual void            InitFinished();
-        virtual void            DeInit();
-        virtual bool        QueryExit();
-        virtual sal_uInt16      Exception(sal_uInt16 nError);
-        virtual void            OverrideSystemSettings( AllSettings& rSettings );
-        virtual void            AppEvent( const ApplicationEvent& rAppEvent );
+        virtual int             Main( ) SAL_OVERRIDE;
+        virtual void            Init() SAL_OVERRIDE;
+        virtual void            InitFinished() SAL_OVERRIDE;
+        virtual void            DeInit() SAL_OVERRIDE;
+        virtual bool        QueryExit() SAL_OVERRIDE;
+        virtual sal_uInt16      Exception(sal_uInt16 nError) SAL_OVERRIDE;
+        virtual void            OverrideSystemSettings( AllSettings& rSettings ) SAL_OVERRIDE;
+        virtual void            AppEvent( const ApplicationEvent& rAppEvent ) SAL_OVERRIDE;
 
         DECL_LINK( OpenClients_Impl, void* );
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1220094c0508..75c9cf2f958a 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1956,7 +1956,7 @@ class ExitTimer : public Timer
         SetTimeout(500);
         Start();
     }
-    virtual void Timeout()
+    virtual void Timeout() SAL_OVERRIDE
     {
         exit(42);
     }
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 87fd8bc04111..6bc0f304e2ba 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -82,21 +82,21 @@ public:
 
     // XCommandEnvironment
     virtual uno::Reference<task::XInteractionHandler > SAL_CALL
-    getInteractionHandler() throw (uno::RuntimeException, std::exception);
+    getInteractionHandler() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual uno::Reference<ucb::XProgressHandler >
-    SAL_CALL getProgressHandler() throw (uno::RuntimeException, std::exception);
+    SAL_CALL getProgressHandler() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XInteractionHandler
     virtual void SAL_CALL handle(
         uno::Reference<task::XInteractionRequest > const & xRequest )
-        throw (uno::RuntimeException, std::exception);
+        throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XProgressHandler
     virtual void SAL_CALL push( uno::Any const & Status )
-        throw (uno::RuntimeException, std::exception);
+        throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL update( uno::Any const & Status )
-        throw (uno::RuntimeException, std::exception);
-    virtual void SAL_CALL pop() throw (uno::RuntimeException, std::exception);
+        throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL pop() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 894fb80931a9..ed8d995bc953 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -82,9 +82,9 @@ public:
 
     virtual ~ExtCommandLineSupplier() {}
 
-    virtual boost::optional< OUString > getCwdUrl() { return m_cwdUrl; }
+    virtual boost::optional< OUString > getCwdUrl() SAL_OVERRIDE { return m_cwdUrl; }
 
-    virtual bool next(OUString * argument) {
+    virtual bool next(OUString * argument) SAL_OVERRIDE {
         OSL_ASSERT(argument != NULL);
         if (m_index < m_count) {
             rtl_getAppCommandArg(m_index++, &argument->pData);
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
index ce7a2400890a..9ca43b843d2f 100644
--- a/desktop/source/app/configinit.cxx
+++ b/desktop/source/app/configinit.cxx
@@ -70,7 +70,7 @@ namespace
         // XCurrentContext
         virtual uno::Any SAL_CALL
             getValueByName( OUString const & aName)
-                throw (uno::RuntimeException, std::exception);
+                throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
     };
 
     uno::Any SAL_CALL
@@ -98,7 +98,7 @@ public:
     // XCurrentContext
     virtual uno::Any SAL_CALL
         getValueByName( OUString const & aName)
-            throw (uno::RuntimeException, std::exception);
+            throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
     InteractionHandler  m_xHandler;
diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx
index b989982f726d..d20579ea4258 100644
--- a/desktop/source/app/desktopcontext.hxx
+++ b/desktop/source/app/desktopcontext.hxx
@@ -32,7 +32,7 @@ namespace desktop
 
         // XCurrentContext
         virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name )
-            throw (com::sun::star::uno::RuntimeException, std::exception);
+            throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     private:
             com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > m_xNextContext;
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 6540d566f778..e586e1328e04 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -83,10 +83,10 @@ class DispatchWatcher : public ::cppu::WeakImplHelper1< ::com::sun::star::frame:
 
         // XEventListener
         virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
-            throw(::com::sun::star::uno::RuntimeException, std::exception);
+            throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
         // XDispachResultListener
-        virtual void SAL_CALL dispatchFinished( const com::sun::star::frame::DispatchResultEvent& aEvent ) throw( com::sun::star::uno::RuntimeException, std::exception );
+        virtual void SAL_CALL dispatchFinished( const com::sun::star::frame::DispatchResultEvent& aEvent ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
         // Access function to get a dispatcher watcher reference. There must be a global reference holder
         static DispatchWatcher* GetDispatchWatcher();
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index b52002080c7e..962021e91b7b 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -146,9 +146,9 @@ public:
 
     virtual ~Parser() {}
 
-    virtual boost::optional< OUString > getCwdUrl() { return m_cwdUrl; }
+    virtual boost::optional< OUString > getCwdUrl() SAL_OVERRIDE { return m_cwdUrl; }
 
-    virtual bool next(OUString * argument) { return next(argument, true); }
+    virtual bool next(OUString * argument) SAL_OVERRIDE { return next(argument, true); }
 
 private:
     virtual bool next(OUString * argument, bool prefix) {
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index 8618b042dd0e..139f1bcb1a33 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -100,7 +100,7 @@ class OfficeIPCThread : public salhelper::Thread
     virtual ~OfficeIPCThread();
 
     /// Working method which should be overridden
-    virtual void execute();
+    virtual void execute() SAL_OVERRIDE;
 
   public:
     enum Status
@@ -140,21 +140,21 @@ class OfficeIPCThreadController : public ::cppu::WeakImplHelper2<
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName()
-            throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+            throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+            throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
         virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+            throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
         // XEventListener
         virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
-            throw( ::com::sun::star::uno::RuntimeException, std::exception );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
         // XTerminateListener
         virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent )
-            throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception );
+            throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
         virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent )
-            throw( ::com::sun::star::uno::RuntimeException, std::exception );
+            throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 };
 
 }
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
index 3e479a709ed2..e2ac5b02285d 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
@@ -35,7 +35,7 @@ public:
     ~AutoScrollEdit();
 
     using ExtMultiLineEdit::Notify;
-    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
 };
 
 } // namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
index d6f9e683ba55..789cc19b6b59 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
@@ -44,7 +44,7 @@ private:
     DependencyDialog(DependencyDialog &); // not defined
     void operator =(DependencyDialog &); // not defined
 
-    virtual void Resize();
+    virtual void Resize() SAL_OVERRIDE;
 
     FixedText m_text;
     ListBox m_list;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index aa79edf3b75f..3875b396de1e 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -144,13 +144,13 @@ public:
 
     void InitFromDialog(ExtMgrDialog *pParentDialog);
 
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual bool    Notify( NotifyEvent& rNEvt );
+    virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual bool    Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 
-    virtual Size    GetOptimalSize() const;
+    virtual Size    GetOptimalSize() const SAL_OVERRIDE;
 
-    virtual void    RecalcAll();
-    virtual void    selectEntry( const long nPos );
+    virtual void    RecalcAll() SAL_OVERRIDE;
+    virtual void    selectEntry( const long nPos ) SAL_OVERRIDE;
 
     void            enableButtons( bool bEnable );
 };
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index b21776fe8127..763edfd84838 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -141,19 +141,19 @@ public:
                     ExtMgrDialog( Window * pParent, TheExtensionManager *pManager );
     virtual        ~ExtMgrDialog();
 
-    virtual bool    Notify( NotifyEvent& rNEvt );
-    virtual bool    Close();
+    virtual bool    Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+    virtual bool    Close() SAL_OVERRIDE;
 
-    virtual void    showProgress( bool bStart );
+    virtual void    showProgress( bool bStart ) SAL_OVERRIDE;
     virtual void    updateProgress( const OUString &rText,
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > &xAbortChannel);
-    virtual void    updateProgress( const long nProgress );
+                                    const ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > &xAbortChannel) SAL_OVERRIDE;
+    virtual void    updateProgress( const long nProgress ) SAL_OVERRIDE;
 
-    virtual void    updatePackageInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
+    virtual void    updatePackageInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) SAL_OVERRIDE;
 
     void            setGetExtensionsURL( const OUString &rURL );
     virtual long    addPackageToList( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &,
-                                      bool bLicenseMissing = false );
+                                      bool bLicenseMissing = false ) SAL_OVERRIDE;
     bool enablePackage(const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage,
                         bool bEnable );
     bool removePackage(const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
@@ -162,8 +162,8 @@ public:
 
     TheExtensionManager*    getExtensionManager() const { return m_pManager; }
 
-    virtual void    prepareChecking();
-    virtual void    checkEntries();
+    virtual void    prepareChecking() SAL_OVERRIDE;
+    virtual void    checkEntries() SAL_OVERRIDE;
 
     ::com::sun::star::uno::Sequence< OUString > raiseAddPicker();
 };
@@ -214,24 +214,24 @@ public:
                     UpdateRequiredDialog( Window * pParent, TheExtensionManager *pManager );
     virtual        ~UpdateRequiredDialog();
 
-    virtual short   Execute();
-    virtual void    Resize();
-    virtual bool    Close();
+    virtual short   Execute() SAL_OVERRIDE;
+    virtual void    Resize() SAL_OVERRIDE;
+    virtual bool    Close() SAL_OVERRIDE;
 
-    virtual void    showProgress( bool bStart );
+    virtual void    showProgress( bool bStart ) SAL_OVERRIDE;
     virtual void    updateProgress( const OUString &rText,
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > &xAbortChannel);
-    virtual void    updateProgress( const long nProgress );
+                                    const ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > &xAbortChannel) SAL_OVERRIDE;
+    virtual void    updateProgress( const long nProgress ) SAL_OVERRIDE;
 
-    virtual void    updatePackageInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
+    virtual void    updatePackageInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) SAL_OVERRIDE;
 
     virtual long    addPackageToList( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &,
-                                      bool bLicenseMissing = false );
+                                      bool bLicenseMissing = false ) SAL_OVERRIDE;
     bool enablePackage( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage, bool bEnable );
     bool updatePackage( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
 
-    virtual void    prepareChecking();
-    virtual void    checkEntries();
+    virtual void    prepareChecking() SAL_OVERRIDE;
+    virtual void    checkEntries() SAL_OVERRIDE;
 
     ::com::sun::star::uno::Sequence< OUString > raiseAddPicker();
 
@@ -259,8 +259,8 @@ public:
                                  ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xComponentContext );
 
     // XExecutableDialog
-    virtual void SAL_CALL         setTitle( OUString const & title ) throw ( ::com::sun::star::uno::RuntimeException, std::exception );
-    virtual sal_Int16 SAL_CALL    execute() throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual void SAL_CALL         setTitle( OUString const & title ) 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;
 };
 
 } // namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 65e3f8c4404a..4dcf946a41da 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -165,20 +165,20 @@ public:
 
     // XCommandEnvironment
     virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler()
-        throw ( uno::RuntimeException, std::exception );
+        throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual uno::Reference< ucb::XProgressHandler > SAL_CALL getProgressHandler()
-        throw ( uno::RuntimeException, std::exception );
+        throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     // XInteractionHandler
     virtual void SAL_CALL handle( uno::Reference< task::XInteractionRequest > const & xRequest )
-        throw ( uno::RuntimeException, std::exception );
+        throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
     // XProgressHandler
     virtual void SAL_CALL push( uno::Any const & Status )
-        throw ( uno::RuntimeException, std::exception );
+        throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual void SAL_CALL update( uno::Any const & Status )
-        throw ( uno::RuntimeException, std::exception );
-    virtual void SAL_CALL pop() throw ( uno::RuntimeException, std::exception );
+        throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL pop() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 };
 
 
@@ -237,7 +237,7 @@ public:
 private:
     virtual ~Thread();
 
-    virtual void execute();
+    virtual void execute() SAL_OVERRIDE;
 
     void _insert(const TExtensionCmd& rExtCmd);
 
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 6358369eef0e..442b0e199d30 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -107,7 +107,7 @@ public:
 
     // XEventListener
     virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt )
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 
@@ -183,10 +183,10 @@ public:
                     ExtensionBox_Impl(Window* pParent, TheExtensionManager *pManager);
                    ~ExtensionBox_Impl();
 
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    Paint( const Rectangle &rPaintRect );
-    virtual void    Resize();
-    virtual bool    Notify( NotifyEvent& rNEvt );
+    virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void    Paint( const Rectangle &rPaintRect ) SAL_OVERRIDE;
+    virtual void    Resize() SAL_OVERRIDE;
+    virtual bool    Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 
     const Size      GetMinOutputSizePixel() const;
     void            SetExtraSize( long nSize ) { m_nExtraHeight = nSize; }
@@ -218,42 +218,42 @@ public:
     //These functions are used for automatic testing
 
     /** @return  The count of the entries in the list box. */
-    virtual sal_Int32 getItemCount() const;
+    virtual sal_Int32 getItemCount() const SAL_OVERRIDE;
 
     /** @return  The index of the first selected entry in the list box.
         When nothing is selected, which is the case when getItemCount returns '0',
         then this function returns ENTRY_NOTFOUND */
-    virtual sal_Int32 getSelIndex() const;
+    virtual sal_Int32 getSelIndex() const SAL_OVERRIDE;
 
     /** @return  The item name of the entry with the given index
         The index starts with 0.
         Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
-    virtual OUString getItemName( sal_Int32 index ) const;
+    virtual OUString getItemName( sal_Int32 index ) const SAL_OVERRIDE;
 
     /** @return  The version string of the entry with the given index
         The index starts with 0.
         Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
-    virtual OUString getItemVersion( sal_Int32 index ) const;
+    virtual OUString getItemVersion( sal_Int32 index ) const SAL_OVERRIDE;
 
     /** @return  The description string of the entry with the given index
         The index starts with 0.
         Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
-    virtual OUString getItemDescription( sal_Int32 index ) const;
+    virtual OUString getItemDescription( sal_Int32 index ) const SAL_OVERRIDE;
 
     /** @return  The publisher string of the entry with the given index
         The index starts with 0.
         Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
-    virtual OUString getItemPublisher( sal_Int32 index ) const;
+    virtual OUString getItemPublisher( sal_Int32 index ) const SAL_OVERRIDE;
 
     /** @return  The link behind the publisher text of the entry with the given index
         The index starts with 0.
         Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
-    virtual OUString getItemPublisherLink( sal_Int32 index ) const;
+    virtual OUString getItemPublisherLink( sal_Int32 index ) const SAL_OVERRIDE;
 
     /** The entry at the given position will be selected
         Index starts with 0.
         Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */
-    virtual void select( sal_Int32 pos );
+    virtual void select( sal_Int32 pos ) SAL_OVERRIDE;
 
     /** The first found entry with the given name will be selected
         When there was no entry found with the name, the selection doesn't change.
@@ -262,7 +262,7 @@ public:
             1. the name is not unique
             2. one extension can be installed as user and shared extension.
     */
-    virtual void select( const OUString & sName );
+    virtual void select( const OUString & sName ) SAL_OVERRIDE;
 };
 
 }
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 94869d0b9a09..c3c9b15c203f 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -56,8 +56,8 @@ public:
     virtual ~MyApp();
 
     // Application
-    virtual int Main();
-    virtual void DeInit();
+    virtual int Main() SAL_OVERRIDE;
+    virtual void DeInit() SAL_OVERRIDE;
 };
 
 
@@ -156,14 +156,14 @@ public:
 
     // XAsynchronousExecutableDialog
     virtual void SAL_CALL setDialogTitle( OUString const & aTitle )
-        throw (RuntimeException, std::exception);
+        throw (RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL startExecuteModal(
         Reference< ui::dialogs::XDialogClosedListener > const & xListener )
-        throw (RuntimeException, std::exception);
+        throw (RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XJobExecutor
     virtual void SAL_CALL trigger( OUString const & event )
-        throw (RuntimeException, std::exception);
+        throw (RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index d0aa7f73b7b4..a060a3f273aa 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -103,17 +103,17 @@ public:
 
     // XEventListener
     virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt )
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XTerminateListener
     virtual void SAL_CALL queryTermination( ::com::sun::star::lang::EventObject const & evt )
-        throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL notifyTermination( ::com::sun::star::lang::EventObject const & evt )
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XModifyListener
     virtual void SAL_CALL modified( ::com::sun::star::lang::EventObject const & evt )
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 } // namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 8caed8b8403d..870636ccaee1 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -212,7 +212,7 @@ public:
 private:
     virtual ~Thread();
 
-    virtual void execute();
+    virtual void execute() SAL_OVERRIDE;
 
     void handleSpecificError(
         uno::Reference< deployment::XPackage > const & package,
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index 1fe77c521d5c..1dc8e474c57e 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -86,9 +86,9 @@ public:
 
     ~UpdateDialog();
 
-    virtual bool Close();
+    virtual bool Close() SAL_OVERRIDE;
 
-    virtual short Execute();
+    virtual short Execute() SAL_OVERRIDE;
 
     void notifyMenubar( bool bPrepareOnly, bool bRecheckOnly );
     static void createNotifyJob( bool bPrepareOnly,
@@ -120,9 +120,9 @@ private:
         CheckListBox(UpdateDialog::CheckListBox &); // not defined
         void operator =(UpdateDialog::CheckListBox &); // not defined
 
-        virtual void MouseButtonDown(MouseEvent const & event);
-        virtual void MouseButtonUp(MouseEvent const & event);
-        virtual void KeyInput(KeyEvent const & event);
+        virtual void MouseButtonDown(MouseEvent const & event) SAL_OVERRIDE;
+        virtual void MouseButtonUp(MouseEvent const & event) SAL_OVERRIDE;
+        virtual void KeyInput(KeyEvent const & event) SAL_OVERRIDE;
 
         void handlePopupMenu( const Point &rPos );
 
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 8a2363c1ea4c..95b4de14c611 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -89,7 +89,7 @@ public:
 private:
     virtual ~Thread();
 
-    virtual void execute();
+    virtual void execute() SAL_OVERRIDE;
     void downloadExtensions();
     void download(OUString const & aUrls, UpdateData & aUpdatData);
     void installExtensions();
@@ -129,21 +129,21 @@ public:
 
     // XCommandEnvironment
     virtual cssu::Reference<css::task::XInteractionHandler > SAL_CALL
-    getInteractionHandler() throw (cssu::RuntimeException, std::exception);
+    getInteractionHandler() throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual cssu::Reference<css::ucb::XProgressHandler >
-    SAL_CALL getProgressHandler() throw (cssu::RuntimeException, std::exception);
+    SAL_CALL getProgressHandler() throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XInteractionHandler
     virtual void SAL_CALL handle(
         cssu::Reference<css::task::XInteractionRequest > const & xRequest )
-        throw (cssu::RuntimeException, std::exception);
+        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XProgressHandler
     virtual void SAL_CALL push( cssu::Any const & Status )
-        throw (cssu::RuntimeException, std::exception);
+        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL update( cssu::Any const & Status )
-        throw (cssu::RuntimeException, std::exception);
-    virtual void SAL_CALL pop() throw (cssu::RuntimeException, std::exception);
+        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL pop() throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index 2bd9daf6c328..917ca8ae8f1c 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -62,8 +62,8 @@ public:
 
     ~UpdateInstallDialog();
 
-    bool Close();
-    virtual short Execute();
+    bool Close() SAL_OVERRIDE;
+    virtual short Execute() SAL_OVERRIDE;
 
 private:
     UpdateInstallDialog(UpdateInstallDialog &); // not defined
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 39a2dd36eb77..858a370a5560 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -70,7 +70,7 @@ public:
     void SetScrolledHdl( const Link& rHdl )  { maScrolledHdl = rHdl; }
     const Link& GetScrolledHdl() const { return maScrolledHdl; }
 
-    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
 
 protected:
     using MultiLineEdit::Notify;
@@ -102,7 +102,7 @@ struct LicenseDialogImpl : public ModalDialog
         const OUString & sExtensionName,
         const OUString & sLicenseText);
 
-    virtual void Activate();
+    virtual void Activate() SAL_OVERRIDE;
 
 };
 
diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx
index f90a0e806b45..68b50c6df118 100644
--- a/desktop/source/deployment/gui/license_dialog.hxx
+++ b/desktop/source/deployment/gui/license_dialog.hxx
@@ -45,8 +45,8 @@ public:
 
     // XExecutableDialog
     virtual void SAL_CALL setTitle( OUString const & title )
-        throw (css::uno::RuntimeException, std::exception);
-    virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception);
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 }
 #endif