Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

12 files changed, 391 insertions, 391 deletions

diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index a06e17338cd8..41ec150cadd6 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -63,7 +63,7 @@ class SmElementSeparator : public SmElement
 public:
     SmElementSeparator();
 
-    virtual bool isSeparator() SAL_OVERRIDE
+    virtual bool isSeparator() override
     {
         return true;
     }
@@ -81,9 +81,9 @@ class SmElementsControl : public Control
     static const sal_uInt16 aFormats[][2];
     static const sal_uInt16 aOthers[][2];
 
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
-    virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
-    virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+    virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
+    virtual void MouseMove( const MouseEvent& rMEvt ) override;
 
     typedef std::shared_ptr<SmElement>    SmElementPointer;
     typedef std::vector< SmElementPointer > SmElementList;
@@ -113,13 +113,13 @@ class SmElementsControl : public Control
 public:
     SmElementsControl(vcl::Window *pParent);
     virtual ~SmElementsControl();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void setElementSetId(sal_uInt16 aSetId);
 
     void setVerticalMode(bool bVertical);
 
-    Size GetOptimalSize() const SAL_OVERRIDE;
+    Size GetOptimalSize() const override;
 
     DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
     void DoScroll(long nDelta);
@@ -134,7 +134,7 @@ class SmElementsDockingWindow : public SfxDockingWindow
     VclPtr<SmElementsControl>  mpElementsControl;
     VclPtr<ListBox>            mpElementListBox;
 
-    virtual void Resize() SAL_OVERRIDE;
+    virtual void Resize() override;
     SmViewShell* GetView();
 
     void SelectClickHandler(SmElement* pElement);
@@ -146,10 +146,10 @@ public:
                              SfxChildWindow* pChildWindow,
                              vcl::Window* pParent );
     virtual ~SmElementsDockingWindow();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
-    virtual void EndDocking( const Rectangle& rReactangle, bool bFloatMode) SAL_OVERRIDE;
-    virtual void ToggleFloatingMode() SAL_OVERRIDE;
+    virtual void EndDocking( const Rectangle& rReactangle, bool bFloatMode) override;
+    virtual void ToggleFloatingMode() override;
 };
 
 class SmElementsDockingWindowWrapper : public SfxChildWindow
diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx
index 03feadf28603..6684a7461e95 100644
--- a/starmath/inc/action.hxx
+++ b/starmath/inc/action.hxx
@@ -34,10 +34,10 @@ class SmFormatAction: public SfxUndoAction
 public:
     SmFormatAction(SmDocShell *pDocSh, const SmFormat& rOldFormat, const SmFormat& rNewFormat);
 
-    virtual void Undo() SAL_OVERRIDE;
-    virtual void Redo() SAL_OVERRIDE;
-    virtual void Repeat(SfxRepeatTarget& rDocSh) SAL_OVERRIDE;
-    virtual OUString GetComment() const SAL_OVERRIDE;
+    virtual void Undo() override;
+    virtual void Redo() override;
+    virtual void Repeat(SfxRepeatTarget& rDocSh) override;
+    virtual OUString GetComment() const override;
 };
 
 #endif
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 08e10e32aede..b027aabf0dfb 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -64,22 +64,22 @@ class SmPrintOptionsTabPage : public SfxTabPage
 
     DECL_LINK_TYPED(SizeButtonClickHdl, Button *, void);
 
-    virtual bool    FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
-    virtual void    Reset(const SfxItemSet* rSet) SAL_OVERRIDE;
+    virtual bool    FillItemSet(SfxItemSet* rSet) override;
+    virtual void    Reset(const SfxItemSet* rSet) override;
 
 public:
     static VclPtr<SfxTabPage> Create(vcl::Window *pWindow, const SfxItemSet &rSet);
 
     SmPrintOptionsTabPage(vcl::Window *pParent, const SfxItemSet &rOptions);
     virtual ~SmPrintOptionsTabPage();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 };
 
 /**************************************************************************/
 
 class SmShowFont : public vcl::Window
 {
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
 
     vcl::Font maFont;
 
@@ -88,7 +88,7 @@ public:
         : Window(pParent, nStyle)
     {
     }
-    virtual Size GetOptimalSize() const SAL_OVERRIDE;
+    virtual Size GetOptimalSize() const override;
     void SetFont(const vcl::Font& rFont);
 };
 
@@ -106,12 +106,12 @@ class SmFontDialog : public ModalDialog
     DECL_LINK(FontModifyHdl, ComboBox *);
     DECL_LINK_TYPED(AttrChangeHdl, Button *, void);
 
-    virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
+    virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
 
 public:
     SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes);
     virtual ~SmFontDialog();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     const vcl::Font& GetFont() const
     {
@@ -137,7 +137,7 @@ class SmFontSizeDialog : public ModalDialog
 public:
     SmFontSizeDialog(vcl::Window *pParent);
     virtual ~SmFontSizeDialog();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void ReadFrom(const SmFormat &rFormat);
     void WriteTo (SmFormat &rFormat) const;
@@ -165,7 +165,7 @@ class SmFontTypeDialog : public ModalDialog
 public:
     SmFontTypeDialog(vcl::Window *pParent, OutputDevice *pFntListDevice);
     virtual ~SmFontTypeDialog();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void ReadFrom(const SmFormat &rFormat);
     void WriteTo (SmFormat &rFormat) const;
@@ -234,13 +234,13 @@ class SmDistanceDialog : public ModalDialog
 public:
     SmDistanceDialog(vcl::Window *pParent);
     virtual ~SmDistanceDialog();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void ReadFrom(const SmFormat &rFormat);
     void WriteTo (SmFormat &rFormat) /*const*/;
 
     // Window
-    virtual void    DataChanged( const DataChangedEvent &rEvt ) SAL_OVERRIDE;
+    virtual void    DataChanged( const DataChangedEvent &rEvt ) override;
 };
 
 
@@ -259,7 +259,7 @@ class SmAlignDialog : public ModalDialog
 public:
     SmAlignDialog(vcl::Window *pParent);
     virtual ~SmAlignDialog();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void ReadFrom(const SmFormat &rFormat);
     void WriteTo (SmFormat &rFormat) const;
@@ -281,17 +281,17 @@ class SmShowSymbolSetWindow : public Control
     void SetScrollBarRange();
     Point OffsetPoint(const Point &rPoint) const;
 
