Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

82 files changed, 634 insertions, 634 deletions

diff --git a/include/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx
index 63ac37ee9cab..8c180c0072eb 100644
--- a/include/sfx2/DocumentMetadataAccess.hxx
+++ b/include/sfx2/DocumentMetadataAccess.hxx
@@ -92,37 +92,37 @@ public:
 
     // ::com::sun::star::rdf::XNode:
     virtual OUString SAL_CALL getStringValue()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
     // ::com::sun::star::rdf::XURI:
     virtual OUString SAL_CALL getNamespace()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getLocalName()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
     // ::com::sun::star::rdf::XRepositorySupplier:
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::rdf::XRepository > SAL_CALL getRDFRepository()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
     // ::com::sun::star::rdf::XDocumentMetadataAccess:
     virtual ::com::sun::star::uno::Reference<
                 ::com::sun::star::rdf::XMetadatable > SAL_CALL
         getElementByMetadataReference(
             const ::com::sun::star::beans::StringPair & i_rReference)
-        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::rdf::XMetadatable > SAL_CALL
         getElementByURI(const ::com::sun::star::uno::Reference<
             ::com::sun::star::rdf::XURI > & i_xURI)
         throw (::com::sun::star::uno::RuntimeException,
-            ::com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE;
+            ::com::sun::star::lang::IllegalArgumentException, std::exception) override;
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
             ::com::sun::star::rdf::XURI > > SAL_CALL getMetadataGraphsWithType(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::rdf::XURI > & i_xType)
         throw (::com::sun::star::uno::RuntimeException,
-            ::com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE;
+            ::com::sun::star::lang::IllegalArgumentException, std::exception) override;
     virtual ::com::sun::star::uno::Reference<
                 ::com::sun::star::rdf::XURI> SAL_CALL
         addMetadataFile(const OUString & i_rFileName,
@@ -131,7 +131,7 @@ public:
                 > & i_rTypes)
         throw (::com::sun::star::uno::RuntimeException,
             ::com::sun::star::lang::IllegalArgumentException,
-            ::com::sun::star::container::ElementExistException, std::exception) SAL_OVERRIDE;
+            ::com::sun::star::container::ElementExistException, std::exception) override;
     virtual ::com::sun::star::uno::Reference<
                 ::com::sun::star::rdf::XURI> SAL_CALL
         importMetadataFile(::sal_Int16 i_Format,
@@ -148,23 +148,23 @@ public:
             ::com::sun::star::datatransfer::UnsupportedFlavorException,
             ::com::sun::star::container::ElementExistException,
             ::com::sun::star::rdf::ParseException,
-            ::com::sun::star::io::IOException, std::exception) SAL_OVERRIDE;
+            ::com::sun::star::io::IOException, std::exception) override;
     virtual void SAL_CALL removeMetadataFile(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::rdf::XURI > & i_xGraphName)
         throw (::com::sun::star::uno::RuntimeException,
             ::com::sun::star::lang::IllegalArgumentException,
-            ::com::sun::star::container::NoSuchElementException, std::exception) SAL_OVERRIDE;
+            ::com::sun::star::container::NoSuchElementException, std::exception) override;
     virtual void SAL_CALL addContentOrStylesFile(
             const OUString & i_rFileName)
         throw (::com::sun::star::uno::RuntimeException,
             ::com::sun::star::lang::IllegalArgumentException,
-            ::com::sun::star::container::ElementExistException, std::exception) SAL_OVERRIDE;
+            ::com::sun::star::container::ElementExistException, std::exception) override;
     virtual void SAL_CALL removeContentOrStylesFile(
             const OUString & i_rFileName)
         throw (::com::sun::star::uno::RuntimeException,
             ::com::sun::star::lang::IllegalArgumentException,
-            ::com::sun::star::container::NoSuchElementException, std::exception) SAL_OVERRIDE;
+            ::com::sun::star::container::NoSuchElementException, std::exception) override;
 
     virtual void SAL_CALL loadMetadataFromStorage(
             const ::com::sun::star::uno::Reference<
@@ -175,25 +175,25 @@ public:
                 ::com::sun::star::task::XInteractionHandler> & i_xHandler)
         throw (::com::sun::star::uno::RuntimeException,
             ::com::sun::star::lang::IllegalArgumentException,
-            ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE;
+            ::com::sun::star::lang::WrappedTargetException, std::exception) override;
     virtual void SAL_CALL storeMetadataToStorage(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::embed::XStorage > & i_xStorage)
         throw (::com::sun::star::uno::RuntimeException,
             ::com::sun::star::lang::IllegalArgumentException,
-            ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE;
+            ::com::sun::star::lang::WrappedTargetException, std::exception) override;
     virtual void SAL_CALL loadMetadataFromMedium(
             const ::com::sun::star::uno::Sequence<
                 ::com::sun::star::beans::PropertyValue > & i_rMedium)
         throw (::com::sun::star::uno::RuntimeException,
             ::com::sun::star::lang::IllegalArgumentException,
-            ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE;
+            ::com::sun::star::lang::WrappedTargetException, std::exception) override;
     virtual void SAL_CALL storeMetadataToMedium(
             const ::com::sun::star::uno::Sequence<
                 ::com::sun::star::beans::PropertyValue > & i_rMedium)
         throw (::com::sun::star::uno::RuntimeException,
             ::com::sun::star::lang::IllegalArgumentException,
-            ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE;
+            ::com::sun::star::lang::WrappedTargetException, std::exception) override;
 
 private:
     std::unique_ptr<DocumentMetadataAccess_Impl> m_pImpl;
diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx
index fa265a34a331..1bdba661873b 100644
--- a/include/sfx2/Metadatable.hxx
+++ b/include/sfx2/Metadatable.hxx
@@ -148,23 +148,23 @@ public:
 
     // ::com::sun::star::rdf::XNode:
     virtual OUString SAL_CALL getStringValue()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
     // ::com::sun::star::rdf::XURI:
     virtual OUString SAL_CALL getLocalName()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getNamespace()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
     // ::com::sun::star::rdf::XMetadatable:
     virtual ::com::sun::star::beans::StringPair SAL_CALL getMetadataReference()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setMetadataReference(
         const ::com::sun::star::beans::StringPair & i_rReference)
         throw (::com::sun::star::uno::RuntimeException,
-            ::com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE;
+            ::com::sun::star::lang::IllegalArgumentException, std::exception) override;
     virtual void SAL_CALL ensureMetadataReference()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
 protected:
     /// get the core object corresponding to this UNO object.
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 01238307b5e4..c045223dd225 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -98,9 +98,9 @@ public:
     SfxLinkItem( sal_uInt16 nWhichId, const Link<SfxPoolItem*, void>& rValue ) : SfxPoolItem( nWhichId )
     {   aLink = rValue; }
 
-    virtual SfxPoolItem*     Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE
+    virtual SfxPoolItem*     Clone( SfxItemPool* = 0 ) const override
     {   return new SfxLinkItem( *this ); }
-    virtual bool             operator==( const SfxPoolItem& rL) const SAL_OVERRIDE
+    virtual bool             operator==( const SfxPoolItem& rL) const override
     {   return static_cast<const SfxLinkItem&>(rL).aLink == aLink; }
     const Link<SfxPoolItem*, void>&
                              GetValue() const { return aLink; }
@@ -183,7 +183,7 @@ public:
     // misc.
     bool                        GetOptions(SfxItemSet &);
     void                        SetOptions(const SfxItemSet &);
-    virtual void                Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE;
+    virtual void                Invalidate(sal_uInt16 nId = 0) override;
     void                        NotifyEvent(const SfxEventHint& rEvent, bool bSynchron = true );
     bool                        IsDowning() const;
     void                        ResetLastDir();
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 176e248f6894..610c5e672f25 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -81,7 +81,7 @@ protected:
 
 public:
     virtual ~SfxModalDialog();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
     const SfxItemSet*   GetOutputItemSet() const { return pOutputSet; }
     const SfxItemSet*   GetInputItemSet() const { return pInputSet; }
 };
@@ -103,16 +103,16 @@ protected:
     SfxModelessDialog( SfxBindings*, SfxChildWindow*,
         vcl::Window*, const OUString& rID, const OUString& rUIXMLDescription );
     virtual ~SfxModelessDialog();
-    virtual void dispose() SAL_OVERRIDE;
-    virtual bool            Close() SAL_OVERRIDE;
-    virtual void            Resize() SAL_OVERRIDE;
-    virtual void            Move() SAL_OVERRIDE;
-    virtual void            StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
+    virtual void dispose() override;
+    virtual bool            Close() override;
+    virtual void            Resize() override;
+    virtual void            Move() override;
+    virtual void            StateChanged( StateChangedType nStateChange ) override;
 
 public:
     virtual void            FillInfo(SfxChildWinInfo&) const;
     void                    Initialize (SfxChildWinInfo* pInfo);
-    virtual bool            Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+    virtual bool            Notify( NotifyEvent& rNEvt ) override;
     SfxBindings&            GetBindings()
                             { return *pBindings; }
 
@@ -142,13 +142,13 @@ protected:
                                               const OString& rID, const OUString& rUIXMLDescription,
                                               const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>());
                             virtual ~SfxFloatingWindow();
-    virtual void            dispose() SAL_OVERRIDE;
+    virtual void            dispose() override;
 
-    virtual void            StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
-    virtual bool            Close() SAL_OVERRIDE;
-    virtual void            Resize() SAL_OVERRIDE;
-    virtual void            Move() SAL_OVERRIDE;
-    virtual bool            Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+    virtual void            StateChanged( StateChangedType nStateChange ) override;
+    virtual bool            Close() override;
+    virtual void            Resize() override;
+    virtual void            Move() override;
+    virtual bool            Notify( NotifyEvent& rNEvt ) override;
     SfxBindings&            GetBindings()
                             { return *pBindings; }
 
@@ -184,7 +184,7 @@ public:
         const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui"));
 
     virtual             ~SfxSingleTabDialog();
-    virtual void        dispose() SAL_OVERRIDE;
+    virtual void        dispose() override;
 
     void                SetTabPage(SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0, sal_uInt32 nSettingsId = 0);
     SfxTabPage*         GetTabPage() const { return pImpl->m_pSfxPage; }
diff --git a/include/sfx2/checkin.hxx b/include/sfx2/checkin.hxx
index 76608286a3fc..08b5f86ebe47 100644
--- a/include/sfx2/checkin.hxx
+++ b/include/sfx2/checkin.hxx
@@ -26,7 +26,7 @@ class SfxCheckinDialog : public ModalDialog
     public:
         SfxCheckinDialog( vcl::Window* pParent );
         virtual ~SfxCheckinDialog();
-        virtual void dispose() SAL_OVERRIDE;
+        virtual void dispose() override;
 
         OUString GetComment( );
         bool IsMajor( );
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 00d87054251e..87d1e388b7e2 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -273,7 +273,7 @@ public:
         static  SfxChildWindow* CreateImpl(vcl::Window *pParent, sal_uInt16 nId, \
                     SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \
         static  void RegisterChildWindow (bool bVisible=false, SfxModule *pMod=NULL, SfxChildWindowFlags nFlags=SfxChildWindowFlags::NONE); \
-        virtual SfxChildWinInfo GetInfo() const SAL_OVERRIDE
+        virtual SfxChildWinInfo GetInfo() const override
 
 #define SFX_DECL_CHILDWINDOW_WITHID(Class) \
         SFX_DECL_CHILDWINDOW(Class); \
diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx
index 5ef71e41e0bc..d99035758a06 100644
--- a/include/sfx2/controlwrapper.hxx
+++ b/include/sfx2/controlwrapper.hxx
@@ -200,7 +200,7 @@ public:
 
     /** Enables, disables, shows, or hides the control.
         @descr  Does nothing, if the corresponding parameter is TRISTATE_INDET. */
-    virtual void        ModifyControl( TriState eEnable, TriState eShow ) SAL_OVERRIDE;
+    virtual void        ModifyControl( TriState eEnable, TriState eShow ) override;
 
     /** Derived classes return the value the control contains. */
     virtual ValueT      GetControlValue() const = 0;
@@ -225,11 +225,11 @@ class SFX2_DLLPUBLIC DummyWindowWrapper:
 public:
     explicit            DummyWindowWrapper( vcl::Window& rWindow );
 
-    virtual bool        IsControlDontKnow() const SAL_OVERRIDE;
-    virtual void        SetControlDontKnow( bool ) SAL_OVERRIDE;
+    virtual bool        IsControlDontKnow() const override;
+    virtual void        SetControlDontKnow( bool ) override;
 
-    virtual void*       GetControlValue() const SAL_OVERRIDE;
-    virtual void        SetControlValue( void* ) SAL_OVERRIDE;
+    virtual void*       GetControlValue() const override;
+    virtual void        SetControlValue( void* ) override;
 };
 
 
@@ -241,11 +241,11 @@ class SFX2_DLLPUBLIC CheckBoxWrapper:
 public:
     explicit            CheckBoxWrapper( CheckBox& rCheckBox );
 
-    virtual bool        IsControlDontKnow() const SAL_OVERRIDE;
-    virtual void        SetControlDontKnow( bool bSet ) SAL_OVERRIDE;
+    virtual bool        IsControlDontKnow() const override;
+    virtual void        SetControlDontKnow( bool bSet ) override;
 
-    virtual bool        GetControlValue() const SAL_OVERRIDE;
-    virtual void        SetControlValue( bool bValue ) SAL_OVERRIDE;
+    virtual bool        GetControlValue() const override;
+    virtual void        SetControlValue( bool bValue ) override;
 };
 
 
@@ -262,11 +262,11 @@ public:
 
     virtual ~ColorListBoxWrapper();
 
-    virtual bool        IsControlDontKnow() const SAL_OVERRIDE;
-    virtual void        SetControlDontKnow( bool bSet ) SAL_OVERRIDE;
+    virtual bool        IsControlDontKnow() const override;
+    virtual void        SetControlDontKnow( bool bSet ) override;
 
-    virtual Color       GetControlValue() const SAL_OVERRIDE;
-    virtual void        SetControlValue( Color aColor ) SAL_OVERRIDE;
+    virtual Color       GetControlValue() const override;
+    virtual void        SetControlValue( Color aColor ) override;
 };
 
 
