Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

23 files changed, 204 insertions, 204 deletions

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 82e918ad971d..7b8de3e643ad 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -42,8 +42,8 @@ class Test : public test::BootstrapFixture
 public:
     Test();
 
-    virtual void setUp() SAL_OVERRIDE;
-    virtual void tearDown() SAL_OVERRIDE;
+    virtual void setUp() override;
+    virtual void tearDown() override;
 
     void testConstruction();
 
@@ -237,47 +237,47 @@ public:
 private:
     OUString & m_rText;
     LanguageType m_eLang;
-    virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ) SAL_OVERRIDE
+    virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ) override
     {
         //fprintf(stderr, "TestAutoCorrDoc::Delete\n");
         m_rText = m_rText.replaceAt(nStt, nEnd-nStt, "");
         return true;
     }
-    virtual bool Insert( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE
+    virtual bool Insert( sal_Int32 nPos, const OUString& rTxt ) override
     {
         //fprintf(stderr, "TestAutoCorrDoc::Insert\n");
         m_rText = m_rText.replaceAt(nPos, 0, rTxt);
         return true;
     }
-    virtual bool Replace( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE
+    virtual bool Replace( sal_Int32 nPos, const OUString& rTxt ) override
     {
         //fprintf(stderr, "TestAutoCorrDoc::Replace\n");
         return ReplaceRange( nPos, rTxt.getLength(), rTxt );
     }
-    virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt ) SAL_OVERRIDE
+    virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt ) override
     {
         //fprintf(stderr, "TestAutoCorrDoc::ReplaceRange %d %d %s\n", nPos, nLen, OUStringToOString(rTxt, RTL_TEXTENCODING_UTF8).getStr());
         m_rText = m_rText.replaceAt(nPos, nLen, rTxt);
         return true;
     }
-    virtual bool SetAttr( sal_Int32, sal_Int32, sal_uInt16, SfxPoolItem& ) SAL_OVERRIDE
+    virtual bool SetAttr( sal_Int32, sal_Int32, sal_uInt16, SfxPoolItem& ) override
     {
         //fprintf(stderr, "TestAutoCorrDoc::SetAttr\n");
         return true;
     }
-    virtual bool SetINetAttr( sal_Int32, sal_Int32, const OUString& ) SAL_OVERRIDE
+    virtual bool SetINetAttr( sal_Int32, sal_Int32, const OUString& ) override
     {
         //fprintf(stderr, "TestAutoCorrDoc::SetINetAttr\n");
         return true;
     }