-    virtual void    Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
-    virtual void    MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
-    virtual void    KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
-    virtual void    Resize() SAL_OVERRIDE;
-    virtual Size    GetOptimalSize() const SAL_OVERRIDE;
+    virtual void    Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+    virtual void    MouseButtonDown(const MouseEvent& rMEvt) override;
+    virtual void    KeyInput(const KeyEvent& rKEvt) override;
+    virtual void    Resize() override;
+    virtual Size    GetOptimalSize() const override;
 
     DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
 public:
     SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyle);
     virtual ~SmShowSymbolSetWindow();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
     void setScrollbar(ScrollBar *pVScrollBar);
     void calccols();
     void    SelectSymbol(sal_uInt16 nSymbol);
@@ -309,7 +309,7 @@ class SmShowSymbolSet : public VclHBox
 public:
     SmShowSymbolSet(vcl::Window *pParent);
     virtual ~SmShowSymbolSet();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void    SetSymbolSet(const SymbolPtrVec_t& rSymbolSet) { aSymbolWindow->SetSymbolSet(rSymbolSet); }
 
@@ -326,10 +326,10 @@ class SmShowSymbol : public Control
 {
     Link<SmShowSymbol&,void> aDblClickHdlLink;
 
-    virtual void    Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
-    virtual void    ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
-    virtual void    MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
-    virtual void    Resize() SAL_OVERRIDE;
+    virtual void    Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+    virtual void    ApplySettings(vcl::RenderContext& rRenderContext) override;
+    virtual void    MouseButtonDown(const MouseEvent& rMEvt) override;
+    virtual void    Resize() override;
 
     void setFontSize(vcl::Font &rFont) const;
 
@@ -375,13 +375,13 @@ class SmSymbolDialog : public ModalDialog
     void            FillSymbolSets(bool bDeleteText = true);
     const SmSym    *GetSymbol() const;
 
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
+    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 
 public:
     SmSymbolDialog(vcl::Window * pParent, OutputDevice *pFntListDevice,
             SmSymbolManager &rSymbolMgr, SmViewShell &rViewShell);
     virtual ~SmSymbolDialog();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     bool    SelectSymbolSet(const OUString &rSymbolSetName);
     void    SelectSymbol(sal_uInt16 nSymbolPos);
@@ -392,8 +392,8 @@ public:
 
 class SmShowChar : public Control
 {
-    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;
 
 public:
     SmShowChar(vcl::Window *pParent, WinBits nStyle)
@@ -468,17 +468,17 @@ class SmSymDefineDialog : public ModalDialog
         return const_cast<SmSymDefineDialog *>(this)->GetSymbol(rComboBox);
     }
 
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
+    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 
 public:
     SmSymDefineDialog(vcl::Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr);
     virtual ~SmSymDefineDialog();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     using OutputDevice::SetFont;
 
     // Dialog
-    virtual short   Execute() SAL_OVERRIDE;
+    virtual short   Execute() override;
 
     bool SelectOldSymbolSet(const OUString &rSymbolSetName)
     {
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 24c10c950a20..fb07b189a318 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -107,13 +107,13 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener
 
 
 
-    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE;
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
 
     bool        WriteAsMathType3( SfxMedium& );
 
     virtual void        Draw(OutputDevice *pDevice,
                              const JobSetup & rSetup,
-                             sal_uInt16 nAspect = ASPECT_CONTENT) SAL_OVERRIDE;
+                             sal_uInt16 nAspect = ASPECT_CONTENT) override;
 
     virtual void        FillClass(SvGlobalName* pClassName,
                                   SotClipboardFormatId*  pFormat,
@@ -121,16 +121,16 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener
                                   OUString* pFullTypeName,
                                   OUString* pShortTypeName,
                                   sal_Int32 nFileFormat,
-                                  bool bTemplate = false ) const SAL_OVERRIDE;
+                                  bool bTemplate = false ) const override;
 
-    virtual sal_uLong   GetMiscStatus() const SAL_OVERRIDE;
-    virtual void        OnDocumentPrinterChanged( Printer * ) SAL_OVERRIDE;
-    virtual bool        InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE;
-    virtual bool        Load( SfxMedium& rMedium ) SAL_OVERRIDE;
-    virtual bool        Save() SAL_OVERRIDE;
-    virtual bool        SaveAs( SfxMedium& rMedium ) SAL_OVERRIDE;
-    virtual bool        ConvertTo( SfxMedium &rMedium ) SAL_OVERRIDE;
-    virtual bool        SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) SAL_OVERRIDE;
+    virtual sal_uLong   GetMiscStatus() const override;
+    virtual void        OnDocumentPrinterChanged( Printer * ) override;
+    virtual bool        InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) override;
+    virtual bool        Load( SfxMedium& rMedium ) override;
+    virtual bool        Save() override;
+    virtual bool        SaveAs( SfxMedium& rMedium ) override;
+    virtual bool        ConvertTo( SfxMedium &rMedium ) override;
+    virtual bool        SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) override;
 
     Printer             *GetPrt();
     OutputDevice*       GetRefDev();
@@ -138,7 +138,7 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener
     bool                IsFormulaArranged() const { return bIsFormulaArranged; }
     void                SetFormulaArranged(bool bVal) { bIsFormulaArranged = bVal; }
 