@@ -436,12 +436,12 @@ public:
     void                RegisterControlWrapper( ControlWrapperBase& rWrapper );
 
     /** Enables, disables, shows, or hides the registered controls. */
-    virtual void        ModifyControl( TriState eEnable, TriState eShow ) SAL_OVERRIDE;
+    virtual void        ModifyControl( TriState eEnable, TriState eShow ) override;
 
     /** Returns true if all registered controls are in "don't know" state. */
-    virtual bool        IsControlDontKnow() const SAL_OVERRIDE;
+    virtual bool        IsControlDontKnow() const override;
     /** Sets all registered controls to "don't know" state. */
-    virtual void        SetControlDontKnow( bool bSet ) SAL_OVERRIDE;
+    virtual void        SetControlDontKnow( bool bSet ) override;
 
 private:
     std::unique_ptr< MultiControlWrapperHelper_Impl > mxImpl;
diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx
index 24f64d9a73c1..9913d208e60a 100644
--- a/include/sfx2/ctrlitem.hxx
+++ b/include/sfx2/ctrlitem.hxx
@@ -91,7 +91,7 @@ class SFX2_DLLPUBLIC SfxStatusForwarder: public SfxControllerItem
 
 protected:
     virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                      const SfxPoolItem* pState ) SAL_OVERRIDE;
+                                      const SfxPoolItem* pState ) override;
 
 public:
                             SfxStatusForwarder( sal_uInt16 nSlotId,
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 77cd59561307..783d396548e2 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -168,10 +168,10 @@ public:
                         GetCmisProperties() const { return m_aCmisProperties;}
 
     void        SetCmisProperties(const ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty >& cmisProps );
-    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE;
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
-    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
+    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = NULL ) const override;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
+    virtual bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 };
 
 // class SfxDocumentPage -------------------------------------------------
@@ -215,10 +215,10 @@ private:
 
 protected:
     virtual ~SfxDocumentPage();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
-    virtual bool        FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet* ) SAL_OVERRIDE;
+    virtual bool        FillItemSet( SfxItemSet* ) override;
+    virtual void        Reset( const SfxItemSet* ) override;
 
 public:
     SfxDocumentPage( vcl::Window* pParent, const SfxItemSet& );
@@ -240,10 +240,10 @@ private:
 
 protected:
     virtual ~SfxDocumentDescPage();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
-    virtual bool            FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void            Reset( const SfxItemSet* ) SAL_OVERRIDE;
+    virtual bool            FillItemSet( SfxItemSet* ) override;
+    virtual void            Reset( const SfxItemSet* ) override;
 
 public:
     SfxDocumentDescPage( vcl::Window* pParent, const SfxItemSet& );
@@ -257,7 +257,7 @@ class SFX2_DLLPUBLIC SfxDocumentInfoDialog : public SfxTabDialog
 private:
     sal_uInt16 m_nDocInfoId;
 protected:
-    virtual void    PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) SAL_OVERRIDE;
+    virtual void    PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) override;
 
 public:
     SfxDocumentInfoDialog( vcl::Window* pParent, const SfxItemSet& );
@@ -323,7 +323,7 @@ class CustomPropertiesDurationField : public Edit
     CustomPropertyLine*             m_pLine;
     com::sun::star::util::Duration  m_aDuration;
 protected:
-    virtual void    RequestHelp(const HelpEvent& rEvt) SAL_OVERRIDE;
+    virtual void    RequestHelp(const HelpEvent& rEvt) override;
 public:
     CustomPropertiesDurationField(vcl::Window* pParent, WinBits nStyle, CustomPropertyLine* pLine);
 
@@ -365,9 +365,9 @@ private:
 public:
     CustomPropertiesYesNoButton( vcl::Window* pParent, const ResId& rResId );
     virtual ~CustomPropertiesYesNoButton();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
-    virtual void    Resize() SAL_OVERRIDE;
+    virtual void    Resize() override;
 
     inline void     CheckYes() { m_aYesButton->Check(); }
     inline void     CheckNo() { m_aNoButton->Check(); }
@@ -444,7 +444,7 @@ public:
         FixedText *pHeaderAccType,
         FixedText *pHeaderAccValue);
     virtual ~CustomPropertiesWindow();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     bool                InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar );
     sal_uInt16          GetVisibleLineCount() const;
@@ -480,7 +480,7 @@ private:
 public:
     CustomPropertiesControl(vcl::Window* pParent);
     virtual ~CustomPropertiesControl();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void            AddLine( const OUString& sName, com::sun::star::uno::Any& rAny, bool bInteractive );
 
@@ -490,7 +490,7 @@ public:
                     GetCustomProperties() const
                         { return m_pPropertiesWin->GetCustomProperties(); }
     void    Init(VclBuilderContainer& rParent);
-    virtual void Resize() SAL_OVERRIDE;
+    virtual void Resize() override;
 };
 
 // class SfxCustomPropertiesPage -----------------------------------------
@@ -506,11 +506,11 @@ private:
 
 protected:
     virtual ~SfxCustomPropertiesPage();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
-    virtual bool        FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet* ) SAL_OVERRIDE;
-    virtual sfxpg       DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
+    virtual bool        FillItemSet( SfxItemSet* ) override;
+    virtual void        Reset( const SfxItemSet* ) override;
+    virtual sfxpg       DeactivatePage( SfxItemSet* pSet = NULL ) override;
 
 public:
     SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
@@ -628,9 +628,9 @@ private:
     using TabPage::DeactivatePage;
 
 protected:
-    virtual bool        FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet* ) SAL_OVERRIDE;
-    virtual sfxpg       DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
+    virtual bool        FillItemSet( SfxItemSet* ) override;
+    virtual void        Reset( const SfxItemSet* ) override;
+    virtual sfxpg       DeactivatePage( SfxItemSet* pSet = NULL ) override;
 
 public:
     SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
diff --git a/include/sfx2/dinfedt.hxx b/include/sfx2/dinfedt.hxx
index f56409a49c6d..2908565f8f88 100644
--- a/include/sfx2/dinfedt.hxx
+++ b/include/sfx2/dinfedt.hxx
@@ -32,7 +32,7 @@ public:
     InfoEdit_Impl( vcl::Window* pParent, const ResId& rResId ) :
         Edit( pParent, rResId ) {}
 
-    virtual void    KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE;
+    virtual void    KeyInput( const KeyEvent& rKEvent ) override;
 };
 
 #endif
diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx
index ccc1baa086c9..3170b86f9adb 100644
--- a/include/sfx2/docfac.hxx
+++ b/include/sfx2/docfac.hxx
@@ -89,7 +89,7 @@ private:
 #define SFX_DECL_OBJECTFACTORY()                                            \
 public:                                                                     \
     static SfxObjectFactory&    Factory();                                  \
-    virtual SfxObjectFactory&   GetFactory() const SAL_OVERRIDE { return Factory(); }
+    virtual SfxObjectFactory&   GetFactory() const override { return Factory(); }
 
 #define SFX_IMPL_OBJECTFACTORY(ClassName,GlobName,Flags,ShortName)          \
     SfxObjectFactory& ClassName::Factory()                                  \
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 984fa53ae892..186750529c83 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -56,16 +56,16 @@ protected:
     virtual SfxChildAlignment
                         CheckAlignment(SfxChildAlignment,SfxChildAlignment);
 
-    virtual void        Resize() SAL_OVERRIDE;
-    virtual bool        PrepareToggleFloatingMode() SAL_OVERRIDE;
-    virtual void        ToggleFloatingMode() SAL_OVERRIDE;
-    virtual void        StartDocking() SAL_OVERRIDE;
-    virtual bool        Docking( const Point& rPos, Rectangle& rRect ) SAL_OVERRIDE;
-    virtual void        EndDocking( const Rectangle& rRect, bool bFloatMode ) SAL_OVERRIDE;
-    virtual void        Resizing( Size& rSize ) SAL_OVERRIDE;
-    virtual void        Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
-    virtual bool        Close() SAL_OVERRIDE;
-    virtual void        Move() SAL_OVERRIDE;
+    virtual void        Resize() override;
+    virtual bool        PrepareToggleFloatingMode() override;
+    virtual void        ToggleFloatingMode() override;
+    virtual void        StartDocking() override;
+    virtual bool        Docking( const Point& rPos, Rectangle& rRect ) override;
+    virtual void        EndDocking( const Rectangle& rRect, bool bFloatMode ) override;
+    virtual void        Resizing( Size& rSize ) override;
+    virtual void        Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
+    virtual bool        Close() override;
+    virtual void        Move() override;
 
     SAL_DLLPRIVATE SfxChildWindow* GetChildWindow_Impl()    { return pMgr; }
 
@@ -83,11 +83,11 @@ public:
                                           vcl::Window* pParent,
                                           const OString& rID, const OUString& rUIXMLDescription );
                         virtual ~SfxDockingWindow();
-    virtual void        dispose() SAL_OVERRIDE;
+    virtual void        dispose() override;
 
     void                Initialize (SfxChildWinInfo* pInfo);
     virtual void        FillInfo(SfxChildWinInfo&) const;
-    virtual void        StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
+    virtual void        StateChanged( StateChangedType nStateChange ) override;
 
     void                SetDockingRects(const Rectangle& rOuter, const Rectangle& rInner)
                             { aInnerRect = rInner; aOuterRect = rOuter; }
@@ -102,7 +102,7 @@ public:
 
     void                SetMinOutputSizePixel( const Size& rSize );
     Size                GetMinOutputSizePixel() const;
-    virtual bool        Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+    virtual bool        Notify( NotifyEvent& rNEvt ) override;
     DECL_LINK_TYPED(TimerHdl, Idle *, void);
 
     SAL_DLLPRIVATE void Initialize_Impl();
diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx
index 740f5c3334c0..816d4cd4dcfc 100644
--- a/include/sfx2/docstoragemodifylistener.hxx
+++ b/include/sfx2/docstoragemodifylistener.hxx
@@ -64,10 +64,10 @@ namespace sfx2
         void dispose();
 
         // XModifyListener
-        virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
         // XEventListener
-        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;
 
     protected:
         virtual ~DocumentStorageModifyListener();
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index b1ee5ca9d4a1..92c478f1a0a0 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -76,16 +76,16 @@ public:
 
     SfxEventNamesItem ( const sal_uInt16 nId ) : SfxPoolItem( nId ) {}
 
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     OUString &rText,
-                                    const IntlWrapper * = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const SAL_OVERRIDE;
-    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
-    virtual sal_uInt16      GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE;
+                                    const IntlWrapper * = 0 ) const override;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual SfxPoolItem*    Create(SvStream &, sal_uInt16) const override;
+    virtual SvStream&       Store(SvStream &, sal_uInt16 nItemVersion ) const override;
+    virtual sal_uInt16      GetVersion( sal_uInt16 nFileFormatVersion ) const override;
 
     const SfxEventNamesList& GetEvents() const { return aEventsList;}
     void                    AddEvent( const OUString&, const OUString&, sal_uInt16 );
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index c44dcd2a26e5..f7cfc446f84c 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -48,9 +48,9 @@ class SfxRefItem : public SfxPoolItem
 public:
     SfxRefItem( sal_uInt16 nWhichId, const tools::SvRef<SvRefBase>& rValue ) : SfxPoolItem( nWhichId )
     {   maRef = rValue; }
-    virtual SfxPoolItem*     Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE
+    virtual SfxPoolItem*     Clone( SfxItemPool* = 0 ) const override
     {   return new SfxRefItem( *this ); }
-    virtual bool             operator==( const SfxPoolItem& rL) const SAL_OVERRIDE
+    virtual bool             operator==( const SfxPoolItem& rL) const override
     {   return static_cast<const SfxRefItem&>(rL).maRef == maRef; }
 };
 
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index b12b351099cf..27ee54dc8503 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -221,11 +221,11 @@ public:
                             SfxFrameItem( SfxFrame *p=0 );
                             SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p );
 
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
 
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     SfxFrame*               GetFrame() const
                             { return wFrame; }
@@ -239,10 +239,10 @@ public:
                                 SfxUsrAnyItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Any& rAny );
     ::com::sun::star::uno::Any  GetValue() const
                                 { return aValue; }
-    virtual bool                operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual bool                QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
-    virtual bool                PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
+    virtual bool                operator==( const SfxPoolItem& ) const override;
+    virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual bool                QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool                PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 };
 
 class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem
@@ -257,10 +257,10 @@ public:
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
                                 GetFrame() const
                                 { return m_xFrame; }
-    virtual bool                operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual bool                QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
-    virtual bool                PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
+    virtual bool                operator==( const SfxPoolItem& ) const override;
+    virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual bool                QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool                PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 };
 
 typedef SfxUsrAnyItem SfxUnoAnyItem;
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index 34db79209d4e..a5f292194c77 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -204,15 +204,15 @@ public:
 
     virtual                             ~SfxFrameDescriptorItem();
 
-    virtual bool                        operator ==( const SfxPoolItem& ) const SAL_OVERRIDE;
+    virtual bool                        operator ==( const SfxPoolItem& ) const override;
     SfxFrameDescriptorItem&             operator =( const SfxFrameDescriptorItem & );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
                                             SfxMapUnit eCoreMetric,
                                             SfxMapUnit ePresMetric,
-                                            OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
+                                            OUString &rText, const IntlWrapper * = 0 ) const override;
 
-    virtual SfxPoolItem*                Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+    virtual SfxPoolItem*                Clone( SfxItemPool *pPool = 0 ) const override;
 };
 
 #endif // INCLUDED_SFX2_FRMDESCR_HXX
diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx
index f4bd188e63da..71123d0e6826 100644
--- a/include/sfx2/infobar.hxx
+++ b/include/sfx2/infobar.hxx
@@ -50,11 +50,11 @@ class SfxInfoBarWindow : public vcl::Window
         SfxInfoBarWindow( vcl::Window* parent, const OUString& sId,
                           const OUString& sMessage );
         virtual ~SfxInfoBarWindow( );
-        virtual void dispose() SAL_OVERRIDE;
+        virtual void dispose() override;
 
         const OUString& getId() const { return m_sId; }