-    virtual OUString const* GetPrevPara(bool) SAL_OVERRIDE
+    virtual OUString const* GetPrevPara(bool) override
     {
         //fprintf(stderr, "TestAutoCorrDoc::GetPrevPara\n");
         return 0;
     }
     virtual bool ChgAutoCorrWord( sal_Int32& rSttPos,
                 sal_Int32 nEndPos, SvxAutoCorrect& rACorrect,
-                OUString* pPara ) SAL_OVERRIDE
+                OUString* pPara ) override
     {
         //fprintf(stderr, "TestAutoCorrDoc::ChgAutoCorrWord\n");
 
@@ -349,7 +349,7 @@ namespace {
     public:
         explicit UrlEditEngine(SfxItemPool *pPool) : EditEngine(pPool) {}
 
-        virtual OUString CalcFieldValue( const SvxFieldItem&, sal_Int32, sal_Int32, Color*&, Color*& ) SAL_OVERRIDE
+        virtual OUString CalcFieldValue( const SvxFieldItem&, sal_Int32, sal_Int32, Color*&, Color*& ) override
         {
             return OUString("jim@bob.com"); // a sophisticated view of value:
         }
diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx b/editeng/source/accessibility/AccessibleHyperlink.hxx
index be10ace80baa..6419e307b982 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.hxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.hxx
@@ -51,17 +51,17 @@ namespace accessibility
         virtual ~AccessibleHyperlink();
 
         // XAccessibleAction
-        virtual sal_Int32 SAL_CALL getAccessibleActionCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual sal_Int32 SAL_CALL getAccessibleActionCount() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
 
         // XAccessibleHyperlink
-        virtual css::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual css::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual sal_Int32 SAL_CALL getStartIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual sal_Int32 SAL_CALL getEndIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual css::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getStartIndex() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getEndIndex() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override;
     };
 
 } // end of namespace accessibility
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index 2d17144221c2..4f0c87f44749 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -154,7 +154,7 @@ class EditCharAttribFont: public EditCharAttrib
 public:
     EditCharAttribFont( const SvxFontItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -165,7 +165,7 @@ class EditCharAttribWeight : public EditCharAttrib
 public:
     EditCharAttribWeight( const SvxWeightItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 // class EditCharAttribItalic
@@ -175,7 +175,7 @@ class EditCharAttribItalic : public EditCharAttrib
 public:
     EditCharAttribItalic( const SvxPostureItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -186,7 +186,7 @@ class EditCharAttribShadow : public EditCharAttrib
 public:
     EditCharAttribShadow( const SvxShadowedItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -197,7 +197,7 @@ class EditCharAttribEscapement : public EditCharAttrib
 public:
     EditCharAttribEscapement( const SvxEscapementItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -208,7 +208,7 @@ class EditCharAttribOutline : public EditCharAttrib
 public:
     EditCharAttribOutline( const SvxContourItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -219,7 +219,7 @@ class EditCharAttribStrikeout : public EditCharAttrib
 public:
     EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -230,7 +230,7 @@ class EditCharAttribCaseMap : public EditCharAttrib
 public:
     EditCharAttribCaseMap( const SvxCaseMapItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -241,7 +241,7 @@ class EditCharAttribUnderline : public EditCharAttrib
 public:
     EditCharAttribUnderline( const SvxUnderlineItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -252,7 +252,7 @@ class EditCharAttribOverline : public EditCharAttrib
 public:
     EditCharAttribOverline( const SvxOverlineItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -263,7 +263,7 @@ class EditCharAttribEmphasisMark : public EditCharAttrib
 public:
     EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -274,7 +274,7 @@ class EditCharAttribRelief : public EditCharAttrib
 public:
     EditCharAttribRelief( const SvxCharReliefItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -285,7 +285,7 @@ class EditCharAttribFontHeight : public EditCharAttrib
 public:
     EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -296,7 +296,7 @@ class EditCharAttribFontWidth : public EditCharAttrib
 public:
     EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -307,7 +307,7 @@ class EditCharAttribColor : public EditCharAttrib
 public:
     EditCharAttribColor( const SvxColorItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 // class EditCharAttribBackgroundColor
@@ -318,7 +318,7 @@ public:
     EditCharAttribBackgroundColor(const SvxBackgroundColorItem& rAttr,
                                   sal_uInt16 nStart,
                                   sal_uInt16 nEnd );
-    virtual void    SetFont(SvxFont& rFont, OutputDevice* pOutDev) SAL_OVERRIDE;
+    virtual void    SetFont(SvxFont& rFont, OutputDevice* pOutDev) override;
 };
 
 
@@ -330,7 +330,7 @@ class EditCharAttribLanguage : public EditCharAttrib
 public:
     EditCharAttribLanguage( const SvxLanguageItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -341,7 +341,7 @@ class EditCharAttribTab : public EditCharAttrib
 public:
     EditCharAttribTab( const SfxVoidItem& rAttr, sal_uInt16 nPos );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -352,7 +352,7 @@ class EditCharAttribLineBreak : public EditCharAttrib
 public:
     EditCharAttribLineBreak( const SfxVoidItem& rAttr, sal_uInt16 nPos );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -375,7 +375,7 @@ public:
     bool operator != ( const EditCharAttribField& rAttr ) const
                                     { return !(operator == ( rAttr ) ); }
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
     Color*&         GetTextColor()           { return pTxtColor; }
     Color*&         GetFieldColor()           { return pFldColor; }
 
@@ -393,7 +393,7 @@ class EditCharAttribPairKerning : public EditCharAttrib
 public:
     EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -404,7 +404,7 @@ class EditCharAttribKerning : public EditCharAttrib
 public:
     EditCharAttribKerning( const SvxKerningItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 
@@ -415,7 +415,7 @@ class EditCharAttribWordLineMode: public EditCharAttrib
 public:
     EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
 
-    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void    SetFont( SvxFont& rFont, OutputDevice* pOutDev ) override;
 };
 
 // class EditCharAttribGrabBag
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 35544631464b..4fe3963d2041 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -844,7 +844,7 @@ protected:
                         virtual ~EditEngineItemPool();
 public:
 
-    virtual SvStream&   Store( SvStream& rStream ) const SAL_OVERRIDE;
+    virtual SvStream&   Store( SvStream& rStream ) const override;
 };
 
 #endif // INCLUDED_EDITENG_SOURCE_EDITENG_EDITDOC_HXX
diff --git a/editeng/source/editeng/editsel.hxx b/editeng/source/editeng/editsel.hxx
index ee785817e4a1..bc3a0310eab0 100644
--- a/editeng/source/editeng/editsel.hxx
+++ b/editeng/source/editeng/editsel.hxx
@@ -32,16 +32,16 @@ private:
 public:
                     EditSelFunctionSet();
 
-    virtual void    BeginDrag() SAL_OVERRIDE;
+    virtual void    BeginDrag() override;
 
-    virtual void    CreateAnchor() SAL_OVERRIDE;
-    virtual void    DestroyAnchor() SAL_OVERRIDE;
+    virtual void    CreateAnchor() override;
+    virtual void    DestroyAnchor() override;
 
-    virtual bool    SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ) SAL_OVERRIDE;
+    virtual bool    SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ) override;
 
-    virtual bool    IsSelectionAtPoint( const Point& rPointPixel ) SAL_OVERRIDE;
-    virtual void    DeselectAtPoint( const Point& rPointPixel ) SAL_OVERRIDE;
-    virtual void    DeselectAll() SAL_OVERRIDE;
+    virtual bool    IsSelectionAtPoint( const Point& rPointPixel ) override;
+    virtual void    DeselectAtPoint( const Point& rPointPixel ) override;
+    virtual void    DeselectAll() override;
 
     void            SetCurView( EditView* pView )       { pCurView = pView; }
 };
diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index b0c4953b9565..094e9992fc25 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -42,8 +42,8 @@ public:
     EditUndoDelContent(EditEngine* pEE, ContentNode* pNode, sal_Int32 nPortion);
     virtual ~EditUndoDelContent();
 
-    virtual void    Undo() SAL_OVERRIDE;
-    virtual void    Redo() SAL_OVERRIDE;
+    virtual void    Undo() override;
+    virtual void    Redo() override;
 };
 
 
@@ -71,8 +71,8 @@ public:
                          const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, bool bBackward);
     virtual ~EditUndoConnectParas();
 
-    virtual void    Undo() SAL_OVERRIDE;
-    virtual void    Redo() SAL_OVERRIDE;
+    virtual void    Undo() override;
+    virtual void    Redo() override;
 };
 
 
@@ -88,8 +88,8 @@ public:
     EditUndoSplitPara(EditEngine* pEE, sal_Int32 nNode, sal_uInt16 nSepPos);
     virtual ~EditUndoSplitPara();
 
-    virtual void    Undo() SAL_OVERRIDE;
-    virtual void    Redo() SAL_OVERRIDE;
+    virtual void    Undo() override;
+    virtual void    Redo() override;
 };
 
 
@@ -104,10 +104,10 @@ private:
 public:
     EditUndoInsertChars(EditEngine* pEE, const EPaM& rEPaM, const OUString& rStr);
 
-    virtual void    Undo() SAL_OVERRIDE;
-    virtual void    Redo() SAL_OVERRIDE;
+    virtual void    Undo() override;
+    virtual void    Redo() override;
 
-    virtual bool    Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE;
+    virtual bool    Merge( SfxUndoAction *pNextAction ) override;
 };
 
 
@@ -125,8 +125,8 @@ public:
     const EPaM&     GetEPaM() { return aEPaM; }
     OUString        GetStr() const { return aText; }
 
-    virtual void    Undo() SAL_OVERRIDE;
-    virtual void    Redo() SAL_OVERRIDE;
+    virtual void    Undo() override;
+    virtual void    Redo() override;
 };
 
 
@@ -142,8 +142,8 @@ public:
     EditUndoInsertFeature(EditEngine* pEE, const EPaM& rEPaM, const SfxPoolItem& rFeature);
     virtual ~EditUndoInsertFeature();
 
-    virtual void    Undo() SAL_OVERRIDE;
-    virtual void    Redo() SAL_OVERRIDE;
+    virtual void    Undo() override;
+    virtual void    Redo() override;
 };
 
 