-    virtual bool        ConvertFrom(SfxMedium &rMedium) SAL_OVERRIDE;
+    virtual bool        ConvertFrom(SfxMedium &rMedium) override;
 
     /** Called whenever the formula is changed
      * Deletes the current cursor
@@ -203,15 +203,15 @@ public:
 
     void        Repaint();
 
-    virtual ::svl::IUndoManager *GetUndoManager () SAL_OVERRIDE;
+    virtual ::svl::IUndoManager *GetUndoManager () override;
 
     static SfxItemPool& GetPool();
 
     void        Execute( SfxRequest& rReq );
     void        GetState(SfxItemSet &);
 
-    virtual void SetVisArea (const Rectangle & rVisArea) SAL_OVERRIDE;
-    virtual void SetModified(bool bModified) SAL_OVERRIDE;
+    virtual void SetVisArea (const Rectangle & rVisArea) override;
+    virtual void SetModified(bool bModified) override;
 
     /** Get a cursor for modifying this document
      * @remarks Don't store this reference, a new cursor may be made...
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index a672ad6d74e6..c33dbb9ecd1c 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -55,22 +55,22 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
     Idle aCursorMoveIdle;
     ESelection aOldSelection;
 
-    virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
-    virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE;
+    virtual void KeyInput(const KeyEvent& rKEvt) override;
+    virtual void Command(const CommandEvent& rCEvt) override;
 
     DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool);
     DECL_LINK_TYPED(ModifyTimerHdl, Idle *, void);
     DECL_LINK_TYPED(CursorMoveTimerHdl, Idle *, void);
 
-    virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE;
-    virtual void Resize() SAL_OVERRIDE;
-    virtual void MouseMove(const MouseEvent &rEvt) SAL_OVERRIDE;
-    virtual void MouseButtonUp(const MouseEvent &rEvt) SAL_OVERRIDE;
-    virtual void MouseButtonDown(const MouseEvent &rEvt) SAL_OVERRIDE;
+    virtual void DataChanged( const DataChangedEvent& ) override;
+    virtual void Resize() override;
+    virtual void MouseMove(const MouseEvent &rEvt) override;
+    virtual void MouseButtonUp(const MouseEvent &rEvt) override;
+    virtual void MouseButtonDown(const MouseEvent &rEvt) override;
 
-    virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE;
-    virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
+    virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override;
+    virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
 
     DECL_LINK_TYPED(EditStatusHdl, EditStatus&, void);
     DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void);
@@ -85,7 +85,7 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
 public:
     SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin);
     virtual ~SmEditWindow();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     SmDocShell* GetDoc();
     SmViewShell* GetView();
@@ -94,10 +94,10 @@ public:
     SfxItemPool* GetEditEngineItemPool();
 
     // Window
-    virtual void SetText(const OUString& rText) SAL_OVERRIDE;
-    virtual OUString GetText() const SAL_OVERRIDE;
-    virtual void GetFocus() SAL_OVERRIDE;
-    virtual void LoseFocus() SAL_OVERRIDE;
+    virtual void SetText(const OUString& rText) override;
+    virtual OUString GetText() const override;
+    virtual void GetFocus() override;
+    virtual void LoseFocus() override;
 
     ESelection GetSelection() const;
     void SetSelection(const ESelection& rSel);
@@ -127,7 +127,7 @@ public:
     void StartCursorMove();
 
     // for Accessibility
-    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE;
+    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
 
     using Window::GetAccessible;
 };
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 28e419e587ce..3126f583e668 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -306,19 +306,19 @@ public:
             SmStructureNode( const SmStructureNode &rNode );
     virtual ~SmStructureNode();
 
-    virtual bool        IsVisible() const SAL_OVERRIDE;
+    virtual bool        IsVisible() const override;
 
-    virtual sal_uInt16      GetNumSubNodes() const SAL_OVERRIDE;
+    virtual sal_uInt16      GetNumSubNodes() const override;
             void        SetNumSubNodes(sal_uInt16 nSize) { aSubNodes.resize(nSize); }
 
     using   SmNode::GetSubNode;
-    virtual SmNode *    GetSubNode(sal_uInt16 nIndex) SAL_OVERRIDE;
+    virtual SmNode *    GetSubNode(sal_uInt16 nIndex) override;
             void SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThird = NULL);
             void SetSubNodes(const SmNodeArray &rNodeArray);
 
     SmStructureNode & operator = ( const SmStructureNode &rNode );
 
-    virtual void  GetAccessibleText( OUStringBuffer &rText ) const SAL_OVERRIDE;
+    virtual void  GetAccessibleText( OUStringBuffer &rText ) const override;
 
     void SetSubNode(size_t nIndex, SmNode* pNode)
     {
@@ -355,10 +355,10 @@ protected:
 
 public:
 
-    virtual bool        IsVisible() const SAL_OVERRIDE;
-    virtual sal_uInt16      GetNumSubNodes() const SAL_OVERRIDE;
+    virtual bool        IsVisible() const override;
+    virtual sal_uInt16      GetNumSubNodes() const override;
     using   SmNode::GetSubNode;
-    virtual SmNode *    GetSubNode(sal_uInt16 nIndex) SAL_OVERRIDE;
+    virtual SmNode *    GetSubNode(sal_uInt16 nIndex) override;
 };
 
 
@@ -374,7 +374,7 @@ protected:
 
 public:
 
-    virtual void  GetAccessibleText( OUStringBuffer &rText ) const SAL_OVERRIDE;
+    virtual void  GetAccessibleText( OUStringBuffer &rText ) const override;
 };
 
 
@@ -393,13 +393,13 @@ public:
     :   SmGraphicNode(NRECTANGLE, rNodeToken)
     {}
 
-    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth) SAL_OVERRIDE;
-    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) SAL_OVERRIDE;
+    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth) override;
+    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) override;
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
 
-    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    void CreateTextFromNode(OUString &rText) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -421,12 +421,12 @@ public:
     long         GetWidth() const { return nWidth; }
     tools::Polygon &GetPolygon() { return aPoly; }
 
-    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth) SAL_OVERRIDE;
-    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) SAL_OVERRIDE;
+    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth) override;
+    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) override;
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
 
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -481,12 +481,12 @@ public:
     /** Set the index within GetText() where the selection end */
     void                SetSelectionEnd(sal_Int32 index) {nSelectionEnd = index;}
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) SAL_OVERRIDE;
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    virtual void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
+    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) override;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    virtual void CreateTextFromNode(OUString &rText) override;
 