-        virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE;
-        virtual void Resize( ) SAL_OVERRIDE;
+        virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override;
+        virtual void Resize( ) override;
 
         /** Add button to Infobar.
          * Infobar takes ownership of the button so the button is
@@ -75,13 +75,13 @@ class SfxInfoBarContainerWindow : public vcl::Window
     public:
         SfxInfoBarContainerWindow(SfxInfoBarContainerChild* pChildWin);
         virtual ~SfxInfoBarContainerWindow( );
-        virtual void dispose() SAL_OVERRIDE;
+        virtual void dispose() override;
 
         SfxInfoBarWindow* appendInfoBar(const OUString& sId, const OUString& sMessage);
         SfxInfoBarWindow* getInfoBar(const OUString& sId);
         void removeInfoBar(SfxInfoBarWindow* pInfoBar);
 
-        virtual void Resize() SAL_OVERRIDE;
+        virtual void Resize() override;
 };
 
 
diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx
index 1f10eaa2a6ed..2f86bf1bda92 100644
--- a/include/sfx2/itemconnect.hxx
+++ b/include/sfx2/itemconnect.hxx
@@ -252,11 +252,11 @@ public:
 
 protected:
     /** Actions according to current flags for the control. */
-    virtual void        ApplyFlags( const SfxItemSet& rItemSet ) SAL_OVERRIDE;
+    virtual void        ApplyFlags( const SfxItemSet& rItemSet ) override;
     /** Resets the control according to the item contents. */
-    virtual void        Reset( const SfxItemSet& rItemSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet& rItemSet ) override;
     /** Fills the item set according to the control's state. */
-    virtual bool        FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) SAL_OVERRIDE;
+    virtual bool        FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) override;
 
     ItemWrapperType     maItemWrp;
     ControlWrapperRef   mxCtrlWrp;
@@ -281,9 +281,9 @@ public:
                             ItemConnFlags nFlags = ITEMCONN_DEFAULT );
 
 protected:
-    virtual void        ApplyFlags( const SfxItemSet& rItemSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rItemSet ) SAL_OVERRIDE;
-    virtual bool        FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) SAL_OVERRIDE;
+    virtual void        ApplyFlags( const SfxItemSet& rItemSet ) override;
+    virtual void        Reset( const SfxItemSet& rItemSet ) override;
+    virtual bool        FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) override;
 
 private:
     sal_uInt16              mnSlot;
@@ -432,9 +432,9 @@ public:
     void                AddConnection( ItemConnectionBase* pConnection );
 
 protected:
-    virtual void        ApplyFlags( const SfxItemSet& rItemSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rItemSet ) SAL_OVERRIDE;
-    virtual bool        FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) SAL_OVERRIDE;
+    virtual void        ApplyFlags( const SfxItemSet& rItemSet ) override;
+    virtual void        Reset( const SfxItemSet& rItemSet ) override;
+    virtual bool        FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) override;
 
 private:
     std::unique_ptr< ItemConnectionArrayImpl > mxImpl;
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index f8d353c8a85b..27b87e127f89 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -80,21 +80,21 @@ friend class SfxStyleDialog;
     void    SetDescriptionText_Impl();
 
     virtual ~SfxManageStyleSheetPage();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
 
 protected:
-    virtual bool        FillItemSet(SfxItemSet *) SAL_OVERRIDE;
-    virtual void        Reset(const SfxItemSet *) SAL_OVERRIDE;
+    virtual bool        FillItemSet(SfxItemSet *) override;
+    virtual void        Reset(const SfxItemSet *) override;
 
     static bool    Execute_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr,
                           sal_uInt16 nFamily, sal_uInt16 nMask = 0,
                           const sal_uInt16* pModifier = NULL );
     using TabPage::ActivatePage;
-        virtual void        ActivatePage(const SfxItemSet &) SAL_OVERRIDE;
+        virtual void        ActivatePage(const SfxItemSet &) override;
         using TabPage::DeactivatePage;
-    virtual sfxpg DeactivatePage(SfxItemSet * = 0) SAL_OVERRIDE;
+    virtual sfxpg DeactivatePage(SfxItemSet * = 0) override;
 
 public:
     SfxManageStyleSheetPage(vcl::Window *pParent, const SfxItemSet &rAttrSet );
diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx
index a934d501e2bc..71720ebb1fd0 100644
--- a/include/sfx2/minfitem.hxx
+++ b/include/sfx2/minfitem.hxx
@@ -45,8 +45,8 @@ public:
 
     SfxMacroInfoItem( const SfxMacroInfoItem& );
 
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
     OUString                GetMethod() const
                                 { return aMethodName; }
     void                    SetMethod( const OUString& r )
diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx
index e3864230a194..b7ac4dd2946f 100644
--- a/include/sfx2/mnuitem.hxx
+++ b/include/sfx2/mnuitem.hxx
@@ -64,7 +64,7 @@ public:
     SfxVirtualMenu*         GetPopupMenu() const;
 
     virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                          const SfxPoolItem* pState ) SAL_OVERRIDE;
+                                          const SfxPoolItem* pState ) override;
 
     static SfxMenuControl*    CreateControl( sal_uInt16 nId, Menu &, SfxBindings & );
     static SfxUnoMenuControl* CreateControl( const OUString&, sal_uInt16, Menu&, const OUString& sItemText, SfxBindings&, SfxVirtualMenu* );
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index d98b5c9c190d..40801da49d98 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -86,7 +86,7 @@ public:
     virtual VclPtr<SfxTabPage>  CreateTabPage( sal_uInt16 nId,
                                                vcl::Window* pParent,
                                                const SfxItemSet& rSet );
-    virtual void                Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE;
+    virtual void                Invalidate(sal_uInt16 nId = 0) override;
 
     bool                        IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const;
 
diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx
index 37f7a144dce9..749adbf9f7d7 100644
--- a/include/sfx2/navigat.hxx
+++ b/include/sfx2/navigat.hxx
@@ -45,9 +45,9 @@ public:
                             vcl::Window* pParent ,
                             WinBits nBits );
 
-    virtual void        Resize() SAL_OVERRIDE;
-    virtual void        Resizing( Size& rSize ) SAL_OVERRIDE;
-    virtual bool        Close() SAL_OVERRIDE;
+    virtual void        Resize() override;
+    virtual void        Resizing( Size& rSize ) override;
+    virtual bool        Close() override;
 };
 
 #endif
diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx
index 05482a4e1027..8c02ba274928 100644
--- a/include/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
@@ -67,7 +67,7 @@ public:
 
     SfxNewFileDialog(vcl::Window *pParent, sal_uInt16 nFlags = 0);
     virtual ~SfxNewFileDialog();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     // Returns false, when '- No -' is set as Template
     // Template names can only be obtained when IsTemplate() returns true.
diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx
index 61724dfc52aa..fd719c4a311d 100644
--- a/include/sfx2/newstyle.hxx
+++ b/include/sfx2/newstyle.hxx
@@ -46,7 +46,7 @@ private:
 public:
     SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& );
     virtual ~SfxNewStyleDlg();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     OUString                GetName() const { return comphelper::string::stripStart(m_pColBox->GetText(), ' '); }
 };
diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx
index 86819aba688a..70ad39042b0b 100644
--- a/include/sfx2/objitem.hxx
+++ b/include/sfx2/objitem.hxx
@@ -35,8 +35,8 @@ public:
                              TYPEINFO_OVERRIDE();
                              SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=0 );
 
-    virtual bool             operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+    virtual bool             operator==( const SfxPoolItem& ) const override;
+    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const override;
 
     SfxShell*                GetShell() const
                              { return _pSh; }
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index f30c068ca780..a7466f1ed596 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -230,7 +230,7 @@ protected:
     virtual                     ~SfxObjectShell();
 
     void                        ModifyChanged();
-    virtual bool                Close() SAL_OVERRIDE;
+    virtual bool                Close() override;
 
     /** declares the document to have capabilities to contain basic/dialog libraries
     */
@@ -270,7 +270,7 @@ public:
                                 GetCurrentComponent();
     static void                 SetCurrentComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent );
 
-    virtual void                Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE;
+    virtual void                Invalidate(sal_uInt16 nId = 0) override;
 
     SfxObjectShellFlags         GetFlags( ) const;
 
@@ -521,7 +521,7 @@ public:
 
                                 // Documents, for which to format the view size
 
-    virtual SfxObjectShell*     GetObjectShell() SAL_OVERRIDE;
+    virtual SfxObjectShell*     GetObjectShell() override;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
                                 GetModel() const;
@@ -565,16 +565,16 @@ public:
     SvGlobalName    GetClassName() const;
 
     // comphelper::IEmbeddedHelper
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler() const SAL_OVERRIDE;
-    virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const SAL_OVERRIDE
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler() const override;
+    virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const override
     {
         return const_cast<SfxObjectShell*>(this)->GetStorage();
     }
-    virtual comphelper::EmbeddedObjectContainer& getEmbeddedObjectContainer() const SAL_OVERRIDE
+    virtual comphelper::EmbeddedObjectContainer& getEmbeddedObjectContainer() const override
     {
         return GetEmbeddedObjectContainer();
     }
-    bool    isEnableSetModified() const SAL_OVERRIDE
+    bool    isEnableSetModified() const override
     {
         return IsEnableSetModified();
     }
@@ -806,7 +806,7 @@ class AutoReloadTimer_Impl : public Timer
 public:
     AutoReloadTimer_Impl( const OUString& rURL, sal_uInt32 nTime,
                           SfxObjectShell* pSh );
-    virtual void Invoke() SAL_OVERRIDE;
+    virtual void Invoke() override;
 };
 
 class SFX2_DLLPUBLIC SfxObjectShellItem: public SfxPoolItem
@@ -829,10 +829,10 @@ public:
                                 pObjSh( pObjShell )
                             {}
 
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 };
 
 #endif
diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index 0998ab06546b..212dc88ae09b 100644
--- a/include/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.hxx
@@ -84,7 +84,7 @@ private:
 public:
     SfxPasswordDialog(vcl::Window* pParent, const OUString* pGroupText = NULL);
     virtual ~SfxPasswordDialog();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     OUString GetUser() const
     {
@@ -126,7 +126,7 @@ public:
 
     void ShowMinLengthText(bool bShow);
 
-    virtual short Execute() SAL_OVERRIDE;
+    virtual short Execute() override;
 };
 
 #endif // INCLUDED_SFX2_PASSWD_HXX
diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx
index 18406941ebd8..caed737645d9 100644
--- a/include/sfx2/printer.hxx
+++ b/include/sfx2/printer.hxx
@@ -49,7 +49,7 @@ public:
                                         const JobSetup &rTheOrigJobSetup );
                             SfxPrinter( const SfxPrinter &rPrinter );
                             virtual ~SfxPrinter();
-    virtual void            dispose() SAL_OVERRIDE;
+    virtual void            dispose() override;
 
     VclPtr<SfxPrinter>      Clone() const;
 
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index 60faa1c0c7c4..f3a48dbcfd4e 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -89,17 +89,17 @@ private:
 protected:
 
     using TabPage::DeactivatePage;
-    virtual sfxpg       DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
+    virtual sfxpg       DeactivatePage( SfxItemSet* pSet = NULL ) override;
 
 public:
 
                         SfxCommonPrintOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual             ~SfxCommonPrintOptionsTabPage();
-    virtual void        dispose() SAL_OVERRIDE;
-    virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual vcl::Window*     GetParentLabeledBy( const vcl::Window* pLabel ) const SAL_OVERRIDE;
-    virtual vcl::Window*     GetParentLabelFor( const vcl::Window* pLabel ) const SAL_OVERRIDE;
+    virtual void        dispose() override;
+    virtual bool        FillItemSet( SfxItemSet* rSet ) override;
+    virtual void        Reset( const SfxItemSet* rSet ) override;
+    virtual vcl::Window*     GetParentLabeledBy( const vcl::Window* pLabel ) const override;
+    virtual vcl::Window*     GetParentLabelFor( const vcl::Window* pLabel ) const override;
 
     static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
 };
diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx
index 7655ccb58667..675d5711e8ce 100644
--- a/include/sfx2/prnmon.hxx
+++ b/include/sfx2/prnmon.hxx
@@ -45,10 +45,10 @@ public:
                                                    SfxViewShell *pViewShell,
                                                    const SfxItemSet *rOptions );
     virtual                 ~SfxPrintOptionsDialog();
-    virtual void            dispose() SAL_OVERRIDE;
+    virtual void            dispose() override;
 
-    virtual short           Execute() SAL_OVERRIDE;
-    virtual bool            Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+    virtual short           Execute() override;
+    virtual bool            Notify( NotifyEvent& rNEvt ) override;
 
     const SfxItemSet&       GetOptions() const { return *pOptions; }
     void                    DisableHelp();
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index f502fa0eefcd..130685331912 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -52,23 +52,23 @@ public:
 
     int     mnFileTypes;
 
-    virtual void Clear() SAL_OVERRIDE;
+    virtual void Clear() override;
 
     /// Update the information in the view.
-    virtual void Reload() SAL_OVERRIDE;
+    virtual void Reload() override;
 
     DECL_STATIC_LINK_TYPED( RecentDocsView, ExecuteHdl_Impl, void*, void );
 
 protected:
-    virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
 
-    virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
 
-    virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE;
+    virtual void OnItemDblClicked(ThumbnailViewItem *pItem) override;
 
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
 
-    virtual void LoseFocus() SAL_OVERRIDE;
+    virtual void LoseFocus() override;
 
     bool isAcceptedFile(const OUString &rURL) const;
 
diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx
index ee50a3c2df74..ca24f93424ab 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -17,7 +17,7 @@ class RecentDocsViewItem : public ThumbnailViewItem
 public:
     RecentDocsViewItem(ThumbnailView &rView, const OUString &rURL,
         const OUString &rTitle, const BitmapEx& rThumbnail, sal_uInt16 nId, long nThumbnailSize = 256);
-    virtual void setEditTitle (bool edit, bool bChangeFocus = true) SAL_OVERRIDE;
+    virtual void setEditTitle (bool edit, bool bChangeFocus = true) override;
 
     /** Updates own highlight status based on the aPoint position.
 
@@ -25,15 +25,15 @@ public:
 
         Returns rectangle that needs to be invalidated.
     */