@@ -159,8 +159,8 @@ public:
     EditUndoMoveParagraphs(EditEngine* pEE, const Range& rParas, sal_Int32 nDest);
     virtual ~EditUndoMoveParagraphs();
 
-    virtual void    Undo() SAL_OVERRIDE;
-    virtual void    Redo() SAL_OVERRIDE;
+    virtual void    Undo() override;
+    virtual void    Redo() override;
 };
 
 
@@ -183,8 +183,8 @@ public:
         const SfxItemSet& rPrevParaAttribs);
     virtual ~EditUndoSetStyleSheet();
 
-    virtual void    Undo() SAL_OVERRIDE;
-    virtual void    Redo() SAL_OVERRIDE;
+    virtual void    Undo() override;
+    virtual void    Redo() override;
 };
 
 
@@ -201,8 +201,8 @@ public:
     EditUndoSetParaAttribs(EditEngine* pEE, sal_Int32 nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems);
     virtual ~EditUndoSetParaAttribs();
 
-    virtual void    Undo() SAL_OVERRIDE;
-    virtual void    Redo() SAL_OVERRIDE;
+    virtual void    Undo() override;
+    virtual void    Redo() override;
 };
 
 
@@ -236,8 +236,8 @@ public:
     void                SetRemoveParaAttribs( bool b )  { bRemoveParaAttribs = b; }
     void                SetRemoveWhich( sal_uInt16 n )      { nRemoveWhich = n; }
 
-    virtual void        Undo() SAL_OVERRIDE;
-    virtual void        Redo() SAL_OVERRIDE;
+    virtual void        Undo() override;
+    virtual void        Redo() override;
 
     void AppendContentInfo(ContentAttribsInfo* pNew);
 };
@@ -263,8 +263,8 @@ public:
     void                SetText( EditTextObject* pObj ) { pTxtObj = pObj; }
     void                SetNewSelection( const ESelection& rSel ) { aNewESel = rSel; }
 
-    virtual void        Undo() SAL_OVERRIDE;
-    virtual void        Redo() SAL_OVERRIDE;
+    virtual void        Undo() override;
+    virtual void        Redo() override;
 };
 
 
@@ -279,8 +279,8 @@ public:
     EditUndoMarkSelection(EditEngine* pEE, const ESelection& rSel);
     virtual ~EditUndoMarkSelection();
 
-    virtual void    Undo() SAL_OVERRIDE;
-    virtual void    Redo() SAL_OVERRIDE;
+    virtual void    Undo() override;
+    virtual void    Redo() override;
 };
 
 
diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx
index 828867b547a8..9fe8798a3caf 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -45,12 +45,12 @@ private:
     void                    CheckSpellTo();
 
 protected:
-    virtual void            SpellStart( SvxSpellArea eArea ) SAL_OVERRIDE;
-    virtual bool            SpellContinue() SAL_OVERRIDE;    // Check area
-    virtual void            ReplaceAll( const OUString &rNewText, sal_Int16 nLanguage ) SAL_OVERRIDE;
-    virtual void            SpellEnd() SAL_OVERRIDE;
-    virtual bool            SpellMore() SAL_OVERRIDE;
-    virtual bool            HasOtherCnt() SAL_OVERRIDE;
+    virtual void            SpellStart( SvxSpellArea eArea ) override;
+    virtual bool            SpellContinue() override;    // Check area
+    virtual void            ReplaceAll( const OUString &rNewText, sal_Int16 nLanguage ) override;
+    virtual void            SpellEnd() override;
+    virtual bool            SpellMore() override;
+    virtual bool            HasOtherCnt() override;
 
 public:
     EditSpellWrapper( vcl::Window* pWin,
@@ -135,20 +135,20 @@ public:
     EdtAutoCorrDoc(EditEngine* pE, ContentNode* pCurNode, sal_Int32 nCrsr, sal_Unicode cIns);
     virtual ~EdtAutoCorrDoc();
 
-    virtual bool    Delete( sal_Int32 nStt, sal_Int32 nEnd ) SAL_OVERRIDE;
-    virtual bool    Insert( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE;
-    virtual bool    Replace( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE;
-    virtual bool    ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt ) SAL_OVERRIDE;
+    virtual bool    Delete( sal_Int32 nStt, sal_Int32 nEnd ) override;
+    virtual bool    Insert( sal_Int32 nPos, const OUString& rTxt ) override;
+    virtual bool    Replace( sal_Int32 nPos, const OUString& rTxt ) override;
+    virtual bool    ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt ) override;
 
-    virtual bool    SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId, SfxPoolItem& ) SAL_OVERRIDE;
-    virtual bool    SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ) SAL_OVERRIDE;
+    virtual bool    SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId, SfxPoolItem& ) override;
+    virtual bool    SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL ) override;
 
-    virtual OUString const* GetPrevPara(bool bAtNormalPos) SAL_OVERRIDE;
+    virtual OUString const* GetPrevPara(bool bAtNormalPos) override;
 
     virtual bool        ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
-                                  SvxAutoCorrect& rACorrect, OUString* pPara ) SAL_OVERRIDE;
+                                  SvxAutoCorrect& rACorrect, OUString* pPara ) override;
 
-    virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara = false ) const SAL_OVERRIDE;
+    virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara = false ) const override;
 
     sal_Int32       GetCursor() const { return nCursor; }
 
diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx
index 9bb455de514d..f3f3c0919106 100644
--- a/editeng/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -66,7 +66,7 @@ private:
     void                    ImpSetStyleSheet( sal_uInt16 nHeadingLevel );
 
 protected:
-    virtual void            NextToken( int nToken ) SAL_OVERRIDE;
+    virtual void            NextToken( int nToken ) override;
 
 public:
     EditHTMLParser(SvStream& rIn, const OUString& rBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs);
diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx
index 64efb2204f24..728d791aad85 100644
--- a/editeng/source/editeng/eeobj.hxx
+++ b/editeng/source/editeng/eeobj.hxx
@@ -47,14 +47,14 @@ public:
 
 
     // css::uno::XInterface
-    css::uno::Any                               SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    void                                        SAL_CALL acquire() throw() SAL_OVERRIDE  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() throw() SAL_OVERRIDE  { OWeakObject::release(); }
+    css::uno::Any                               SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
+    void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::datatransfer::XTransferable
-    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::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw(css::uno::RuntimeException, std::exception) override;
 };
 
 #endif // INCLUDED_EDITENG_SOURCE_EDITENG_EEOBJ_HXX
diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index bcbbf5d71dcd..5416dd1acf3c 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -44,17 +44,17 @@ private:
     sal_uInt8               nLastAction;
 
 protected:
-    virtual void        InsertPara() SAL_OVERRIDE;
-    virtual void        InsertText() SAL_OVERRIDE;
-    virtual void        MovePos( bool bForward = true ) SAL_OVERRIDE;
+    virtual void        InsertPara() override;
+    virtual void        InsertText() override;
+    virtual void        MovePos( bool bForward = true ) override;
     virtual void        SetEndPrevPara( EditNodeIdx*& rpNodePos,
-                                        sal_Int32& rCntPos ) SAL_OVERRIDE;
+                                        sal_Int32& rCntPos ) override;
 