-    virtual void  GetAccessibleText( OUStringBuffer &rText ) const SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void  GetAccessibleText( OUStringBuffer &rText ) const override;
+    void Accept(SmVisitor* pVisitor) override;
     /**
       Converts the character from StarMath's private area symbols to a matching Unicode
       character, if necessary. To be used when converting GetText() to a normal text.
@@ -514,10 +514,10 @@ protected:
 public:
     SmSpecialNode(const SmToken &rNodeToken);
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) SAL_OVERRIDE;
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) override;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
 
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -539,8 +539,8 @@ public:
     :   SmSpecialNode(NGLYPH_SPECIAL, rNodeToken, FNT_MATH)
     {}
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -564,13 +564,13 @@ protected:
 public:
     SmMathSymbolNode(const SmToken &rNodeToken);
 
-    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth) SAL_OVERRIDE;
-    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) SAL_OVERRIDE;
+    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth) override;
+    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) override;
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) SAL_OVERRIDE;
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) override;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void CreateTextFromNode(OUString &rText) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -608,10 +608,10 @@ public:
     }
 
     sal_uLong GetBodyWidth() const {return nBodyWidth;};
-    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nHeight) SAL_OVERRIDE;
-    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) SAL_OVERRIDE;
+    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nHeight) override;
+    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) override;
 
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -632,9 +632,9 @@ public:
     :   SmMathSymbolNode(NDYNINTSYMBOL, rNodeToken)
     {}
 
-    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) SAL_OVERRIDE;
+    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) override;
 
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -655,9 +655,9 @@ public:
     }
     SmPlaceNode() : SmMathSymbolNode(NPLACE, SmToken(TPLACE, MS_PLACE, "<?>")) {};
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) SAL_OVERRIDE;
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) override;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -677,9 +677,9 @@ public:
         SetText(OUString(MS_ERROR));
     }
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) SAL_OVERRIDE;
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) override;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -703,12 +703,12 @@ public:
     }
 
     using   SmNode::GetLeftMost;
-    virtual SmNode * GetLeftMost() SAL_OVERRIDE;
+    virtual SmNode * GetLeftMost() override;
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    virtual long GetFormulaBaseline() const SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    virtual long GetFormulaBaseline() const override;
 
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -740,9 +740,9 @@ public:
     void  SetUseExtraSpaces(bool bVal) { bUseExtraSpaces = bVal; }
     bool  IsUseExtraSpaces() const { return bUseExtraSpaces; };
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) SAL_OVERRIDE;
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) override;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -761,9 +761,9 @@ public:
     :   SmLineNode(NEXPRESSION, rNodeToken)
     {}
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void CreateTextFromNode(OUString &rText) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -782,8 +782,8 @@ public:
         SetNumSubNodes(2);
     }
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -814,9 +814,9 @@ public:
         SetNumSubNodes(3);
     }
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void CreateTextFromNode(OUString &rText) override;
+    void Accept(SmVisitor* pVisitor) override;
 
     SmNode* Argument();
     const SmNode* Argument() const;
@@ -844,9 +844,9 @@ public:
         SetNumSubNodes(2);
     }
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void CreateTextFromNode(OUString &rText) override;
+    void Accept(SmVisitor* pVisitor) override;
 
     SmDynIntegralSymbolNode* Symbol();
     const SmDynIntegralSymbolNode* Symbol() const;
@@ -877,8 +877,8 @@ public:
         SetNumSubNodes(3);
     }
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void Accept(SmVisitor* pVisitor) override;
 
     SmMathSymbolNode* Symbol();
     const SmMathSymbolNode* Symbol() const;
@@ -913,11 +913,11 @@ public:
     }
 
     using   SmNode::GetLeftMost;
-    virtual SmNode * GetLeftMost() SAL_OVERRIDE;
+    virtual SmNode * GetLeftMost() override;
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void CreateTextFromNode(OUString &rText) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -946,8 +946,8 @@ public:
     bool    IsAscending() const { return bAscending; }
     void    SetAscending(bool bVal)  { bAscending = bVal; }
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -1027,9 +1027,9 @@ public:
     void SetBody(SmNode* pBody) { SetSubNode(0, pBody); }
     void SetSubSup(SmSubSup eSubSup, SmNode* pScript) { SetSubNode( 1 + eSubSup, pScript); }
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void CreateTextFromNode(OUString &rText) override;
+    void Accept(SmVisitor* pVisitor) override;
 
 };
 
@@ -1065,9 +1065,9 @@ public:
     SmMathSymbolNode* ClosingBrace();
     const SmMathSymbolNode* ClosingBrace() const;
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void CreateTextFromNode(OUString &rText) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -1089,9 +1089,9 @@ class SmBracebodyNode : public SmStructureNode
 public:
     inline SmBracebodyNode(const SmToken &rNodeToken);
 
-    virtual void    Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    virtual void    Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
     long            GetBodyHeight() const { return nBodyHeight; }
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -1128,8 +1128,8 @@ public:
     SmNode* Script();
     const SmNode* Script() const;
 
-    virtual void    Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void    Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -1170,8 +1170,8 @@ public:
 
     long CalcSymbolHeight(const SmNode &rSymbol, const SmFormat &rFormat) const;
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -1188,8 +1188,8 @@ public:
     :   SmStructureNode(NALIGN, rNodeToken)
     {}
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -1212,9 +1212,9 @@ public:
     :   SmStructureNode(NATTRIBUT, rNodeToken)
     {}
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void CreateTextFromNode(OUString &rText) override;
+    void Accept(SmVisitor* pVisitor) override;
 
     SmNode* Attribute();
     const SmNode* Attribute() const;
@@ -1246,10 +1246,10 @@ public:
     const Fraction & GetSizeParameter() const {return aFontSize;}
     const FontSizeType& GetSizeType() const {return nSizeType;}
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) SAL_OVERRIDE;
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) override;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void CreateTextFromNode(OUString &rText) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -1277,11 +1277,11 @@ public:
     void SetRowCol(sal_uInt16 nMatrixRows, sal_uInt16 nMatrixCols);
 
     using   SmNode::GetLeftMost;
-    virtual SmNode * GetLeftMost() SAL_OVERRIDE;
+    virtual SmNode * GetLeftMost() override;
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void CreateTextFromNode(OUString &rText) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
@@ -1307,9 +1307,9 @@ public:
     sal_uInt16       GetBlankNum() const { return nNum; }
     void         SetBlankNum(sal_uInt16 nNumber) { nNum = nNumber; }
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) SAL_OVERRIDE;
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
-    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
+    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) override;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) override;
+    void Accept(SmVisitor* pVisitor) override;
 };
 
 
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 9ee0deb9cce8..575dbae28cfb 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -107,7 +107,7 @@ public:
     SmModule(SfxObjectFactory* pObjFact);
     virtual ~SmModule();
 
-    virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE;
+    virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) override;
 
     svtools::ColorConfig &  GetColorConfig();
 
@@ -123,9 +123,9 @@ public:
     VirtualDevice &     GetDefaultVirtualDev();
 
     //virtual methods for options dialog
-    virtual SfxItemSet*  CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE;
-    virtual void         ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE;
-    virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual SfxItemSet*  CreateItemSet( sal_uInt16 nId ) override;
+    virtual void         ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override;
+    virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) override;
 };
 
 #define SM_MOD() ( *reinterpret_cast<SmModule**>(GetAppData(SHL_SM)) )
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index f5b084cfaae4..475515fe6514 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -112,7 +112,7 @@ private:
     SymbolMap_t         m_aSymbols;
     bool                m_bModified;
 
-    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE;
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
 
 public:
     SmSymbolManager();
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index 9dc6812877e6..c897e26d14b6 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -58,44 +58,44 @@ class SmModel : public SfxBaseModel,
     std::unique_ptr<SmPrintUIOptions> m_pPrintUIOptions;
 protected:
     virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues )
-        throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override;
     virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue )
-        throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE;
+        throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
 public:
     SmModel( SfxObjectShell *pObjSh = 0 );
     virtual ~SmModel() throw ();
 
     //XInterface
-    virtual     ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) 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& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL acquire(  ) throw() override;
+    virtual void SAL_CALL release(  ) throw() override;
 
     //XTypeProvider
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //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;
 
     //XRenderable
-    virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
-    virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xParent ) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xParent ) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
     // oox::FormulaExportBase
-    virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer, oox::core::OoxmlVersion version ) SAL_OVERRIDE;
-    virtual void writeFormulaRtf(OStringBuffer& rBuffer, rtl_TextEncoding nEncoding) SAL_OVERRIDE;
+    virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer, oox::core::OoxmlVersion version ) override;
+    virtual void writeFormulaRtf(OStringBuffer& rBuffer, rtl_TextEncoding nEncoding) override;
     // oox::FormulaImportBase
-    virtual void readFormulaOoxml( oox::formulaimport::XmlStream& stream ) SAL_OVERRIDE;
-    virtual Size getFormulaSize() const SAL_OVERRIDE;
+    virtual void readFormulaOoxml( oox::formulaimport::XmlStream& stream ) override;
+    virtual Size getFormulaSize() const override;
 };
 
 
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index 2b6ed9512046..4c86f33e12e4 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -156,10 +156,10 @@ public:
 
     SmFontPickListBox& operator = (const SmFontPickList& rList);
 
-    virtual void    Insert(const vcl::Font &rFont) SAL_OVERRIDE;
+    virtual void    Insert(const vcl::Font &rFont) override;
     using   Window::Update;
-    virtual void    Update(const vcl::Font &rFont, const vcl::Font &rNewFont) SAL_OVERRIDE;
-    virtual void    Remove(const vcl::Font &rFont) SAL_OVERRIDE;
+    virtual void    Update(const vcl::Font &rFont, const vcl::Font &rNewFont) override;
+    virtual void    Remove(const vcl::Font &rFont) override;
 };
 
 #endif
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index edde0168903b..39880ba1d4f6 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -87,11 +87,11 @@ protected:
         aFormulaDrawPos = rPos;
     }
 
-    virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE;
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
-    virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
-    virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE;
-    virtual void StateChanged( StateChangedType eChanged ) SAL_OVERRIDE;
+    virtual void DataChanged( const DataChangedEvent& ) override;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+    virtual void KeyInput(const KeyEvent& rKEvt) override;
+    virtual void Command(const CommandEvent& rCEvt) override;
+    virtual void StateChanged( StateChangedType eChanged ) override;
     DECL_LINK_TYPED(MenuSelectHdl, Menu*, bool);
 
 private:
@@ -103,13 +103,13 @@ private:
 public:
     SmGraphicWindow(SmViewShell* pShell);
     virtual ~SmGraphicWindow();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     // Window
-    virtual void MouseButtonDown(const MouseEvent &rMEvt) SAL_OVERRIDE;
-    virtual void MouseMove(const MouseEvent &rMEvt) SAL_OVERRIDE;
-    virtual void GetFocus() SAL_OVERRIDE;
-    virtual void LoseFocus() SAL_OVERRIDE;
+    virtual void MouseButtonDown(const MouseEvent &rMEvt) override;
+    virtual void MouseMove(const MouseEvent &rMEvt) override;
+    virtual void GetFocus() override;
+    virtual void LoseFocus() override;
 
     SmViewShell* GetView()
     {
@@ -136,7 +136,7 @@ public:
     void ApplyColorConfigValues(const svtools::ColorConfig &rColorCfg);
 
     // for Accessibility
-    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE;
+    virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
 
     using Window::GetAccessible;
     SmGraphicAccessible* GetAccessible_Impl()
@@ -153,7 +153,7 @@ public:
     SmGraphicController(SmGraphicWindow &, sal_uInt16, SfxBindings & );
     virtual void StateChanged(sal_uInt16             nSID,
                               SfxItemState       eState,
-                              const SfxPoolItem* pState) SAL_OVERRIDE;
+                              const SfxPoolItem* pState) override;
 };
 
 class SmEditController: public SfxControllerItem
@@ -167,7 +167,7 @@ public:
     virtual ~SmEditController();
 #endif
 
-    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;
 };
 
 class SmCmdBoxWindow : public SfxDockingWindow
@@ -183,16 +183,16 @@ class SmCmdBoxWindow : public SfxDockingWindow
 protected:
 
     // Window
-    virtual void    GetFocus() SAL_OVERRIDE;
-    virtual void Resize() SAL_OVERRIDE;
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
-    virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
+    virtual void    GetFocus() override;
+    virtual void Resize() override;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+    virtual void StateChanged( StateChangedType nStateChange ) override;
 
-    virtual Size CalcDockingSize(SfxChildAlignment eAlign) SAL_OVERRIDE;
+    virtual Size CalcDockingSize(SfxChildAlignment eAlign) override;
     virtual SfxChildAlignment CheckAlignment(SfxChildAlignment eActual,
-                                             SfxChildAlignment eWish) SAL_OVERRIDE;
+                                             SfxChildAlignment eWish) override;
 
-    virtual void    ToggleFloatingMode() SAL_OVERRIDE;
+    virtual void    ToggleFloatingMode() override;
 
 public:
     SmCmdBoxWindow(SfxBindings    *pBindings,
@@ -200,7 +200,7 @@ public:
                    Window         *pParent);
 
     virtual ~SmCmdBoxWindow ();
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void AdjustPosition();
 
@@ -247,7 +247,7 @@ class SmViewShell: public SfxViewShell
     bool bPasteState;
 
     DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void );
-    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
+    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
     /** Used to determine whether insertions using SID_INSERTSYMBOL and SID_INSERTCOMMAND
      * should be inserted into SmEditWindow or directly into the SmDocShell as done if the
@@ -269,23 +269,23 @@ protected:
                   const OUString& rText,
                   sal_uInt16        MaxWidth);
 
-    virtual SfxPrinter *GetPrinter(bool bCreate = false) SAL_OVERRIDE;
+    virtual SfxPrinter *GetPrinter(bool bCreate = false) override;
     virtual sal_uInt16 SetPrinter(SfxPrinter *pNewPrinter,
-                              SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false) SAL_OVERRIDE;
+                              SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false) override;
 
     void Insert( SfxMedium& rMedium );
     void InsertFrom(SfxMedium &rMedium);
 
-    virtual bool HasPrintOptionsPage() const SAL_OVERRIDE;
+    virtual bool HasPrintOptionsPage() const override;
     virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(vcl::Window    *pParent,
-                                                      const SfxItemSet &rOptions) SAL_OVERRIDE;
-    virtual void Deactivate(bool IsMDIActivate) SAL_OVERRIDE;
-    virtual void Activate(bool IsMDIActivate) SAL_OVERRIDE;
-    virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize) SAL_OVERRIDE;
-    virtual void InnerResizePixel(const Point &rOfs, const Size  &rSize) SAL_OVERRIDE;
-    virtual void OuterResizePixel(const Point &rOfs, const Size  &rSize) SAL_OVERRIDE;
-    virtual void QueryObjAreaPixel( Rectangle& rRect ) const SAL_OVERRIDE;
-    virtual void SetZoomFactor( const Fraction &rX, const Fraction &rY ) SAL_OVERRIDE;
+                                                      const SfxItemSet &rOptions) override;
+    virtual void Deactivate(bool IsMDIActivate) override;
+    virtual void Activate(bool IsMDIActivate) override;
+    virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize) override;
+    virtual void InnerResizePixel(const Point &rOfs, const Size  &rSize) override;
+    virtual void OuterResizePixel(const Point &rOfs, const Size  &rSize) override;
+    virtual void QueryObjAreaPixel( Rectangle& rRect ) const override;
+    virtual void SetZoomFactor( const Fraction &rX, const Fraction &rY ) override;
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index 25b4d17e9dc0..2a7bc4b6121c 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -69,35 +69,35 @@ protected:
 class SmDefaultingVisitor : public SmVisitor
 {
 public:
-    void Visit( SmTableNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBraceNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBracebodyNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmOperNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmAlignNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmAttributNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmFontNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmUnHorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinHorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinVerNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinDiagonalNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmSubSupNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmMatrixNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmPlaceNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmTextNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmSpecialNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmGlyphSpecialNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmMathSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBlankNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmErrorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmLineNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmExpressionNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmPolyLineNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRootNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRootSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmDynIntegralNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmDynIntegralSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRectangleNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmVerticalBraceNode* pNode ) SAL_OVERRIDE;
+    void Visit( SmTableNode* pNode ) override;
+    void Visit( SmBraceNode* pNode ) override;
+    void Visit( SmBracebodyNode* pNode ) override;
+    void Visit( SmOperNode* pNode ) override;
+    void Visit( SmAlignNode* pNode ) override;
+    void Visit( SmAttributNode* pNode ) override;
+    void Visit( SmFontNode* pNode ) override;
+    void Visit( SmUnHorNode* pNode ) override;
+    void Visit( SmBinHorNode* pNode ) override;
+    void Visit( SmBinVerNode* pNode ) override;
+    void Visit( SmBinDiagonalNode* pNode ) override;
+    void Visit( SmSubSupNode* pNode ) override;
+    void Visit( SmMatrixNode* pNode ) override;
+    void Visit( SmPlaceNode* pNode ) override;
+    void Visit( SmTextNode* pNode ) override;
+    void Visit( SmSpecialNode* pNode ) override;
+    void Visit( SmGlyphSpecialNode* pNode ) override;
+    void Visit( SmMathSymbolNode* pNode ) override;
+    void Visit( SmBlankNode* pNode ) override;
+    void Visit( SmErrorNode* pNode ) override;
+    void Visit( SmLineNode* pNode ) override;
+    void Visit( SmExpressionNode* pNode ) override;
+    void Visit( SmPolyLineNode* pNode ) override;
+    void Visit( SmRootNode* pNode ) override;
+    void Visit( SmRootSymbolNode* pNode ) override;
+    void Visit( SmDynIntegralNode* pNode ) override;
+    void Visit( SmDynIntegralSymbolNode* pNode ) override;
+    void Visit( SmRectangleNode* pNode ) override;
+    void Visit( SmVerticalBraceNode* pNode ) override;
 protected:
     ~SmDefaultingVisitor() {}
 
@@ -114,7 +114,7 @@ public:
     /** Given position and device this constructor will draw the caret */
     SmCaretDrawingVisitor( OutputDevice& rDevice, SmCaretPos position, Point offset, bool caretVisible );
     virtual ~SmCaretDrawingVisitor() {}