-    virtual Rectangle updateHighlight(bool bVisible, const Point& rPoint) SAL_OVERRIDE;
+    virtual Rectangle updateHighlight(bool bVisible, const Point& rPoint) override;
 
     /// Text to be used for the tooltip.
-    virtual OUString getHelpText() const SAL_OVERRIDE;
+    virtual OUString getHelpText() const override;
 
     virtual void Paint(drawinglayer::processor2d::BaseProcessor2D *pProcessor,
-                       const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE;
+                       const ThumbnailItemAttributes *pAttrs) override;
 
-    virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual void MouseButtonUp(const MouseEvent& rMEvt) override;
 
     /// Called when the user clicks a document - it will open it.
     void OpenDocument();
diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx
index 84ad9dc0e609..cc0eb949913e 100644
--- a/include/sfx2/securitypage.hxx
+++ b/include/sfx2/securitypage.hxx
@@ -33,8 +33,8 @@ class SfxSecurityPage : public SfxTabPage
     std::unique_ptr< SfxSecurityPage_Impl > m_pImpl;
 
 protected:
-    virtual bool            FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void            Reset( const SfxItemSet* ) SAL_OVERRIDE;
+    virtual bool            FillItemSet( SfxItemSet* ) override;
+    virtual void            Reset( const SfxItemSet* ) override;
 
 public:
     SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& );
diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx
index 93955c11900b..f6260c54c238 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -95,33 +95,33 @@ public:
     SAL_DLLPRIVATE void ReleaseShell_Impl();
     SAL_DLLPRIVATE void BorderWidthsChanged_Impl();
 
-    css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator(  ) throw (css::uno::RuntimeException, std::exception) override;
 
 
     //  XController2
-    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual css::uno::Reference< css::ui::XSidebarProvider > SAL_CALL getSidebar() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::ui::XSidebarProvider > SAL_CALL getSidebar() throw (css::uno::RuntimeException, std::exception) override;
 
 
     //  XController
 
 
-    virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) override ;
 
-    virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException, std::exception ) override ;
 
-    virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw( css::uno::RuntimeException, std::exception ) override ;
 
-    css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException, std::exception ) override ;
 
-    void SAL_CALL restoreViewData( const css::uno::Any& aValue ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    void SAL_CALL restoreViewData( const css::uno::Any& aValue ) throw( css::uno::RuntimeException, std::exception ) override ;
 
-    css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw( css::uno::RuntimeException, std::exception ) override ;
 
-    css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) override ;
 
 
     //  XDispatchProvider
@@ -129,51 +129,51 @@ public:
 
     virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(  const   css::util::URL &    aURL            ,
                                                                                   const   OUString &   sTargetFrameName,
-                                                                                  FrameSearchFlags            eSearchFlags    ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+                                                                                  FrameSearchFlags            eSearchFlags    ) throw( css::uno::RuntimeException, std::exception ) override ;
 
-    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) override ;
 
 
     //  XControllerBorder
 
 
-    virtual css::frame::BorderWidths SAL_CALL getBorder() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL addBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL removeBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::awt::Rectangle SAL_CALL queryBorderedArea( const css::awt::Rectangle& aPreliminaryRectangle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::frame::BorderWidths SAL_CALL getBorder() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL queryBorderedArea( const css::awt::Rectangle& aPreliminaryRectangle ) throw (css::uno::RuntimeException, std::exception) override;
 
 
     //  XComponent
 
 
-    virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override ;
 
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException, std::exception ) override ;
 
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
-    virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException, std::exception ) override ;
+    virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) override;
 
-    virtual void SAL_CALL addKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL addKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
 
 
     //  XDispatchInformationProvider
-    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception) override;
 
     // css::frame::XTitle
-    virtual OUString SAL_CALL getTitle(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getTitle(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) override;
 
     // css::frame::XTitleChangeBroadcaster
-    virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener )     throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener )     throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
 
     // css::lang::XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException, std::exception) override;
 
     // FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now;
     // either the _Impl name should vanish or there should be an "official" API
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index a19852e158dc..f3e70d3ca073 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -193,7 +193,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) override ;
 
     /**___________________________________________________________________________________________________
         @short      increment refcount
@@ -202,7 +202,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual void SAL_CALL acquire() throw() SAL_OVERRIDE ;
+    virtual void SAL_CALL acquire() throw() override ;
 
     /**___________________________________________________________________________________________________
         @short      decrement refcount
@@ -211,7 +211,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual void SAL_CALL release() throw() SAL_OVERRIDE ;
+    virtual void SAL_CALL release() throw() override ;
 
 
     //  XTypeProvider
@@ -225,7 +225,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override ;
 
     /**___________________________________________________________________________________________________
         @short      get implementation id
@@ -238,7 +238,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override ;
 
 
 
@@ -248,59 +248,59 @@ public:
     /**___________________________________________________________________________________________________
         @seealso    XStarBasicAccess
     */
-    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getLibraryContainer() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getLibraryContainer() throw( css::uno::RuntimeException, std::exception ) override;
 
     /**___________________________________________________________________________________________________
         @seealso    XStarBasicAccess
     */
     virtual void SAL_CALL createLibrary( const OUString& LibName, const OUString& Password,
         const OUString& ExternalSourceURL, const OUString& LinkTargetURL )
-            throw(css::container::ElementExistException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
 
     /**___________________________________________________________________________________________________
         @seealso    XStarBasicAccess
     */
     virtual void SAL_CALL addModule( const OUString& LibraryName, const OUString& ModuleName,
         const OUString& Language, const OUString& Source )
-            throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
 
     /**___________________________________________________________________________________________________
         @seealso    XStarBasicAccess
     */
     virtual void SAL_CALL addDialog( const OUString& LibraryName, const OUString& DialogName,
         const css::uno::Sequence< sal_Int8 >& Data )
-            throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
 
 
 
     //  XChild
 
 
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() throw( css::uno::RuntimeException, std::exception ) override ;
 
     virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw(css::lang::NoSupportException,
-                                                                                        css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                                                                        css::uno::RuntimeException, std::exception) override;
 
 
     //  XComponent
 
 
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
 
     // XDocumentPropertiesSupplier
     virtual css::uno::Reference< css::document::XDocumentProperties >
         SAL_CALL getDocumentProperties()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
 
     //  XEventListener
 
 
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
 
 
     //  XModel
@@ -308,124 +308,124 @@ public:
 
     virtual sal_Bool SAL_CALL attachResource(const OUString& sURL,
                                              const css::uno::Sequence< css::beans::PropertyValue >& aArgs)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs() throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual void SAL_CALL lockControllers() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL lockControllers() throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual void SAL_CALL unlockControllers() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL unlockControllers() throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual sal_Bool SAL_CALL hasControllersLocked() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Bool SAL_CALL hasControllersLocked() throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController() throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController )
-        throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
 
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection() throw (css::uno::RuntimeException, std::exception) override;
 
 
     //  XModel2
 
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL getControllers()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL getAvailableViewControllerNames()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createDefaultViewController(const css::uno::Reference< css::frame::XFrame >& Frame )
         throw (css::uno::RuntimeException         ,
                css::lang::IllegalArgumentException,
-               css::uno::Exception, std::exception                ) SAL_OVERRIDE;
+               css::uno::Exception, std::exception                ) override;
 
     virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createViewController(const OUString&                                 ViewName       ,
                                                                                           const css::uno::Sequence< css::beans::PropertyValue >& Arguments      ,
                                                                                           const css::uno::Reference< css::frame::XFrame >&       Frame          )
         throw (css::uno::RuntimeException         ,
                css::lang::IllegalArgumentException,
-               css::uno::Exception, std::exception                ) SAL_OVERRIDE;
+               css::uno::Exception, std::exception                ) override;
 
 
     //  XModifiable2
 
 
-    virtual sal_Bool SAL_CALL disableSetModified(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL enableSetModified(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL isSetModifiedEnabled(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Bool SAL_CALL disableSetModified(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL enableSetModified(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isSetModifiedEnabled(  ) throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL setModified( sal_Bool bModified )
-        throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
 
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override ;
 
-    virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & xListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
+    virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & xListener) throw( css::uno::RuntimeException, std::exception ) override ;
 
 
     //  XCloseable
 
 
-    virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
 
 
     //  XCloseBroadcaster
 
 
-    virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
 
 
     //  XPrintJobBroadcaster
 
 
-    virtual void SAL_CALL addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
 
 
     //  XPrintable
 
 
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter() throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL setPrinter( const css::uno::Sequence< css::beans::PropertyValue >& seqPrinter )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL print( const css::uno::Sequence< css::beans::PropertyValue >& seqOptions )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
 
     //  XStorable2
 
 
     virtual void SAL_CALL storeSelf( const  css::uno::Sequence< css::beans::PropertyValue >&   seqArguments    )
-        throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
 
 
     //  XStorable
 
 
-    virtual sal_Bool SAL_CALL hasLocation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Bool SAL_CALL hasLocation() throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual OUString SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual sal_Bool SAL_CALL isReadonly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Bool SAL_CALL isReadonly() throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual void SAL_CALL store() throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL store() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL storeAsURL(   const   OUString& sURL,
                                         const   css::uno::Sequence< css::beans::PropertyValue >&   seqArguments    )
-        throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
+        throw (css::io::IOException, css::uno::RuntimeException, std::exception) override ;
 
     virtual void SAL_CALL storeToURL(   const   OUString& sURL,
                                         const   css::uno::Sequence< css::beans::PropertyValue >&   seqArguments    )
-        throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
 
 
 
@@ -437,23 +437,23 @@ public:
         throw (css::frame::DoubleInitializationException,
                css::io::IOException,
                css::uno::RuntimeException,
-               css::uno::Exception, std::exception) SAL_OVERRIDE;
+               css::uno::Exception, std::exception) override;
 
     virtual void SAL_CALL load( const   css::uno::Sequence< css::beans::PropertyValue >&   seqArguments )
         throw (css::frame::DoubleInitializationException,
                css::io::IOException,
                css::uno::RuntimeException,
-               css::uno::Exception, std::exception) SAL_OVERRIDE;
+               css::uno::Exception, std::exception) override;
 
 
     //  XDocumentSubStorageSupplier
 
 
     virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode )
-        throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw ( css::uno::RuntimeException, std::exception ) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames()
-        throw ( css::io::IOException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw ( css::io::IOException, css::uno::RuntimeException, std::exception ) override;
 
 
     //  XStorageBasedDocument
@@ -465,33 +465,33 @@ public:
                 com::sun::star::frame::DoubleInitializationException,
                 css::io::IOException,
                 css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage,
                                             const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor )
         throw ( css::lang::IllegalArgumentException,
                 css::io::IOException,
                 css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL switchToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage )
         throw ( css::lang::IllegalArgumentException,
                 css::io::IOException,
                 css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                css::uno::RuntimeException, std::exception ) override;
 
     virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage()
         throw ( css::io::IOException,
                 css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL addStorageChangeListener(
             const css::uno::Reference< css::document::XStorageChangeListener >& xListener )
-        throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw ( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL removeStorageChangeListener(
             const css::uno::Reference< css::document::XStorageChangeListener >& xListener )
-        throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw ( css::uno::RuntimeException, std::exception ) override;
 
 
     //  XVisualObject
@@ -501,33 +501,33 @@ public:
         throw ( css::lang::IllegalArgumentException,
                 css::embed::WrongStateException,
                 css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                css::uno::RuntimeException, std::exception ) override;
 
     virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
         throw ( css::lang::IllegalArgumentException,
                 css::embed::WrongStateException,
                 css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                css::uno::RuntimeException, std::exception ) override;
 
     virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
         throw ( css::lang::IllegalArgumentException,
                 css::embed::WrongStateException,
                 css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                css::uno::RuntimeException, std::exception ) override;
 
     virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
         throw ( css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                css::uno::RuntimeException, std::exception ) override;
 
 
     //  XScriptProviderSupplier
 
 
-    virtual css::uno::Reference< css::script::provider::XScriptProvider > SAL_CALL getScriptProvider() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::script::provider::XScriptProvider > SAL_CALL getScriptProvider() throw ( css::uno::RuntimeException, std::exception ) override;
 
 
     //  XUIConfigurationManagerSupplier
-    virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager() throw ( css::uno::RuntimeException, std::exception ) override;
 
 
     //  XTransferable
@@ -536,13 +536,13 @@ public:
     virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor )
         throw (css::datatransfer::UnsupportedFlavorException,
                css::io::IOException,
-               css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+               css::uno::RuntimeException, std::exception) override;
 
     virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
 
 
@@ -555,22 +555,22 @@ public:
         @return     -   an Events object.
     */
 
-    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() throw( css::uno::RuntimeException, std::exception ) override;
 
 
 
     //  XEmbeddedScripts
 
 
-    virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getBasicLibraries() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getDialogLibraries() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL getAllowMacroExecution() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getBasicLibraries() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getDialogLibraries() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getAllowMacroExecution() throw (css::uno::RuntimeException, std::exception) override;
 
 
     //  XScriptInvocationContext
 
 
-    virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception) override;
 
 
     //  XEventBroadcaster
@@ -580,121 +580,121 @@ public:
         @descr      -   registers the given XEventListener.
     */
 
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
 
     /**___________________________________________________________________________________________________
         @descr      -   unregisters the given XEventListener.
     */
 
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
 
 
     //  XDocumentEventBroadcaster
 
 
-    virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
 
 
     //  XUnoTunnel
 
 
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
 
     // css.frame.XModule
     virtual void SAL_CALL setIdentifier(const OUString& sIdentifier)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // css.frame.XModule
     virtual OUString SAL_CALL getIdentifier()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // css.frame.XTitle
     virtual OUString SAL_CALL getTitle()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // css.frame.XTitle
     virtual void SAL_CALL setTitle( const OUString& sTitle )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // css.frame.XTitleChangeBroadcaster
     virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // css.frame.XTitleChangeBroadcaster
     virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // css.frame.XUntitledNumbers
     virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent )
         throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception         ) SAL_OVERRIDE;
+               css::uno::RuntimeException, std::exception         ) override;
 
     // css.frame.XUntitledNumbers
     virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber )
         throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception         ) SAL_OVERRIDE;