-    virtual void        UnknownAttrToken( int nToken, SfxItemSet* pSet ) SAL_OVERRIDE;
-    virtual void        NextToken( int nToken ) SAL_OVERRIDE;
-    virtual void        SetAttrInDoc( SvxRTFItemStackType &rSet ) SAL_OVERRIDE;
-    virtual bool        IsEndPara( EditNodeIdx* pNd, sal_Int32 nCnt ) const SAL_OVERRIDE;
-    virtual void        CalcValue() SAL_OVERRIDE;
+    virtual void        UnknownAttrToken( int nToken, SfxItemSet* pSet ) override;
+    virtual void        NextToken( int nToken ) override;
+    virtual void        SetAttrInDoc( SvxRTFItemStackType &rSet ) override;
+    virtual bool        IsEndPara( EditNodeIdx* pNd, sal_Int32 nCnt ) const override;
+    virtual void        CalcValue() override;
     void                CreateStyleSheets();
     SfxStyleSheet*      CreateStyleSheet( SvxRTFStyleType* pRTFStyle );
     SvxRTFStyleType*    FindStyleSheet( const OUString& rName );
@@ -66,7 +66,7 @@ public:
     EditRTFParser(SvStream& rIn, EditSelection aCurSel, SfxItemPool& rAttrPool, EditEngine* pEditEngine);
     virtual ~EditRTFParser();
 
-    virtual SvParserState   CallParser() SAL_OVERRIDE;
+    virtual SvParserState   CallParser() override;
 
     vcl::Font       GetDefFont()                        { return GetFont( nDefFont ); }
 
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 4e6d03833e60..29c0a993c59d 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -254,18 +254,18 @@ protected:
     // DragAndDropClient
     void dragGestureRecognized(const css::datatransfer::dnd::DragGestureEvent& dge)
         throw (css::uno::RuntimeException,
-               std::exception) SAL_OVERRIDE;
+               std::exception) override;
     void dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde )
         throw (css::uno::RuntimeException,
-               std::exception) SAL_OVERRIDE;
+               std::exception) override;
     void drop(const css::datatransfer::dnd::DropTargetDropEvent& dtde)
         throw (css::uno::RuntimeException,
-               std::exception) SAL_OVERRIDE;
-    void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+               std::exception) override;
+    void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (css::uno::RuntimeException, std::exception) override;
+    void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception) override;
     void dragOver(const css::datatransfer::dnd::DropTargetDragEvent& dtde)
         throw (css::uno::RuntimeException,
-               std::exception) SAL_OVERRIDE;
+               std::exception) override;
 
     void ShowDDCursor( const Rectangle& rRect );
     void HideDDCursor();
@@ -698,7 +698,7 @@ private:
     ParaPortionList&        GetParaPortions()       { return aParaPortionList; }
 
 protected:
-    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
+    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
 public:
                             virtual ~ImpEditEngine();
diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx
index c52d73071563..ca666666189d 100644
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -74,18 +74,18 @@ class TextConvWrapper : public editeng::HangulHanjaConversion
 protected:
     virtual void    GetNextPortion( OUString& /* [out] */ rNextPortion,
                         LanguageType& /* [out] */ rLangOfPortion,
-                        bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText ) SAL_OVERRIDE;
+                        bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText ) override;
     virtual void    HandleNewUnit( const sal_Int32 nUnitStart,
-                                   const sal_Int32 nUnitEnd ) SAL_OVERRIDE;
+                                   const sal_Int32 nUnitEnd ) override;
     virtual void    ReplaceUnit(
                         const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd,
                         const OUString& rOrigText,
                         const OUString& rReplaceWith,
                         const css::uno::Sequence< sal_Int32 > &rOffsets,
                         ReplacementAction eAction,
-                        LanguageType *pNewUnitLanguage ) SAL_OVERRIDE;
+                        LanguageType *pNewUnitLanguage ) override;
 
-    virtual bool    HasRubySupport() const SAL_OVERRIDE;
+    virtual bool    HasRubySupport() const override;
 
     void SetLanguageAndFont( const ESelection &rESel,
                             LanguageType nLang, sal_uInt16 nLangWhichId,
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index c17591b8cc25..1cacdbedc89b 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -591,7 +591,7 @@ public:
     virtual ~SvxDoGetCapitalSize() {}
 
     virtual void Do( const OUString &rTxt, const sal_Int32 nIdx,
-                     const sal_Int32 nLen, const bool bUpper ) SAL_OVERRIDE;
+                     const sal_Int32 nLen, const bool bUpper ) override;
 
     const Size &GetSize() const { return aTxtSize; };
 };
@@ -654,10 +654,10 @@ public:
           aSpacePos( rPos ),
           nKern( nKrn )
         { }
-    virtual void DoSpace( const bool bDraw ) SAL_OVERRIDE;
-    virtual void SetSpace() SAL_OVERRIDE;
+    virtual void DoSpace( const bool bDraw ) override;
+    virtual void SetSpace() override;
     virtual void Do( const OUString &rTxt, const sal_Int32 nIdx,
-                     const sal_Int32 nLen, const bool bUpper ) SAL_OVERRIDE;
+                     const sal_Int32 nLen, const bool bUpper ) override;
 };
 
 void SvxDoDrawCapital::DoSpace( const bool bDraw )
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
index a3b0d3259ed4..548b7c9a9faf 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
@@ -37,10 +37,10 @@ public:
         css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler);
 
     virtual ~SvXMLAutoCorrectExport() {}