-    void Visit( SmTextNode* pNode ) SAL_OVERRIDE;
+    void Visit( SmTextNode* pNode ) override;
     using SmDefaultingVisitor::Visit;
 private:
     OutputDevice &rDev;
@@ -124,7 +124,7 @@ private:
     bool isCaretVisible;
 protected:
     /** Default method for drawing pNodes */
-    void DefaultVisit( SmNode* pNode ) SAL_OVERRIDE;
+    void DefaultVisit( SmNode* pNode ) override;
 };
 
 // SmCaretPos2LineVisitor
@@ -142,7 +142,7 @@ public:
         pos.pSelectedNode->Accept( this );
     }
     virtual ~SmCaretPos2LineVisitor() {}
-    void Visit( SmTextNode* pNode ) SAL_OVERRIDE;
+    void Visit( SmTextNode* pNode ) override;
     using SmDefaultingVisitor::Visit;
     SmCaretLine GetResult( ){
         return line;
@@ -153,7 +153,7 @@ private:
     SmCaretPos pos;
 protected:
     /** Default method for computing lines for pNodes */
-    void DefaultVisit( SmNode* pNode ) SAL_OVERRIDE;
+    void DefaultVisit( SmNode* pNode ) override;
 };
 
 // SmDrawingVisitor
@@ -174,35 +174,35 @@ public:
         pTree->Accept( this );
     }
     virtual ~SmDrawingVisitor() {}