+               css::uno::RuntimeException, std::exception         ) override;
 
     // css.frame.XUntitledNumbers
     virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent )
         throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception         ) SAL_OVERRIDE;
+               css::uno::RuntimeException, std::exception         ) override;
 
     // css.frame.XUntitledNumbers
     virtual OUString SAL_CALL getUntitledPrefix()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // css.document.XDocumentRecovery
     virtual sal_Bool SAL_CALL wasModifiedSinceLastSave()
-        throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw ( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL storeToRecoveryFile( const OUString& i_TargetLocation, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor )
         throw ( css::uno::RuntimeException,
                 css::io::IOException,
-                css::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE;
+                css::lang::WrappedTargetException, std::exception ) override;
     virtual void SAL_CALL recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor )
         throw ( css::uno::RuntimeException,
                 css::io::IOException,
-                css::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE;
+                css::lang::WrappedTargetException, std::exception ) override;
 
     // css.document.XUndoManagerSupplier
-    virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager(  ) throw (css::uno::RuntimeException, std::exception) override;
 
 
 
     // css::rdf::XNode:
     virtual OUString SAL_CALL getStringValue()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // css::rdf::XURI:
     virtual OUString SAL_CALL getNamespace()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // css::rdf::XRepositorySupplier:
     virtual css::uno::Reference<
         css::rdf::XRepository > SAL_CALL getRDFRepository()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // css::rdf::XDocumentMetadataAccess:
     virtual css::uno::Reference<
                 css::rdf::XMetadatable > SAL_CALL
         getElementByMetadataReference(
             const css::beans::StringPair & i_rReference)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Reference<
                 css::rdf::XMetadatable > SAL_CALL
         getElementByURI(const css::uno::Reference<
             css::rdf::XURI > & i_xURI)
         throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE;
+            css::lang::IllegalArgumentException, std::exception) override;
     virtual css::uno::Sequence< css::uno::Reference<
             css::rdf::XURI > > SAL_CALL getMetadataGraphsWithType(
             const css::uno::Reference<
                 css::rdf::XURI > & i_xType)
         throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE;
+            css::lang::IllegalArgumentException, std::exception) override;
     virtual css::uno::Reference<
                 css::rdf::XURI> SAL_CALL
         addMetadataFile(const OUString & i_rFileName,
@@ -703,7 +703,7 @@ public:
                 > & i_rTypes)
         throw (css::uno::RuntimeException,
             css::lang::IllegalArgumentException,
-            css::container::ElementExistException, std::exception) SAL_OVERRIDE;
+            css::container::ElementExistException, std::exception) override;
     virtual css::uno::Reference<
                 css::rdf::XURI> SAL_CALL
         importMetadataFile(::sal_Int16 i_Format,
@@ -720,23 +720,23 @@ public:
             css::datatransfer::UnsupportedFlavorException,
             css::container::ElementExistException,
             css::rdf::ParseException,
-            css::io::IOException, std::exception) SAL_OVERRIDE;
+            css::io::IOException, std::exception) override;
     virtual void SAL_CALL removeMetadataFile(
             const css::uno::Reference<
                 css::rdf::XURI > & i_xGraphName)
         throw (css::uno::RuntimeException,
             css::lang::IllegalArgumentException,
-            css::container::NoSuchElementException, std::exception) SAL_OVERRIDE;
+            css::container::NoSuchElementException, std::exception) override;
     virtual void SAL_CALL addContentOrStylesFile(
             const OUString & i_rFileName)
         throw (css::uno::RuntimeException,
             css::lang::IllegalArgumentException,
-            css::container::ElementExistException, std::exception) SAL_OVERRIDE;
+            css::container::ElementExistException, std::exception) override;
     virtual void SAL_CALL removeContentOrStylesFile(
             const OUString & i_rFileName)
         throw (css::uno::RuntimeException,
             css::lang::IllegalArgumentException,
-            css::container::NoSuchElementException, std::exception) SAL_OVERRIDE;
+            css::container::NoSuchElementException, std::exception) override;
 
     virtual void SAL_CALL loadMetadataFromStorage(
             const css::uno::Reference<
@@ -747,53 +747,53 @@ public:
                 css::task::XInteractionHandler> & i_xHandler)
         throw (css::uno::RuntimeException,
             css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE;
+            css::lang::WrappedTargetException, std::exception) override;
     virtual void SAL_CALL storeMetadataToStorage(
             const css::uno::Reference<
                 css::embed::XStorage > & i_xStorage)
         throw (css::uno::RuntimeException,
             css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE;
+            css::lang::WrappedTargetException, std::exception) override;
     virtual void SAL_CALL loadMetadataFromMedium(
             const css::uno::Sequence<
                 css::beans::PropertyValue > & i_rMedium)
         throw (css::uno::RuntimeException,
             css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE;
+            css::lang::WrappedTargetException, std::exception) override;
     virtual void SAL_CALL storeMetadataToMedium(
             const css::uno::Sequence<
                 css::beans::PropertyValue > & i_rMedium)
         throw (css::uno::RuntimeException,
             css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE;
+            css::lang::WrappedTargetException, std::exception) override;
 
     // XCmisDocument
 
     virtual css::uno::Sequence< css::document::CmisProperty >
             SAL_CALL getCmisProperties()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setCmisProperties(
             const css::uno::Sequence<
                 css::document::CmisProperty >& _cmisproperties )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL updateCmisProperties(
             const css::uno::Sequence<
                 css::document::CmisProperty >& _cmisproperties )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     virtual css::uno::Sequence< css::document::CmisVersion > SAL_CALL getAllVersions ( )
-        throw (css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception ) override;
 
-    virtual void SAL_CALL checkOut(  ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL cancelCheckOut(  ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL checkOut(  ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL cancelCheckOut(  ) throw ( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL checkIn( sal_Bool bIsMajor, const OUString & rMessage  )
-        throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw ( css::uno::RuntimeException, std::exception ) override;
 
-    virtual sal_Bool SAL_CALL isVersionable( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL canCheckOut( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL canCancelCheckOut( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL canCheckIn( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual sal_Bool SAL_CALL isVersionable( ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL canCheckOut( ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL canCancelCheckOut( ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL canCheckIn( ) throw ( css::uno::RuntimeException, std::exception ) override;
 
     bool getBoolPropertyValue( const OUString& rName ) throw ( css::uno::RuntimeException );
 
@@ -802,7 +802,7 @@ public:
 
 
     void Notify(            SfxBroadcaster& aBC     ,
-                    const   SfxHint&        aHint   ) SAL_OVERRIDE ;
+                    const   SfxHint&        aHint   ) override ;
 
 
     //  public IMPL?
@@ -816,8 +816,8 @@ public:
     bool IsInitialized() const;
     void MethodEntryCheck( const bool i_mustBeInitialized ) const;
 
-    css::uno::Reference < css::container::XIndexAccess > SAL_CALL getViewData() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    void SAL_CALL setViewData( const css::uno::Reference < css::container::XIndexAccess >& aData ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    css::uno::Reference < css::container::XIndexAccess > SAL_CALL getViewData() throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setViewData( const css::uno::Reference < css::container::XIndexAccess >& aData ) throw (css::uno::RuntimeException, std::exception) override;
 
     /** calls all XEventListeners */
     void notifyEvent( const css::document::EventObject& aEvent ) const;
diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx
index 8cbeed50e6e9..5a4675e221fc 100644
--- a/include/sfx2/sfxhelp.hxx
+++ b/include/sfx2/sfxhelp.hxx
@@ -34,8 +34,8 @@ class SFX2_DLLPUBLIC SfxHelp : public Help
 
 private:
     SAL_DLLPRIVATE bool Start_Impl( const OUString& rURL, const vcl::Window* pWindow, const OUString& rKeyword );
-    SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord ) SAL_OVERRIDE;
-    SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const vcl::Window* pWindow ) SAL_OVERRIDE;
+    SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord ) override;
+    SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const vcl::Window* pWindow ) override;
     SAL_DLLPRIVATE OUString GetHelpModuleName_Impl();
     SAL_DLLPRIVATE OUString CreateHelpURL_Impl( const OUString& aCommandURL, const OUString& rModuleName );
 
@@ -43,7 +43,7 @@ public:
     SfxHelp();
     virtual ~SfxHelp();
 
-    virtual OUString        GetHelpText( const OUString&, const vcl::Window* pWindow ) SAL_OVERRIDE;
+    virtual OUString        GetHelpText( const OUString&, const vcl::Window* pWindow ) override;
 
     static OUString         CreateHelpURL( const OUString& aCommandURL, const OUString& rModuleName );
     static OUString         GetDefaultHelpModule();
diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx
index 384c3c4293a5..67c1abbb9c82 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -49,15 +49,15 @@ class SFX2_DLLPUBLIC SfxStatusListener : public ::cppu::WeakImplHelper2<
         virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 
         // XComponent
-        virtual void SAL_CALL dispose() 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 >& xListener ) 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 >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
         // XEventListener
-        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;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     private:
         SfxStatusListener( const SfxStatusListener& ) = delete;
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index c9391a0b1749..917e025af609 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -539,7 +539,7 @@ inline void SfxShell::SetPool
             static SfxInterface*                GetStaticInterface();       \
             static SfxInterfaceId               GetInterfaceId() {return SfxInterfaceId(nId);} \
             static void                         RegisterInterface(SfxModule* pMod=NULL); \
-            virtual SfxInterface*       GetInterface() const SAL_OVERRIDE;
+            virtual SfxInterface*       GetInterface() const override;
 
 #define SFX_TMPL_INTERFACE(Class,SuperClass,Abstract)                       \
                                                                             \
diff --git a/include/sfx2/sidebar/Accessible.hxx b/include/sfx2/sidebar/Accessible.hxx
index 6f786f00663a..80ca92607203 100644
--- a/include/sfx2/sidebar/Accessible.hxx
+++ b/include/sfx2/sidebar/Accessible.hxx
@@ -51,10 +51,10 @@ public:
         const css::uno::Reference<css::accessibility::XAccessibleContext>& rxContext);
     virtual ~Accessible();
 
-    virtual void SAL_CALL disposing() SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() override;
     // XAccessible
     virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
 private:
     css::uno::Reference<css::accessibility::XAccessibleContext> mxContext;
diff --git a/include/sfx2/sidebar/AccessibleTitleBar.hxx b/include/sfx2/sidebar/AccessibleTitleBar.hxx
index 49e68e74265a..e81a9722b229 100644
--- a/include/sfx2/sidebar/AccessibleTitleBar.hxx
+++ b/include/sfx2/sidebar/AccessibleTitleBar.hxx
@@ -33,7 +33,7 @@ public:
     static css::uno::Reference<css::accessibility::XAccessible> Create (TitleBar& rTitleBar);
 
 protected:
-    virtual void FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) SAL_OVERRIDE;
+    virtual void FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) override;
 
 private:
     explicit AccessibleTitleBar (VCLXWindow* pWindow);
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 97ea553bf24f..94e22e0c2d6b 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -79,7 +79,7 @@ public:
         ItemUpdateReceiverInterface& rItemUpdateReceiver);
 
     /// releases our action listener
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     virtual ~ControllerItem();
 
@@ -125,7 +125,7 @@ public:
 
 protected:
 
-    virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) SAL_OVERRIDE;
+    virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) override;
 
 private:
     ItemUpdateReceiverInterface& mrItemUpdateReceiver;
diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index 1d799ce73111..0057c721de00 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -42,7 +42,7 @@ public:
          vcl::Window* pParentWindow,
          const std::function<void()>& rCloserAction);
     virtual ~Deck();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     const OUString& GetId() const { return msId; }
 
@@ -62,10 +62,10 @@ public:
     */
     void ShowPanel (const Panel& rPanel);
 
-    virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) SAL_OVERRIDE;
-    virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE;
-    virtual bool Notify(NotifyEvent& rEvent) SAL_OVERRIDE;
+    virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override;
+    virtual void DataChanged (const DataChangedEvent& rEvent) override;
+    virtual bool Notify(NotifyEvent& rEvent) override;
 
     static void PrintWindowSubTree (vcl::Window* pRoot, int nIndentation);
 
@@ -75,7 +75,7 @@ public:
     {
     public:
         ScrollContainerWindow(vcl::Window* pParentWindow);
-        virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) SAL_OVERRIDE;
+        virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override;
         void SetSeparators(const ::std::vector<sal_Int32>& rSeparators);
     private:
         std::vector<sal_Int32> maSeparators;
diff --git a/include/sfx2/sidebar/DeckTitleBar.hxx b/include/sfx2/sidebar/DeckTitleBar.hxx
index e42bbe7d29d3..700ad6a5eaea 100644
--- a/include/sfx2/sidebar/DeckTitleBar.hxx
+++ b/include/sfx2/sidebar/DeckTitleBar.hxx
@@ -32,14 +32,14 @@ public:
 
     void SetCloserVisible(const bool bIsCloserVisible);
 
-    virtual void DataChanged(const DataChangedEvent& rEvent) SAL_OVERRIDE;
+    virtual void DataChanged(const DataChangedEvent& rEvent) override;
 
 protected:
-    virtual Rectangle GetTitleArea(const Rectangle& rTitleBarBox) SAL_OVERRIDE;
-    virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) SAL_OVERRIDE;
-    virtual sidebar::Paint GetBackgroundPaint() SAL_OVERRIDE;
-    virtual void HandleToolBoxItemClick(const sal_uInt16 nItemIndex) SAL_OVERRIDE;
-    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE;
+    virtual Rectangle GetTitleArea(const Rectangle& rTitleBarBox) override;
+    virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) override;
+    virtual sidebar::Paint GetBackgroundPaint() override;
+    virtual void HandleToolBoxItemClick(const sal_uInt16 nItemIndex) override;
+    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
 
 private:
     const sal_uInt16 mnCloserItemIndex;
diff --git a/include/sfx2/sidebar/MenuButton.hxx b/include/sfx2/sidebar/MenuButton.hxx
index d725fb71c01d..67f47aa76575 100644
--- a/include/sfx2/sidebar/MenuButton.hxx
+++ b/include/sfx2/sidebar/MenuButton.hxx
@@ -29,10 +29,10 @@ class MenuButton
 public:
     MenuButton (vcl::Window* pParentWindow);
 