-    sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE;
-    void _ExportAutoStyles() SAL_OVERRIDE {}
-    void _ExportMasterStyles () SAL_OVERRIDE {}
-    void _ExportContent() SAL_OVERRIDE {}
+    sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) override;
+    void _ExportAutoStyles() override {}
+    void _ExportMasterStyles () override {}
+    void _ExportContent() override {}
 };
 
 class SvStringsISortDtor;
@@ -57,10 +57,10 @@ public:
         css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler);
 
     virtual ~SvXMLExceptionListExport() {}
-    sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE;
-    void _ExportAutoStyles() SAL_OVERRIDE {}
-    void _ExportMasterStyles () SAL_OVERRIDE {}
-    void _ExportContent() SAL_OVERRIDE {}
+    sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) override;
+    void _ExportAutoStyles() override {}
+    void _ExportMasterStyles () override {}
+    void _ExportContent() override {}
 };
 #endif
 
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
index 25be4584ffbd..b1432bd5d4c7 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
@@ -31,7 +31,7 @@ protected:
     // This method is called after the namespace map has been updated, but
     // before a context for the current element has been pushed.
     virtual SvXMLImportContext *CreateFastContext( sal_Int32 Element,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) SAL_OVERRIDE;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override;
 
 public:
     SvxAutocorrWordList     *pAutocorr_List;
@@ -57,7 +57,7 @@ public:
 
     virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element,
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
 
     virtual ~SvXMLWordListContext();
 };
@@ -81,7 +81,7 @@ protected:
     // This method is called after the namespace map has been updated, but
     // before a context for the current element has been pushed.
     virtual SvXMLImportContext *CreateFastContext( sal_Int32 Element, const css::uno::Reference<
-            css::xml::sax::XFastAttributeList > & xAttrList ) SAL_OVERRIDE;
+            css::xml::sax::XFastAttributeList > & xAttrList ) override;
 public:
     SvStringsISortDtor  &rList;
 
@@ -102,7 +102,7 @@ public:
 
     virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element,
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
 
     virtual ~SvXMLExceptionListContext();
 };
diff --git a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
index 53456d117b95..66068e251be2 100644
--- a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
@@ -40,12 +40,12 @@ public:
 
     //XFastTokenHandler
     virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // Much faster direct C++ shortcut to the method that matters
-    virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const SAL_OVERRIDE;
+    virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const override;
 };
 
 #endif // EDITENG_SOURCE_MISC_SVXMLAUTOCORRECTTOKENHANDLER_HXX
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 7a8fa910eba5..6eff02562de0 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -88,10 +88,10 @@ public:
     // XSupportedLocales
     virtual css::uno::Sequence< css::lang::Locale > SAL_CALL
         getLocales()
-            throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL
         hasLocale( const css::lang::Locale& rLocale )
-            throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(css::uno::RuntimeException, std::exception) override;
 
     // XThesaurus
     virtual css::uno::Sequence<
@@ -100,7 +100,7 @@ public:
                 const css::lang::Locale& rLocale,
                 const css::beans::PropertyValues& rProperties )
             throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                  css::uno::RuntimeException, std::exception) override;
 };
 
 
@@ -213,22 +213,22 @@ public:
     // XSupportedLanguages (for XSpellChecker1)
     virtual css::uno::Sequence< sal_Int16 > SAL_CALL
         getLanguages()
-            throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL
         hasLanguage( sal_Int16 nLanguage )
-            throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(css::uno::RuntimeException, std::exception) override;
 
     // XSpellChecker1 (same as XSpellChecker but sal_Int16 for language)
     virtual sal_Bool SAL_CALL
         isValid( const OUString& rWord, sal_Int16 nLanguage,
                 const css::beans::PropertyValues& rProperties )
             throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                  css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL
         spell( const OUString& rWord, sal_Int16 nLanguage,
                 const css::beans::PropertyValues& rProperties )
             throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                  css::uno::RuntimeException, std::exception) override;
 };
 
 
@@ -310,10 +310,10 @@ public:
     virtual css::uno::Sequence<
             css::lang::Locale > SAL_CALL
         getLocales()
-            throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL
         hasLocale( const css::lang::Locale& rLocale )
-            throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            throw(css::uno::RuntimeException, std::exception) override;
 
     // XHyphenator
     virtual css::uno::Reference<
@@ -323,7 +323,7 @@ public:
                 sal_Int16 nMaxLeading,
                 const css::beans::PropertyValues& rProperties )
             throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                  css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Reference<
             css::linguistic2::XHyphenatedWord > SAL_CALL
         queryAlternativeSpelling( const OUString& rWord,
@@ -331,7 +331,7 @@ public:
                 sal_Int16 nIndex,
                 const css::beans::PropertyValues& rProperties )
             throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                  css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Reference<
             css::linguistic2::XPossibleHyphens > SAL_CALL
         createPossibleHyphens(
@@ -339,7 +339,7 @@ public:
                 const css::lang::Locale& rLocale,
                 const css::beans::PropertyValues& rProperties )
             throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+                  css::uno::RuntimeException, std::exception) override;
 };
 
 