-    void Visit( SmTableNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBraceNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBracebodyNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmOperNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmAlignNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmAttributNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmFontNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmUnHorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinHorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinVerNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinDiagonalNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmSubSupNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmMatrixNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmPlaceNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmTextNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmSpecialNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmGlyphSpecialNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmMathSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBlankNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmErrorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmLineNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmExpressionNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmPolyLineNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRootNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRootSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmDynIntegralNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmDynIntegralSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRectangleNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmVerticalBraceNode* pNode ) SAL_OVERRIDE;
+    void Visit( SmTableNode* pNode ) override;
+    void Visit( SmBraceNode* pNode ) override;
+    void Visit( SmBracebodyNode* pNode ) override;
+    void Visit( SmOperNode* pNode ) override;
+    void Visit( SmAlignNode* pNode ) override;
+    void Visit( SmAttributNode* pNode ) override;
+    void Visit( SmFontNode* pNode ) override;
+    void Visit( SmUnHorNode* pNode ) override;
+    void Visit( SmBinHorNode* pNode ) override;
+    void Visit( SmBinVerNode* pNode ) override;
+    void Visit( SmBinDiagonalNode* pNode ) override;
+    void Visit( SmSubSupNode* pNode ) override;
+    void Visit( SmMatrixNode* pNode ) override;
+    void Visit( SmPlaceNode* pNode ) override;
+    void Visit( SmTextNode* pNode ) override;
+    void Visit( SmSpecialNode* pNode ) override;
+    void Visit( SmGlyphSpecialNode* pNode ) override;
+    void Visit( SmMathSymbolNode* pNode ) override;
+    void Visit( SmBlankNode* pNode ) override;
+    void Visit( SmErrorNode* pNode ) override;
+    void Visit( SmLineNode* pNode ) override;
+    void Visit( SmExpressionNode* pNode ) override;
+    void Visit( SmPolyLineNode* pNode ) override;
+    void Visit( SmRootNode* pNode ) override;
+    void Visit( SmRootSymbolNode* pNode ) override;
+    void Visit( SmDynIntegralNode* pNode ) override;
+    void Visit( SmDynIntegralSymbolNode* pNode ) override;
+    void Visit( SmRectangleNode* pNode ) override;
+    void Visit( SmVerticalBraceNode* pNode ) override;
 private:
     /** Draw the children of a pNode
      * This the default method, use by most pNodes
@@ -233,13 +233,13 @@ class SmSetSelectionVisitor : public SmDefaultingVisitor
 public:
     SmSetSelectionVisitor( SmCaretPos startPos, SmCaretPos endPos, SmNode* pNode);
     virtual ~SmSetSelectionVisitor() {}
-    void Visit( SmBinHorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmUnHorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmFontNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmTextNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmExpressionNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmLineNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmAlignNode* pNode ) SAL_OVERRIDE;
+    void Visit( SmBinHorNode* pNode ) override;
+    void Visit( SmUnHorNode* pNode ) override;
+    void Visit( SmFontNode* pNode ) override;
+    void Visit( SmTextNode* pNode ) override;
+    void Visit( SmExpressionNode* pNode ) override;
+    void Visit( SmLineNode* pNode ) override;
+    void Visit( SmAlignNode* pNode ) override;
     using SmDefaultingVisitor::Visit;
     /** Set IsSelected on all pNodes of pSubTree */
     static void SetSelectedOnAll( SmNode* pSubTree, bool IsSelected = true );