-    virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) SAL_OVERRIDE;
-    virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE;
-    virtual void MouseButtonDown (const MouseEvent& rMouseEvent) SAL_OVERRIDE;
-    virtual void MouseButtonUp (const MouseEvent& rMouseEvent) SAL_OVERRIDE;
+    virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) override;
+    virtual void MouseMove (const MouseEvent& rEvent) override;
+    virtual void MouseButtonDown (const MouseEvent& rMouseEvent) override;
+    virtual void MouseButtonUp (const MouseEvent& rMouseEvent) override;
 
 protected:
     using CheckBox::FillLayoutData;
diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx
index a73edd598cb4..4d6490e8da11 100644
--- a/include/sfx2/sidebar/Panel.hxx
+++ b/include/sfx2/sidebar/Panel.hxx
@@ -44,7 +44,7 @@ public:
           const css::uno::Reference<css::frame::XFrame>& rxFrame);
 
     virtual ~Panel();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     PanelTitleBar* GetTitleBar() const;
     bool IsTitleBarOptional() const { return mbIsTitleBarOptional;}
@@ -56,11 +56,11 @@ public:
     bool HasIdPredicate (const OUString& rsId) const;
     const OUString& GetId() const { return msPanelId;}
 
-    virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) SAL_OVERRIDE;
-    virtual void Resize() SAL_OVERRIDE;
-    virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE;
-    virtual void Activate() SAL_OVERRIDE;
-    virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
+    virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override;
+    virtual void Resize() override;
+    virtual void DataChanged (const DataChangedEvent& rEvent) override;
+    virtual void Activate() override;
+    virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
 
 private:
     const OUString msPanelId;
diff --git a/include/sfx2/sidebar/PanelTitleBar.hxx b/include/sfx2/sidebar/PanelTitleBar.hxx
index b8dc3698f0b8..b8020bd0046e 100644
--- a/include/sfx2/sidebar/PanelTitleBar.hxx
+++ b/include/sfx2/sidebar/PanelTitleBar.hxx
@@ -33,22 +33,22 @@ class PanelTitleBar
 public:
     PanelTitleBar(const OUString& rsTitle, vcl::Window* pParentWindow, Panel* pPanel);
     virtual ~PanelTitleBar();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void SetMoreOptionsCommand(const OUString& rsCommandName,
                                const css::uno::Reference<css::frame::XFrame>& rxFrame,
                                const css::uno::Reference<css::frame::XController>& rxController);
 
-    virtual void DataChanged(const DataChangedEvent& rEvent) SAL_OVERRIDE;
-    virtual void MouseButtonDown(const MouseEvent& rMouseEvent) SAL_OVERRIDE;
-    virtual void MouseButtonUp(const MouseEvent& rMouseEvent) SAL_OVERRIDE;
+    virtual void DataChanged(const DataChangedEvent& rEvent) override;
+    virtual void MouseButtonDown(const MouseEvent& rMouseEvent) override;
+    virtual void MouseButtonUp(const MouseEvent& rMouseEvent) override;
 
 protected:
-    virtual Rectangle GetTitleArea(const Rectangle& rTitleBarBox) SAL_OVERRIDE;
-    virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) SAL_OVERRIDE;
-    virtual sidebar::Paint GetBackgroundPaint() SAL_OVERRIDE;
-    virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) SAL_OVERRIDE;
-    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE;
+    virtual Rectangle GetTitleArea(const Rectangle& rTitleBarBox) override;
+    virtual void PaintDecoration(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBarBox) override;
+    virtual sidebar::Paint GetBackgroundPaint() override;
+    virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) override;
+    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
 
 private:
     bool mbIsLeftButtonDown;
diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx
index 64bc26ea431f..b90f037c7586 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -91,23 +91,23 @@ public:
 
     // ui::XContextChangeEventListener
     virtual void SAL_CALL notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent)
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
 
     // XEventListener
     virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject)
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
 
     // beans::XPropertyChangeListener
     virtual void SAL_CALL propertyChange (const css::beans::PropertyChangeEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
 
     // frame::XStatusListener
     virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
 
     // ui::XSidebar
     virtual void SAL_CALL requestLayout()
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
 
     void NotifyResize();
 
@@ -265,7 +265,7 @@ private:
     */
     void ShowPanel (const Panel& rPanel);
 
-    virtual void SAL_CALL disposing() SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() override;
 
     std::unique_ptr<ResourceManager> mpResourceManager;
 
diff --git a/include/sfx2/sidebar/SidebarDockingWindow.hxx b/include/sfx2/sidebar/SidebarDockingWindow.hxx
index defbb17315e2..382b48da7f78 100644
--- a/include/sfx2/sidebar/SidebarDockingWindow.hxx
+++ b/include/sfx2/sidebar/SidebarDockingWindow.hxx
@@ -35,17 +35,17 @@ public:
     SidebarDockingWindow(SfxBindings* pBindings, SidebarChildWindow& rChildWindow,
                          vcl::Window* pParent, WinBits nBits);
     virtual ~SidebarDockingWindow();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
-    virtual bool Close() SAL_OVERRIDE;
+    virtual bool Close() override;
 
 protected:
     // Window overridables
-    virtual void GetFocus() SAL_OVERRIDE;
+    virtual void GetFocus() override;
 
     virtual SfxChildAlignment CheckAlignment (
         SfxChildAlignment eCurrentAlignment,
-        SfxChildAlignment eRequestedAlignment) SAL_OVERRIDE;
+        SfxChildAlignment eRequestedAlignment) override;
 
 private:
     ::rtl::Reference<sfx2::sidebar::SidebarController> mpSidebarController;
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 55a409781459..d71d9662602a 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -66,38 +66,38 @@ public:
 
     // XContextChangeEventListener
     virtual void SAL_CALL notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // XEventListener
     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // XUIElement
     virtual css::uno::Reference<css::frame::XFrame> SAL_CALL getFrame()
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getResourceURL()
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
     virtual sal_Int16 SAL_CALL getType()
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getRealInterface()
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
 
     // XToolPanel
     virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL createAccessible(
                 const css::uno::Reference<css::accessibility::XAccessible>& rxParentAccessible)
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow()
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
 
     // XSidebarPanel
     virtual css::ui::LayoutSize SAL_CALL getHeightForWidth(sal_Int32 nWidth)
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
     virtual sal_Int32 SAL_CALL getMinimalWidth()
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
 
     // XUpdateModel
     virtual void SAL_CALL updateModel(const css::uno::Reference<css::frame::XModel>& xModel)
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
 
 protected:
     css::uno::Reference<css::frame::XFrame> mxFrame;
@@ -107,7 +107,7 @@ protected:
     virtual ~SidebarPanelBase();
 
     virtual void SAL_CALL disposing()
-        throw (css::uno::RuntimeException) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException) override;
 
 private:
     VclPtr<vcl::Window> mpControl;
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index 574603b22e6d..1e8915a7ba67 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -41,18 +41,18 @@ class SFX2_DLLPUBLIC SidebarToolBox : public ToolBox
 public:
     SidebarToolBox(vcl::Window* pParentWindow);
     virtual ~SidebarToolBox();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     using ToolBox::InsertItem;
     virtual void InsertItem(const OUString& rCommand,
             const css::uno::Reference<css::frame::XFrame>& rFrame,
             ToolBoxItemBits nBits = ToolBoxItemBits::NONE,
             const Size& rRequestedSize = Size(),
-            sal_uInt16 nPos = TOOLBOX_APPEND) SAL_OVERRIDE;
+            sal_uInt16 nPos = TOOLBOX_APPEND) override;
 
-    virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
+    virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
 
-    virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE;
+    virtual bool Notify (NotifyEvent& rEvent) override;
 
     css::uno::Reference<css::frame::XToolbarController> GetControllerForItemId(const sal_uInt16 nItemId) const;
     sal_uInt16 GetItemIdForSubToolbarName (const OUString& rsCOmmandName) const;
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 1620f5da3a35..9945eddd78f3 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -73,11 +73,11 @@ public:
         SidebarController* rParentSidebarController);
 
     virtual ~TabBar();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
-    virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) SAL_OVERRIDE;
-    virtual void DataChanged (const DataChangedEvent& rDataChangedEvent) SAL_OVERRIDE;
-    virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE;
+    virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) override;
+    virtual void DataChanged (const DataChangedEvent& rDataChangedEvent) override;
+    virtual bool Notify (NotifyEvent& rEvent) override;
 
     static sal_Int32 GetDefaultWidth();
 
diff --git a/include/sfx2/sidebar/TabItem.hxx b/include/sfx2/sidebar/TabItem.hxx
index c5eaabb858c1..9060729a9489 100644
--- a/include/sfx2/sidebar/TabItem.hxx
+++ b/include/sfx2/sidebar/TabItem.hxx
@@ -35,10 +35,10 @@ class TabItem
 public:
     TabItem (vcl::Window* pParentWindow);
 
-    virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) SAL_OVERRIDE;
-    virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE;
-    virtual void MouseButtonDown (const MouseEvent& rMouseEvent) SAL_OVERRIDE;
-    virtual void MouseButtonUp (const MouseEvent& rMouseEvent) SAL_OVERRIDE;
+    virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override;
+    virtual void MouseMove (const MouseEvent& rEvent) override;
+    virtual void MouseButtonDown (const MouseEvent& rMouseEvent) override;
+    virtual void MouseButtonUp (const MouseEvent& rMouseEvent) override;
 
 private:
     bool mbIsLeftButtonDown;
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index a92ac7a87188..95e875003c63 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -155,57 +155,57 @@ public:
     Theme();
     virtual ~Theme();
 