@@ -438,7 +438,7 @@ public:
 
     // lang::XEventListener
     virtual void    SAL_CALL disposing(const EventObject& rSource)
-            throw( RuntimeException, std::exception ) SAL_OVERRIDE;
+            throw( RuntimeException, std::exception ) override;
 };
 
 LinguMgrExitLstnr::LinguMgrExitLstnr()
diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx
index 12d5005ece50..02786bebe97f 100644
--- a/editeng/source/outliner/outleeng.hxx
+++ b/editeng/source/outliner/outleeng.hxx
@@ -32,17 +32,17 @@ protected:
 
     // derived from EditEngine. Allows Outliner objects to provide
     // bullet access to the EditEngine.
-    virtual const SvxNumberFormat*  GetNumberFormat( sal_Int32 nPara ) const SAL_OVERRIDE;
+    virtual const SvxNumberFormat*  GetNumberFormat( sal_Int32 nPara ) const override;
 
 public:
                         OutlinerEditEng( Outliner* pOwner, SfxItemPool* pPool );
                         virtual ~OutlinerEditEng();
 
-    virtual void        PaintingFirstLine( sal_Int32 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev ) SAL_OVERRIDE;
+    virtual void        PaintingFirstLine( sal_Int32 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev ) override;
 
-    virtual void        ParagraphInserted( sal_Int32 nNewParagraph ) SAL_OVERRIDE;
-    virtual void        ParagraphDeleted( sal_Int32 nDeletedParagraph ) SAL_OVERRIDE;
-    virtual void        ParagraphConnected( sal_Int32 nLeftParagraph, sal_Int32 nRightParagraph ) SAL_OVERRIDE;
+    virtual void        ParagraphInserted( sal_Int32 nNewParagraph ) override;
+    virtual void        ParagraphDeleted( sal_Int32 nDeletedParagraph ) override;
+    virtual void        ParagraphConnected( sal_Int32 nLeftParagraph, sal_Int32 nRightParagraph ) override;
 
     virtual void DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart,
                               sal_Int32 nTextLen, const long* pDXArray, const SvxFont& rFont,
@@ -54,7 +54,7 @@ public:
         bool bEndOfBullet,
         const css::lang::Locale* pLocale,
         const Color& rOverlineColor,
-        const Color& rTextLineColor) SAL_OVERRIDE;
+        const Color& rTextLineColor) override;
 
     virtual void DrawingTab(
         const Point& rStartPos, long nWidth, const OUString& rChar,
@@ -62,22 +62,22 @@ public:
         bool bEndOfLine,
         bool bEndOfParagraph,
         const Color& rOverlineColor,
-        const Color& rTextLineColor) SAL_OVERRIDE;
+        const Color& rTextLineColor) override;
 
-    virtual void        StyleSheetChanged( SfxStyleSheet* pStyle ) SAL_OVERRIDE;
-    virtual void        ParaAttribsChanged( sal_Int32 nPara ) SAL_OVERRIDE;
-    virtual bool        SpellNextDocument() SAL_OVERRIDE;
-    virtual OUString    GetUndoComment( sal_uInt16 nUndoId ) const SAL_OVERRIDE;
+    virtual void        StyleSheetChanged( SfxStyleSheet* pStyle ) override;
+    virtual void        ParaAttribsChanged( sal_Int32 nPara ) override;
+    virtual bool        SpellNextDocument() override;
+    virtual OUString    GetUndoComment( sal_uInt16 nUndoId ) const override;
 
     // for text conversion
-    virtual bool        ConvertNextDocument() SAL_OVERRIDE;
+    virtual bool        ConvertNextDocument() override;
 
-    virtual void        FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) SAL_OVERRIDE;
-    virtual OUString    CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ) SAL_OVERRIDE;
+    virtual void        FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ) override;
+    virtual OUString    CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ) override;
 
-    virtual Rectangle   GetBulletArea( sal_Int32 nPara ) SAL_OVERRIDE;
+    virtual Rectangle   GetBulletArea( sal_Int32 nPara ) override;
 
-       virtual void        SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) SAL_OVERRIDE;
+       virtual void        SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) override;
 
     // belongs into class Outliner, move there before incompatible update!
     Link<EENotify&,void> aOutlinerNotifyHdl;
diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx
index 77b689f56b3c..cb36c574cca5 100644
--- a/editeng/source/outliner/outlundo.hxx
+++ b/editeng/source/outliner/outlundo.hxx
@@ -47,8 +47,8 @@ private:
 public:
     OutlinerUndoChangeParaFlags( Outliner* pOutliner, sal_Int32 nPara, ParaFlag nOldFlags, ParaFlag nNewFlags );
 
-    virtual void    Undo() SAL_OVERRIDE;
-    virtual void    Redo() SAL_OVERRIDE;
+    virtual void    Undo() override;
+    virtual void    Redo() override;
 };
 
 class OutlinerUndoChangeParaNumberingRestart : public OutlinerUndoBase