@@ -250,7 +250,7 @@ private:
      * Also note that pNodes such as SmBinVerNode cannot be selected, don't this method for
      * it.
      */
-    void DefaultVisit( SmNode* pNode ) SAL_OVERRIDE;
+    void DefaultVisit( SmNode* pNode ) override;
     void VisitCompositionNode( SmNode* pNode );
     /** Caret position where the selection starts */
     SmCaretPos  StartPos;
@@ -293,35 +293,35 @@ public:
     /** Builds a caret position graph for pRootNode */
     SmCaretPosGraphBuildingVisitor( SmNode* pRootNode );
     virtual ~SmCaretPosGraphBuildingVisitor();
-    void Visit( SmTableNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBraceNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBracebodyNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmOperNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmAlignNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmAttributNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmFontNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmUnHorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinHorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinVerNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinDiagonalNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmSubSupNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmMatrixNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmPlaceNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmTextNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmSpecialNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmGlyphSpecialNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmMathSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBlankNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmErrorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmLineNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmExpressionNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmPolyLineNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRootNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRootSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmDynIntegralNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmDynIntegralSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRectangleNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmVerticalBraceNode* pNode ) SAL_OVERRIDE;
+    void Visit( SmTableNode* pNode ) override;
+    void Visit( SmBraceNode* pNode ) override;
+    void Visit( SmBracebodyNode* pNode ) override;
+    void Visit( SmOperNode* pNode ) override;
+    void Visit( SmAlignNode* pNode ) override;
+    void Visit( SmAttributNode* pNode ) override;
+    void Visit( SmFontNode* pNode ) override;
+    void Visit( SmUnHorNode* pNode ) override;
+    void Visit( SmBinHorNode* pNode ) override;
+    void Visit( SmBinVerNode* pNode ) override;
+    void Visit( SmBinDiagonalNode* pNode ) override;
+    void Visit( SmSubSupNode* pNode ) override;
+    void Visit( SmMatrixNode* pNode ) override;
+    void Visit( SmPlaceNode* pNode ) override;
+    void Visit( SmTextNode* pNode ) override;
+    void Visit( SmSpecialNode* pNode ) override;
+    void Visit( SmGlyphSpecialNode* pNode ) override;
+    void Visit( SmMathSymbolNode* pNode ) override;
+    void Visit( SmBlankNode* pNode ) override;
+    void Visit( SmErrorNode* pNode ) override;
+    void Visit( SmLineNode* pNode ) override;
+    void Visit( SmExpressionNode* pNode ) override;
+    void Visit( SmPolyLineNode* pNode ) override;
+    void Visit( SmRootNode* pNode ) override;
+    void Visit( SmRootSymbolNode* pNode ) override;
+    void Visit( SmDynIntegralNode* pNode ) override;
+    void Visit( SmDynIntegralSymbolNode* pNode ) override;
+    void Visit( SmRectangleNode* pNode ) override;
+    void Visit( SmVerticalBraceNode* pNode ) override;
     SmCaretPosGraph* takeGraph()
     {
         return mpGraph.release();
@@ -342,35 +342,35 @@ class SmCloningVisitor : public SmVisitor
 public:
     SmCloningVisitor( ){ pResult = NULL; }
     virtual ~SmCloningVisitor() {}
-    void Visit( SmTableNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBraceNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBracebodyNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmOperNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmAlignNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmAttributNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmFontNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmUnHorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinHorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinVerNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinDiagonalNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmSubSupNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmMatrixNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmPlaceNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmTextNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmSpecialNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmGlyphSpecialNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmMathSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBlankNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmErrorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmLineNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmExpressionNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmPolyLineNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRootNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRootSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmDynIntegralNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmDynIntegralSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRectangleNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmVerticalBraceNode* pNode ) SAL_OVERRIDE;
+    void Visit( SmTableNode* pNode ) override;
+    void Visit( SmBraceNode* pNode ) override;
+    void Visit( SmBracebodyNode* pNode ) override;
+    void Visit( SmOperNode* pNode ) override;
+    void Visit( SmAlignNode* pNode ) override;
+    void Visit( SmAttributNode* pNode ) override;
+    void Visit( SmFontNode* pNode ) override;
+    void Visit( SmUnHorNode* pNode ) override;
+    void Visit( SmBinHorNode* pNode ) override;
+    void Visit( SmBinVerNode* pNode ) override;
+    void Visit( SmBinDiagonalNode* pNode ) override;
+    void Visit( SmSubSupNode* pNode ) override;
+    void Visit( SmMatrixNode* pNode ) override;
+    void Visit( SmPlaceNode* pNode ) override;
+    void Visit( SmTextNode* pNode ) override;
+    void Visit( SmSpecialNode* pNode ) override;
+    void Visit( SmGlyphSpecialNode* pNode ) override;
+    void Visit( SmMathSymbolNode* pNode ) override;
+    void Visit( SmBlankNode* pNode ) override;
+    void Visit( SmErrorNode* pNode ) override;
+    void Visit( SmLineNode* pNode ) override;
+    void Visit( SmExpressionNode* pNode ) override;
+    void Visit( SmPolyLineNode* pNode ) override;
+    void Visit( SmRootNode* pNode ) override;
+    void Visit( SmRootSymbolNode* pNode ) override;
+    void Visit( SmDynIntegralNode* pNode ) override;
+    void Visit( SmDynIntegralSymbolNode* pNode ) override;
+    void Visit( SmRectangleNode* pNode ) override;
+    void Visit( SmVerticalBraceNode* pNode ) override;
     /** Clone a pNode */
     SmNode* Clone( SmNode* pNode );
 private:
@@ -390,7 +390,7 @@ public:
     /** Draws a selection on rDevice for the selection on pTree */
     SmSelectionDrawingVisitor( OutputDevice& rDevice, SmNode* pTree, Point Offset );
     virtual ~SmSelectionDrawingVisitor() {}
-    void Visit( SmTextNode* pNode ) SAL_OVERRIDE;
+    void Visit( SmTextNode* pNode ) override;
     using SmDefaultingVisitor::Visit;
 private:
     /** Reference to drawing device */
@@ -402,7 +402,7 @@ private:
     /** Extend the area that must be selected  */
     void ExtendSelectionArea(const Rectangle& rArea);
     /** Default visiting method */
-    void DefaultVisit( SmNode* pNode ) SAL_OVERRIDE;
+    void DefaultVisit( SmNode* pNode ) override;
     /** Visit the children of a given pNode */
     void VisitChildren( SmNode* pNode );
 };