-    virtual void SAL_CALL disposing() SAL_OVERRIDE;
+    virtual void SAL_CALL disposing() override;
 
     static css::uno::Reference<css::beans::XPropertySet> GetPropertySet();
 
     // beans::XPropertySet
     virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo()
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setPropertyValue (
         const ::rtl::OUString& rsPropertyName,
         const css::uno::Any& rValue)
         throw (css::beans::UnknownPropertyException,
                css::uno::RuntimeException,
-               std::exception) SAL_OVERRIDE;
+               std::exception) override;
     virtual css::uno::Any SAL_CALL getPropertyValue (
         const ::rtl::OUString& rsPropertyName)
         throw(css::beans::UnknownPropertyException,
             css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL addPropertyChangeListener(
         const ::rtl::OUString& rsPropertyName,
         const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
         throw(css::beans::UnknownPropertyException,
             css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removePropertyChangeListener(
         const ::rtl::OUString& rsPropertyName,
         const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
         throw(css::beans::UnknownPropertyException,
             css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL addVetoableChangeListener(
         const ::rtl::OUString& rsPropertyName,
         const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
         throw(css::beans::UnknownPropertyException,
             css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removeVetoableChangeListener(
         const ::rtl::OUString& rsPropertyName,
         const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
         throw(css::beans::UnknownPropertyException,
             css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::RuntimeException, std::exception) override;
 
     // beans::XPropertySetInfo
     virtual css::uno::Sequence<css::beans::Property> SAL_CALL getProperties()
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
     virtual css::beans::Property SAL_CALL getPropertyByName (const ::rtl::OUString& rsName)
         throw(css::beans::UnknownPropertyException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasPropertyByName (const ::rtl::OUString& rsName)
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw(css::uno::RuntimeException, std::exception) override;
 
 private:
     static Theme& GetCurrentTheme();
diff --git a/include/sfx2/sidebar/TitleBar.hxx b/include/sfx2/sidebar/TitleBar.hxx
index 0f918e43fdd1..1e1fae598929 100644
--- a/include/sfx2/sidebar/TitleBar.hxx
+++ b/include/sfx2/sidebar/TitleBar.hxx
@@ -33,17 +33,17 @@ public:
               vcl::Window* pParentWindow,
               const sidebar::Paint& rInitialBackgroundPaint);
     virtual ~TitleBar();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void SetTitle (const OUString& rsTitle);
     const OUString GetTitle() {return msTitle; }
 
     void SetIcon (const Image& rIcon);
 
-    virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) SAL_OVERRIDE;
-    virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE;
-    virtual void setPosSizePixel (long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) SAL_OVERRIDE;
+    virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override;
+    virtual void DataChanged (const DataChangedEvent& rEvent) override;
+    virtual void setPosSizePixel (long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) override;
 
     ToolBox& GetToolBox()
     {
@@ -63,7 +63,7 @@ protected:
     void PaintFocus(vcl::RenderContext& rRenderContext, const Rectangle& rFocusBox);
     virtual sidebar::Paint GetBackgroundPaint() = 0;
     virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex);
-    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE;
+    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
 
 private:
     Image maIcon;
diff --git a/include/sfx2/sidebar/UnoDeck.hxx b/include/sfx2/sidebar/UnoDeck.hxx
index 8bf416be94c4..74d4d75e665e 100644
--- a/include/sfx2/sidebar/UnoDeck.hxx
+++ b/include/sfx2/sidebar/UnoDeck.hxx
@@ -33,33 +33,33 @@ public:
     virtual ~SfxUnoDeck() {};
 
     virtual OUString SAL_CALL getId()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
     virtual OUString SAL_CALL  getTitle()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setTitle( const OUString& newTitle )
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
     virtual sal_Bool SAL_CALL isActive()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL activate( const sal_Bool bActivate )
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
     virtual css::uno::Reference<css::ui::XPanels> SAL_CALL getPanels()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
     virtual sal_Int32 SAL_CALL getOrderIndex()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setOrderIndex( const sal_Int32 newOrderIndex )
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL moveFirst()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL moveLast()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL moveUp()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL moveDown()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
 private:
 
diff --git a/include/sfx2/sidebar/UnoDecks.hxx b/include/sfx2/sidebar/UnoDecks.hxx
index 5e0089935dd6..b073033064c7 100644
--- a/include/sfx2/sidebar/UnoDecks.hxx
+++ b/include/sfx2/sidebar/UnoDecks.hxx
@@ -39,29 +39,29 @@ public:
     virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
                                 throw(css::container::NoSuchElementException,
                                     css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                    css::uno::RuntimeException, std::exception) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
     virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
 // XIndexAccess
 
     virtual sal_Int32 SAL_CALL getCount()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
     virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
                                 throw(css::lang::IndexOutOfBoundsException,
                                       css::lang::WrappedTargetException,
-                                      css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                      css::uno::RuntimeException, std::exception) override;
 
 // XElementAccess
     virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasElements()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
 private:
 
diff --git a/include/sfx2/sidebar/UnoPanel.hxx b/include/sfx2/sidebar/UnoPanel.hxx
index 0d396e99b829..227358e61ba3 100644
--- a/include/sfx2/sidebar/UnoPanel.hxx
+++ b/include/sfx2/sidebar/UnoPanel.hxx
@@ -36,35 +36,35 @@ public:
     virtual ~SfxUnoPanel() {};
 
     virtual OUString SAL_CALL getId()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
     virtual OUString SAL_CALL  getTitle()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setTitle( const OUString& newTitle )
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
     virtual sal_Bool SAL_CALL isExpanded()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL expand( const sal_Bool bCollapseOther )
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL collapse( )
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
     virtual sal_Int32 SAL_CALL getOrderIndex()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setOrderIndex( const sal_Int32 newOrderIndex )
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL moveFirst()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL moveLast()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL moveUp()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL moveDown()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
     virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getDialog()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
 private:
 
diff --git a/include/sfx2/sidebar/UnoPanels.hxx b/include/sfx2/sidebar/UnoPanels.hxx
index 679163347e46..d23d3da14011 100644
--- a/include/sfx2/sidebar/UnoPanels.hxx
+++ b/include/sfx2/sidebar/UnoPanels.hxx
@@ -34,36 +34,36 @@ public:
 
 // XPanels
     virtual OUString SAL_CALL getDeckId()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
 // XNameAccess
 
     virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
                                 throw(css::container::NoSuchElementException,
                                       css::lang::WrappedTargetException,
-                                      css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                      css::uno::RuntimeException, std::exception) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
     virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
 // XIndexAccess
 
     virtual sal_Int32 SAL_CALL getCount()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
     virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
                                 throw(css::lang::IndexOutOfBoundsException,
                                       css::lang::WrappedTargetException,
-                                      css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                      css::uno::RuntimeException, std::exception) override;
 
 // XElementAccess
     virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasElements()
-                                throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                throw(css::uno::RuntimeException, std::exception) override;
 
 private:
 
diff --git a/include/sfx2/sidebar/UnoSidebar.hxx b/include/sfx2/sidebar/UnoSidebar.hxx
index 687ecb2cfb94..79a3386d3628 100644
--- a/include/sfx2/sidebar/UnoSidebar.hxx
+++ b/include/sfx2/sidebar/UnoSidebar.hxx
@@ -42,23 +42,23 @@ public:
     SfxUnoSidebar(const css::uno::Reference<css::frame::XFrame>&);
 
     virtual void SAL_CALL showDecks (const sal_Bool bVisible)
-                                    throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                    throw(css::uno::RuntimeException, std::exception) override;
 
 
     virtual void SAL_CALL setVisible (const sal_Bool bVisible)
-                                    throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                    throw(css::uno::RuntimeException, std::exception) override;
 
     virtual sal_Bool SAL_CALL isVisible()
-                                    throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                    throw(css::uno::RuntimeException, std::exception) override;
 
     virtual css::uno::Reference<css::frame::XFrame> SAL_CALL getFrame()
-                                throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                                throw( css::uno::RuntimeException, std::exception ) override;
 
     virtual css::uno::Reference<css::ui::XDecks> SAL_CALL getDecks()
-                                    throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                    throw(css::uno::RuntimeException, std::exception) override;
 
     virtual css::uno::Reference<css::ui::XSidebar> SAL_CALL getSidebar()
-                                    throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                    throw(css::uno::RuntimeException, std::exception) override;
 
 };
 
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index 9e4850a46e15..1643f18cd4c0 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -66,33 +66,33 @@ class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController
 protected:
     // new controller API
     // 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;
-    virtual void               SAL_CALL acquire() throw() SAL_OVERRIDE;
-    virtual void               SAL_CALL release() throw() SAL_OVERRIDE;
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void               SAL_CALL acquire() throw() override;
+    virtual void               SAL_CALL release() throw() override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XComponent
-    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;
 
     // XStatusListener
     virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event )
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XStatusbarController
-    virtual sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos,
                                     ::sal_Int32 nCommand,
                                     sal_Bool bMouseEvent,
-                                    const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                    const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics,
                                  const ::com::sun::star::awt::Rectangle& rOutputRectangle,
-                                 ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                                 ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
     // Old sfx2 interface
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx
index 5e43ceffb86b..93ae6db0dd07 100644
--- a/include/sfx2/styledlg.hxx
+++ b/include/sfx2/styledlg.hxx
@@ -34,19 +34,19 @@ private:
     DECL_DLLPRIVATE_LINK_TYPED( CancelHdl, Button *, void );
     sal_uInt16 m_nOrganizerId;
 protected:
-    virtual void   RefreshInputSet() SAL_OVERRIDE;
+    virtual void   RefreshInputSet() override;
 
 public:
     SfxStyleDialog(vcl::Window* pParent, const OUString& rID,
         const OUString& rUIXMLDescription, SfxStyleSheetBase&);
 
     virtual ~SfxStyleDialog();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     SfxStyleSheetBase&          GetStyleSheet() { return *pStyle; }
     const SfxStyleSheetBase&    GetStyleSheet() const { return *pStyle; }
 
-    virtual short               Ok() SAL_OVERRIDE;
+    virtual short               Ok() override;
 
     static OUString GenerateUnusedName(SfxStyleSheetBasePool &rPool);
 };
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 728cbf8d1591..f95fffeeedab 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -52,8 +52,8 @@ public:
     TYPEINFO_OVERRIDE();
                             SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet );
                             SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=NULL);
-    virtual SfxPoolItem*    Clone(SfxItemPool* pToPool) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Create(SvStream& rStream, sal_uInt16 nVersion) const SAL_OVERRIDE;
+    virtual SfxPoolItem*    Clone(SfxItemPool* pToPool) const override;
+    virtual SfxPoolItem*    Create(SvStream& rStream, sal_uInt16 nVersion) const override;
 };
 
 class SFX2_DLLPUBLIC SfxTabDialog : public TabDialog
@@ -129,7 +129,7 @@ public:
                  const OUString& rID, const OUString& rUIXMLDescription,
                  const SfxItemSet * = 0, bool bEditFmt = false);
     virtual ~SfxTabDialog();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     sal_uInt16          AddTabPage( const OString& rName,           // Name of the label for the page in the notebook .ui
                                     CreateTabPage pCreateFunc,      // != 0
@@ -194,8 +194,8 @@ public:
     void                RemoveResetButton();
     void                RemoveStandardButton();
 
-    short               Execute() SAL_OVERRIDE;
-    void                StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
+    short               Execute() override;
+    void                StartExecuteModal( const Link<>& rEndDialogHdl ) override;
     void                Start( bool bShow = true );
 
     const SfxItemSet*   GetExampleSet() const { return pExampleSet; }
@@ -233,7 +233,7 @@ protected:
 
 public:
     virtual             ~SfxTabPage();
-    virtual void        dispose() SAL_OVERRIDE;
+    virtual void        dispose() override;
 
     const SfxItemSet&   GetItemSet() const { return *pSet; }
 
diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx
index 21556961e85f..43be563a5b39 100644
--- a/include/sfx2/taskpane.hxx
+++ b/include/sfx2/taskpane.hxx
@@ -68,7 +68,7 @@ namespace sfx2
         SFX_DECL_CHILDWINDOW( TaskPaneWrapper );
 
         // ITaskPaneToolPanelAccess
-        virtual void ActivateToolPanel( const OUString& i_rPanelURL ) SAL_OVERRIDE;
+        virtual void ActivateToolPanel( const OUString& i_rPanelURL ) override;
     };
 
 
@@ -121,8 +121,8 @@ namespace sfx2
 
     protected:
         // Window overridables
-        virtual void Resize() SAL_OVERRIDE;
-        virtual void GetFocus() SAL_OVERRIDE;
+        virtual void Resize() override;
+        virtual void GetFocus() override;
 
     private:
         std::unique_ptr<ModuleTaskPane_Impl>  m_xImpl;
@@ -164,17 +164,17 @@ namespace sfx2
         TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper,
             vcl::Window* i_pParent, WinBits i_nBits );
         virtual ~TaskPaneDockingWindow();
-        virtual void dispose() SAL_OVERRIDE;
+        virtual void dispose() override;
 
         // ITaskPaneToolPanelAccess
-        virtual void    ActivateToolPanel( const OUString& i_rPanelURL ) SAL_OVERRIDE;
+        virtual void    ActivateToolPanel( const OUString& i_rPanelURL ) override;
 
     protected:
         // Window overridables
-        virtual void        GetFocus() SAL_OVERRIDE;
+        virtual void        GetFocus() override;
 
         // TitledDockingWindow overridables
-        virtual void onLayoutDone() SAL_OVERRIDE;
+        virtual void onLayoutDone() override;
 
     private:
         VclPtr<ModuleTaskPane>  m_aTaskPane;
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index caa305582d5e..4e89c22594aa 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -86,8 +86,8 @@ private:
     void Delete();
 
 protected:
-    virtual void            PopupModeEnd() SAL_OVERRIDE;
-    virtual bool            Close() SAL_OVERRIDE;
+    virtual void            PopupModeEnd() override;
+    virtual bool            Close() override;
     void                    DeleteFloatingWindow();
 
     sal_uInt16              GetId() const { return m_nId; }
@@ -119,9 +119,9 @@ public:
                                             vcl::Window* pParentWindow,
                                             WinBits nBits );
                             virtual ~SfxPopupWindow();
-    virtual void            dispose() SAL_OVERRIDE;
+    virtual void            dispose() override;
 
-    virtual void            MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void            MouseMove( const MouseEvent& rMEvt ) override;
 
     void                    StartCascading();
     SAL_DLLPRIVATE void SetDeleteLink_Impl( const Link<SfxPopupWindow*,void>& rLink )
@@ -178,33 +178,33 @@ protected:
 public:
     // XEventListener
     using ::cppu::OPropertySetHelper::disposing;
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XComponent
-    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;
 
     // new controller API
     // XStatusListener
     virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event )
-        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XToolbarController
     virtual void SAL_CALL execute( sal_Int16 KeyModifier )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL click()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL doubleClick()
-        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::awt::XWindow > SAL_CALL createPopupWindow()
-        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::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& rParent )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
     // XSubToolbarController
-    virtual sal_Bool SAL_CALL opensSubToolbar(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual OUString SAL_CALL getSubToolbarName(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL updateImage(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Bool SAL_CALL opensSubToolbar(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getSubToolbarName(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL updateImage(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
 public:
                                SFX_DECL_TOOLBOX_CONTROL();
@@ -249,17 +249,17 @@ class SfxDragButton_Impl : public FixedImage
 public:
 
                     SfxDragButton_Impl( vcl::Window *pParent );
-    virtual void    Command ( const CommandEvent& rCEvt ) SAL_OVERRIDE;
-    virtual void    MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void    Command ( const CommandEvent& rCEvt ) override;
+    virtual void    MouseMove( const MouseEvent& rMEvt ) override;
+    virtual void    MouseButtonDown( const MouseEvent& rMEvt ) override;
 };
 
 class SfxDragToolBoxControl_Impl : public SfxToolBoxControl
 {
 public:
                             SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox );
-    virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE;
-    virtual void            Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
+    virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override;
+    virtual void            Select(sal_uInt16 nSelectModifier) override;
 };
 
 
@@ -282,7 +282,7 @@ public:
     virtual ~SfxRecentFilesToolBoxControl();
 
 protected:
-    virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
+    virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override;
 };
 
 class SfxSaveAsToolBoxControl : public SfxToolBoxControl
@@ -297,13 +297,13 @@ public:
     virtual ~SfxSaveAsToolBoxControl();
 
 protected:
-    virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
+    virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override;
 };
 
 class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl
 {
 protected:
-        virtual void Select(sal_uInt16 nSelectModifier ) SAL_OVERRIDE;
+        virtual void Select(sal_uInt16 nSelectModifier ) override;
 
 public:
         SfxReloadToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
@@ -324,9 +324,9 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl
     bool        m_bShowMenuImages;
 
 protected:
-    virtual void            Click() SAL_OVERRIDE;
-    virtual void            Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
-    virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
+    virtual void            Click() override;
+    virtual void            Select(sal_uInt16 nSelectModifier) override;
+    virtual void            StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override;
 public:
                             SfxAddonsToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
                             virtual ~SfxAddonsToolBoxControl_Impl();
diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx
index d1c365ad6bc0..bd2b59030597 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -84,7 +84,7 @@ public:
     TemplateAbstractView(vcl::Window* pParent);
 
     virtual ~TemplateAbstractView();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void insertItem (const TemplateItemProperties &rTemplate);
 
@@ -129,9 +129,9 @@ protected:
 
     DECL_LINK_TYPED(ShowRootRegionHdl, Button*, void);
 
-    virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE;
+    virtual void OnItemDblClicked(ThumbnailViewItem *pItem) override;
 
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
 
 protected:
 
diff --git a/include/sfx2/templatecontaineritem.hxx b/include/sfx2/templatecontaineritem.hxx
index 98623738cb8b..99047c303a6f 100644
--- a/include/sfx2/templatecontaineritem.hxx
+++ b/include/sfx2/templatecontaineritem.hxx
@@ -28,11 +28,11 @@ public:
     virtual ~TemplateContainerItem ();
 
     virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
-                        const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE;
+                        const ThumbnailItemAttributes *pAttrs) override;
 
     virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight,
                                          const long nPadding, sal_uInt32 nMaxTextLength,
-                                         const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE;
+                                         const ThumbnailItemAttributes *pAttrs) override;
 
     bool HasMissingPreview( );
 
diff --git a/include/sfx2/templatedefaultview.hxx b/include/sfx2/templatedefaultview.hxx
index 205083554d52..436aef489ac3 100644
--- a/include/sfx2/templatedefaultview.hxx
+++ b/include/sfx2/templatedefaultview.hxx
@@ -18,7 +18,7 @@ class SFX2_DLLPUBLIC TemplateDefaultView : public TemplateLocalView
 public:
     TemplateDefaultView(Window *pParent);
 
-    virtual void reload() SAL_OVERRIDE;
+    virtual void reload() override;
 protected:
     long    mnItemMaxSize;
     long    mnTextHeight;
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index e2192cff44ce..03638028e4bf 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -51,7 +51,7 @@ public:
     SfxTemplateManagerDlg(vcl::Window *parent = NULL);
 
     virtual ~SfxTemplateManagerDlg();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void setSaveMode();
 
diff --git a/include/sfx2/templateinfodlg.hxx b/include/sfx2/templateinfodlg.hxx
index 13d7e9c5255f..bd659f81ab41 100644
--- a/include/sfx2/templateinfodlg.hxx
+++ b/include/sfx2/templateinfodlg.hxx
@@ -28,7 +28,7 @@ public:
     SfxTemplateInfoDlg (vcl::Window *pParent = NULL);
 
     virtual ~SfxTemplateInfoDlg();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void loadDocument (const OUString &rURL);
 
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index 2d06ef912121..d7d866a2a0e0 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -33,16 +33,16 @@ public:
     TemplateLocalView ( vcl::Window* pParent );
 
     virtual ~TemplateLocalView ();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     // Fill view with template folders thumbnails
-    virtual void Populate () SAL_OVERRIDE;
+    virtual void Populate () override;
 
-    virtual void reload () SAL_OVERRIDE;
+    virtual void reload () override;
 
-    virtual void showRootRegion () SAL_OVERRIDE;
+    virtual void showRootRegion () override;
 
-    virtual void showRegion (ThumbnailViewItem *pItem) SAL_OVERRIDE;
+    virtual void showRegion (ThumbnailViewItem *pItem) override;
 
     void showRegion (const OUString &rName);
 
@@ -59,11 +59,11 @@ public:
     std::vector<TemplateItemProperties>
         getFilteredItems (const std::function<bool (const TemplateItemProperties&) > &rFunc) const;
 
-    virtual sal_uInt16 createRegion (const OUString &rName) SAL_OVERRIDE;
+    virtual sal_uInt16 createRegion (const OUString &rName) override;
 
-    virtual bool isNestedRegionAllowed () const SAL_OVERRIDE;
+    virtual bool isNestedRegionAllowed () const override;
 
-    virtual bool isImportAllowed () const SAL_OVERRIDE;
+    virtual bool isImportAllowed () const override;
 
     bool removeRegion (const sal_uInt16 nItemId);
 
@@ -93,7 +93,7 @@ public:
 
     bool isTemplateNameUnique (const sal_uInt16 nRegionItemId, const OUString &rName) const;
 
-    virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle) SAL_OVERRIDE;
+    virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle) override;
 
 private:
 