@@ -71,8 +71,8 @@ public:
         sal_Int16 nOldNumberingStartValue, sal_Int16 mnNewNumberingStartValue,
         bool  nOldbParaIsNumberingRestart, bool nbNewParaIsNumberingRestart );
 
-    virtual void    Undo() SAL_OVERRIDE;
-    virtual void    Redo() SAL_OVERRIDE;
+    virtual void    Undo() override;
+    virtual void    Redo() override;
 };
 
 class OutlinerUndoChangeDepth : public OutlinerUndoBase
@@ -85,8 +85,8 @@ private:
 public:
                     OutlinerUndoChangeDepth( Outliner* pOutliner, sal_Int32 nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth );
 
-    virtual void    Undo() SAL_OVERRIDE;
-    virtual void    Redo() SAL_OVERRIDE;
+    virtual void    Undo() override;
+    virtual void    Redo() override;
 };
 
 // Help-Undo: If it does not exist an OutlinerUndoAction for a certain action
@@ -100,8 +100,8 @@ private:
 public:
                     OutlinerUndoCheckPara( Outliner* pOutliner, sal_Int32 nPara );
 
-    virtual void    Undo() SAL_OVERRIDE;
-    virtual void    Redo() SAL_OVERRIDE;
+    virtual void    Undo() override;
+    virtual void    Redo() override;
 };
 
 class OLUndoExpand : public EditUndo
@@ -110,8 +110,8 @@ class OLUndoExpand : public EditUndo
 public:
     OLUndoExpand( Outliner* pOut, sal_uInt16 nId );
     virtual ~OLUndoExpand();
-    virtual void Undo() SAL_OVERRIDE;
-    virtual void Redo() SAL_OVERRIDE;
+    virtual void Undo() override;
+    virtual void Redo() override;
 
     sal_uInt16* pParas;  // 0 == nCount contains paragraph number
     Outliner* pOutliner;
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 80faa93a556b..60ceeb09a741 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -495,7 +495,7 @@ css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( const Svx
 class SvxUnoNumberingRulesCompare : public ::cppu::WeakAggImplHelper1< XAnyCompare >
 {
 public:
-    virtual sal_Int16 SAL_CALL compare( const Any& Any1, const Any& Any2 ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Int16 SAL_CALL compare( const Any& Any1, const Any& Any2 ) throw(RuntimeException, std::exception) override;
 };
 
 sal_Int16 SAL_CALL SvxUnoNumberingRulesCompare::compare( const Any& Any1, const Any& Any2 ) throw(RuntimeException, std::exception)
diff --git a/editeng/source/xml/editsource.hxx b/editeng/source/xml/editsource.hxx
index 259851f57915..4b49838448ad 100644
--- a/editeng/source/xml/editsource.hxx
+++ b/editeng/source/xml/editsource.hxx
@@ -31,9 +31,9 @@ public:
     explicit SvxEditEngineSource( EditEngine* pEditEngine );
     virtual ~SvxEditEngineSource();
 
-    virtual SvxEditSource*      Clone() const SAL_OVERRIDE;
-    virtual SvxTextForwarder*   GetTextForwarder() SAL_OVERRIDE;
-    virtual void                UpdateData() SAL_OVERRIDE;
+    virtual SvxEditSource*      Clone() const override;
+    virtual SvxTextForwarder*   GetTextForwarder() override;
+    virtual void                UpdateData() override;
 
 private:
     explicit SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl );
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 7ca0ffb80a57..2dad6f43d26f 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -155,33 +155,33 @@ public:
 
 
     // XMultiServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
 
     // XStyleFamiliesSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies(  ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies(  ) throw(css::uno::RuntimeException, std::exception) override;
 
     // XAnyCompareFactory
-    virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
 
     // XModel
-    virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual OUString SAL_CALL getURL(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs(  ) 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) SAL_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 lockControllers(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL unlockControllers(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL hasControllersLocked(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController(  ) throw (css::uno::RuntimeException, std::exception) SAL_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;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw (css::uno::RuntimeException, std::exception) 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) 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) override;
+    virtual void SAL_CALL lockControllers(  ) throw (css::uno::RuntimeException, std::exception) 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) 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) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection(  ) 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 addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) 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) 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 >& xListener ) 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) override;
 
 };
 
@@ -326,9 +326,9 @@ public:
     virtual ~SvxXMLTextExportComponent();
 
     // methods without content:
-    virtual void _ExportAutoStyles() SAL_OVERRIDE;
-    virtual void _ExportMasterStyles() SAL_OVERRIDE;
-    virtual void _ExportContent() SAL_OVERRIDE;
+    virtual void _ExportAutoStyles() override;
+    virtual void _ExportMasterStyles() override;
+    virtual void _ExportContent() override;
 
 private:
     css::uno::Reference< css::text::XText > mxText;
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index 5f20e25a7287..321a817e2221 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -60,7 +60,7 @@ public:
     SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, const uno::Reference< XText >& xText );
     virtual ~SvxXMLTextImportContext();
 
-    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) SAL_OVERRIDE;
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) override;
 
 //  SvxXMLXTableImport& getImport() const { return *(SvxXMLXTableImport*)&GetImport(); }