@@ -416,35 +416,35 @@ public:
     SmNodeToTextVisitor( SmNode* pNode, OUString &rText );
     virtual ~SmNodeToTextVisitor() {}
 
-    void Visit( SmTableNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBraceNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBracebodyNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmOperNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmAlignNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmAttributNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmFontNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmUnHorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinHorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinVerNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBinDiagonalNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmSubSupNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmMatrixNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmPlaceNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmTextNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmSpecialNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmGlyphSpecialNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmMathSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmBlankNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmErrorNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmLineNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmExpressionNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmPolyLineNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRootNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRootSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmDynIntegralNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmDynIntegralSymbolNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmRectangleNode* pNode ) SAL_OVERRIDE;
-    void Visit( SmVerticalBraceNode* pNode ) SAL_OVERRIDE;
+    void Visit( SmTableNode* pNode ) override;
+    void Visit( SmBraceNode* pNode ) override;
+    void Visit( SmBracebodyNode* pNode ) override;
+    void Visit( SmOperNode* pNode ) override;
+    void Visit( SmAlignNode* pNode ) override;
+    void Visit( SmAttributNode* pNode ) override;
+    void Visit( SmFontNode* pNode ) override;
+    void Visit( SmUnHorNode* pNode ) override;
+    void Visit( SmBinHorNode* pNode ) override;
+    void Visit( SmBinVerNode* pNode ) override;
+    void Visit( SmBinDiagonalNode* pNode ) override;
+    void Visit( SmSubSupNode* pNode ) override;
+    void Visit( SmMatrixNode* pNode ) override;
+    void Visit( SmPlaceNode* pNode ) override;
+    void Visit( SmTextNode* pNode ) override;
+    void Visit( SmSpecialNode* pNode ) override;
+    void Visit( SmGlyphSpecialNode* pNode ) override;
+    void Visit( SmMathSymbolNode* pNode ) override;
+    void Visit( SmBlankNode* pNode ) override;
+    void Visit( SmErrorNode* pNode ) override;
+    void Visit( SmLineNode* pNode ) override;
+    void Visit( SmExpressionNode* pNode ) override;
+    void Visit( SmPolyLineNode* pNode ) override;
+    void Visit( SmRootNode* pNode ) override;
+    void Visit( SmRootSymbolNode* pNode ) override;
+    void Visit( SmDynIntegralNode* pNode ) override;
+    void Visit( SmDynIntegralSymbolNode* pNode ) override;
+    void Visit( SmRectangleNode* pNode ) override;
+    void Visit( SmVerticalBraceNode* pNode ) override;
 private:
     /** Extract text from a pNode that constitutes a line */
     void LineToText( SmNode* pNode ) {