diff --git a/include/sfx2/templateremoteview.hxx b/include/sfx2/templateremoteview.hxx
index ada041dcb85e..50730180e6d8 100644
--- a/include/sfx2/templateremoteview.hxx
+++ b/include/sfx2/templateremoteview.hxx
@@ -23,17 +23,17 @@ public:
 
     TemplateRemoteView (vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren);
 
-    virtual void showRootRegion () SAL_OVERRIDE;
+    virtual void showRootRegion () override;
 
-    virtual void showRegion (ThumbnailViewItem *pItem) SAL_OVERRIDE;
+    virtual void showRegion (ThumbnailViewItem *pItem) override;
 
     bool loadRepository (TemplateRepository* pRepository, bool bRefresh);
 
-    virtual sal_uInt16 createRegion (const OUString &rName) SAL_OVERRIDE;
+    virtual sal_uInt16 createRegion (const OUString &rName) override;
 
-    virtual bool isNestedRegionAllowed () const SAL_OVERRIDE;
+    virtual bool isNestedRegionAllowed () const override;
 
-    virtual bool isImportAllowed () const SAL_OVERRIDE;
+    virtual bool isImportAllowed () const override;
 
 private:
 
diff --git a/include/sfx2/templateviewitem.hxx b/include/sfx2/templateviewitem.hxx
index f35d281e9ce0..abfee232f1f0 100644
--- a/include/sfx2/templateviewitem.hxx
+++ b/include/sfx2/templateviewitem.hxx
@@ -28,10 +28,10 @@ public:
 
     virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight,
                                          const long nPadding, sal_uInt32 nMaxTextLength,
-                                         const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE;
+                                         const ThumbnailItemAttributes *pAttrs) override;
 
     virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
-                        const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE;
+                        const ThumbnailItemAttributes *pAttrs) override;
 
     sal_uInt16    mnRegionId;
     sal_uInt16    mnDocId;
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 4e9ada86b359..75fdfb186b16 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -43,11 +43,11 @@ class SFX2_DLLPUBLIC SfxTemplatePanelControl : public DockingWindow
 public:
     SfxTemplatePanelControl (SfxBindings* pBindings, vcl::Window* pParentWindow);
     virtual ~SfxTemplatePanelControl();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
-    virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE;
-    virtual void Resize() SAL_OVERRIDE;
-    virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
+    virtual void DataChanged( const DataChangedEvent& _rDCEvt ) override;
+    virtual void Resize() override;
+    virtual void StateChanged( StateChangedType nStateChange ) override;
     void FreeResource();
 
 private:
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index f1dd6a72c99c..b7aa4d6ad81a 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -183,9 +183,9 @@ public:
     ThumbnailView(vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP, bool bDisableTransientChildren = false);
 
     virtual ~ThumbnailView();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
-    virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual void MouseMove(const MouseEvent& rMEvt) override;
 
     void AppendItem(ThumbnailViewItem *pItem);
 
@@ -233,7 +233,7 @@ public:
 
     void setItemStateHdl (const Link<const ThumbnailViewItem*,void> &aLink) { maItemStateHdl = aLink; }
 
-    virtual void Resize() SAL_OVERRIDE;
+    virtual void Resize() override;
 
     virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle);
 
@@ -241,25 +241,25 @@ public:
 
 protected:
 
-    virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+    virtual void KeyInput( const KeyEvent& rKEvt ) override;
 
-    virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
 
-    virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
 
-    virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
+    virtual void Command( const CommandEvent& rCEvt ) override;
 
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
 
-    virtual void GetFocus() SAL_OVERRIDE;
+    virtual void GetFocus() override;
 
-    virtual void LoseFocus() SAL_OVERRIDE;
+    virtual void LoseFocus() override;
 
-    virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
+    virtual void StateChanged( StateChangedType nStateChange ) override;
 
-    virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
+    virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override;
 
 protected:
 
@@ -280,7 +280,7 @@ protected:
 
     SFX2_DLLPRIVATE void         ImplInit();
 
-    virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
+    virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
 
     SFX2_DLLPRIVATE void         ImplInitScrollBar();
     SFX2_DLLPRIVATE void         ImplDeleteItems();
diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx
index 5d16fe2ebd17..79603bb1b2aa 100644
--- a/include/sfx2/titledockwin.hxx
+++ b/include/sfx2/titledockwin.hxx
@@ -38,7 +38,7 @@ namespace sfx2
         );
 
         virtual ~TitledDockingWindow();
-        virtual void dispose() SAL_OVERRIDE;
+        virtual void dispose() override;
 
         /** sets a title to be displayed in the docking window
         */
@@ -82,19 +82,19 @@ namespace sfx2
 
     protected:
         // Window overridables
-        virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& i_rArea) SAL_OVERRIDE;
-        virtual void Resize() SAL_OVERRIDE;
-        virtual void StateChanged( StateChangedType i_nType ) SAL_OVERRIDE;
-        virtual void DataChanged( const DataChangedEvent& i_rDataChangedEvent ) SAL_OVERRIDE;
-        virtual void SetText( const OUString& i_rText ) SAL_OVERRIDE;
+        virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& i_rArea) override;
+        virtual void Resize() override;
+        virtual void StateChanged( StateChangedType i_nType ) override;
+        virtual void DataChanged( const DataChangedEvent& i_rDataChangedEvent ) override;
+        virtual void SetText( const OUString& i_rText ) override;
 
         // DockingWindow overridables
-        void EndDocking(const Rectangle& rRect, bool bFloatMode) SAL_OVERRIDE;
+        void EndDocking(const Rectangle& rRect, bool bFloatMode) override;
 
         // own overridables
         virtual void onLayoutDone();
 
-        virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
+        virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
     protected:
         /** internal version of ResetToolBox
         */
diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx
index 5dd40faf0ea8..b7065b2d60a7 100644
--- a/include/sfx2/tplpitem.hxx
+++ b/include/sfx2/tplpitem.hxx
@@ -39,11 +39,11 @@ public:
 
     const OUString&         GetStyleName() const { return aStyle; }
 
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual sal_uInt8           GetFlagCount() const SAL_OVERRIDE;
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
+    virtual sal_uInt8           GetFlagCount() const override;
+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 };
 
 #endif
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index dc710cb0be52..0af84e07f443 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -57,10 +57,10 @@ public:
                                 virtual ~SfxUnoControllerItem();
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // Something else
-    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;
     void                        UnBind();
     void                        GetNewDispatch();
     void                        ReleaseDispatch();
@@ -82,10 +82,10 @@ public:
     // XDispatch
     virtual void SAL_CALL dispatchWithNotification( const ::com::sun::star::util::URL& aURL,
                 const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // Something else
     void                ReleaseAll();
@@ -112,16 +112,16 @@ public:
     virtual void SAL_CALL       dispatchWithNotification( const ::com::sun::star::util::URL& aURL,
                                                           const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs,
                                                           const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener )
-                                throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                                throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual void   SAL_CALL     dispatch( const ::com::sun::star::util::URL& aURL,
                                           const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs )
-                                throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                                throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
     virtual void   SAL_CALL     addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl,
                                                    const ::com::sun::star::util::URL& aURL)
-                                throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+                                throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
+    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override ;
     static const ::com::sun::star::uno::Sequence< sal_Int8 >& impl_getStaticIdentifier();
 
     static bool        IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL );
@@ -162,7 +162,7 @@ public:
     static OUString getSlaveCommand( const ::com::sun::star::util::URL& rURL );
 
     void                StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, SfxSlotServer* pServ );
-    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override;
     void                setMasterSlaveCommand( bool bSet );
     void SAL_CALL       dispatch( const ::com::sun::star::util::URL& aURL,
                                   const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs,
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 8a70bcafc6a9..fd12ece0c1db 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -76,7 +76,7 @@ private:
     SAL_DLLPRIVATE void Construct_Impl( SfxObjectShell *pObjSh=NULL );
 
 protected:
-    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
+    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
     DECL_LINK_TYPED( SwitchReadOnlyHandler, Button*, void );
     SAL_DLLPRIVATE void KillDispatcher_Impl();
@@ -136,8 +136,8 @@ public:
     void                    ToTop();
     void                    Enable( bool bEnable );
     bool                    Close();
-    virtual void            Activate( bool bUI ) SAL_OVERRIDE;
-    virtual void            Deactivate( bool bUI ) SAL_OVERRIDE;
+    virtual void            Activate( bool bUI ) override;
+    virtual void            Deactivate( bool bUI ) override;
 
     void                    UpdateTitle();
 
@@ -148,7 +148,7 @@ public:
     SAL_DLLPRIVATE virtual const SvBorder& GetBorderPixelImpl( const SfxViewShell *pSh ) const;
     SAL_DLLPRIVATE virtual void InvalidateBorderImpl( const SfxViewShell *pSh );
 
-    virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE;
+    virtual SfxObjectShell* GetObjectShell() override;
     sal_uInt16              GetCurViewId() const;
     SfxFrame&               GetFrame() const;
     SfxViewFrame*           GetTopViewFrame() const;
@@ -290,8 +290,8 @@ public:
                                 pFrame( pViewFrame)
                             {}
 
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
 
     SfxViewFrame*           GetFrame() const
                             { return pFrame; }
@@ -309,10 +309,10 @@ public:
 
                             SfxVerbListItem( sal_uInt16 nWhichId, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& );
 
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
 
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
 };
 
 #endif
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 1928989aec85..c0535aa0c373 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -159,8 +159,8 @@ friend class SfxPrinterController;
     bool                        mbPrinterSettingsModified;
 
 protected:
-    virtual void                Activate(bool IsMDIActivate) SAL_OVERRIDE;
-    virtual void                Deactivate(bool IsMDIActivate) SAL_OVERRIDE;
+    virtual void                Activate(bool IsMDIActivate) override;
+    virtual void                Deactivate(bool IsMDIActivate) override;
 
     virtual void                InnerResizePixel( const Point &rOfs, const Size &rSize );
     virtual void                OuterResizePixel( const Point &rOfs, const Size &rSize );
@@ -168,7 +168,7 @@ protected:
 
     virtual void                Move();
 
-    virtual void                Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
+    virtual void                Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
 public:
     // Iteration
@@ -255,7 +255,7 @@ public:
     virtual void                ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false );
     virtual void                QueryObjAreaPixel( Rectangle& rRect ) const;
 
-    virtual SfxObjectShell*     GetObjectShell() SAL_OVERRIDE;
+    virtual SfxObjectShell*     GetObjectShell() override;
 
     /** retrieves the document which shall be considered the "current document" when the frame is active
 
diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx
index 40d2d55c50d1..e770fbe9caf3 100644
--- a/include/sfx2/zoomitem.hxx
+++ b/include/sfx2/zoomitem.hxx
@@ -71,12 +71,12 @@ public:
     SvxZoomType             GetType() const { return eType; }
     void                    SetType( SvxZoomType eNewType ) { eType = eNewType; }
 
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
-    virtual SfxPoolItem*    Create( SvStream& rStrm, sal_uInt16 nVersion ) const SAL_OVERRIDE;
-    virtual SvStream&       Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
-    virtual bool            operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
-    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
-    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const override;
+    virtual SfxPoolItem*    Create( SvStream& rStrm, sal_uInt16 nVersion ) const override;
+    virtual SvStream&       Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const override;
+    virtual bool            operator==( const SfxPoolItem& ) const override;
+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 };