Second batch of adding SAL_OVERRIDE to overriding function declarations

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

Change-Id: Ie656f9d653fc716f72ac175925272696d509038f

13 files changed, 406 insertions, 406 deletions

diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index ccd9d7c89937..c4ab012b3d23 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -59,7 +59,7 @@ class SmElementSeparator : public SmElement
 public:
     SmElementSeparator();
 
-    virtual bool isSeparator()
+    virtual bool isSeparator() SAL_OVERRIDE
     {
         return true;
     }
@@ -80,9 +80,9 @@ class SmElementsControl : public Control
 
     Link aSelectHdlLink;
 
-    virtual void Paint(const Rectangle&);
-    virtual void MouseButtonDown(const MouseEvent& rMEvt);
-    virtual void MouseMove( const MouseEvent& rMEvt );
+    virtual void Paint(const Rectangle&) SAL_OVERRIDE;
+    virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
 
     typedef boost::shared_ptr<SmElement>    SmElementPointer;
     typedef std::vector< SmElementPointer > SmElementList;
@@ -122,7 +122,7 @@ class SmElementsDockingWindow : public SfxDockingWindow
     SmElementsControl   maElementsControl;
     ListBox             maElementListBox;
 
-    virtual void Resize();
+    virtual void Resize() SAL_OVERRIDE;
     SmViewShell* GetView();
 
     DECL_LINK(SelectClickHdl, SmElement*);
@@ -135,8 +135,8 @@ public:
                              Window* pParent );
     ~SmElementsDockingWindow();
 
-    virtual void EndDocking( const Rectangle& rReactangle, bool bFloatMode);
-    virtual void ToggleFloatingMode();
+    virtual void EndDocking( const Rectangle& rReactangle, bool bFloatMode) SAL_OVERRIDE;
+    virtual void ToggleFloatingMode() SAL_OVERRIDE;
 };
 
 class SmElementsDockingWindowWrapper : public SfxChildWindow
diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx
index b8b62c7b1d24..03feadf28603 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();
-    virtual void Redo();
-    virtual void Repeat(SfxRepeatTarget& rDocSh);
-    virtual OUString GetComment() const;
+    virtual void Undo() SAL_OVERRIDE;
+    virtual void Redo() SAL_OVERRIDE;
+    virtual void Repeat(SfxRepeatTarget& rDocSh) SAL_OVERRIDE;
+    virtual OUString GetComment() const SAL_OVERRIDE;
 };
 
 #endif
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index ef8b8b40eb0b..e84093ffe9ff 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -63,8 +63,8 @@ class SmPrintOptionsTabPage : public SfxTabPage
 
     DECL_LINK(SizeButtonClickHdl, Button *);
 
-    virtual bool    FillItemSet(SfxItemSet& rSet);
-    virtual void    Reset(const SfxItemSet& rSet);
+    virtual bool    FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE;
+    virtual void    Reset(const SfxItemSet& rSet) SAL_OVERRIDE;
 
 public:
     static SfxTabPage* Create(Window *pWindow, const SfxItemSet &rSet);
@@ -76,14 +76,14 @@ public:
 
 class SmShowFont : public Window
 {
-    virtual void Paint(const Rectangle&);
+    virtual void Paint(const Rectangle&) SAL_OVERRIDE;
 
 public:
     SmShowFont(Window *pParent, WinBits nStyle)
         : Window(pParent, nStyle)
     {
     }
-    virtual Size GetOptimalSize() const;
+    virtual Size GetOptimalSize() const SAL_OVERRIDE;
     void SetFont(const Font& rFont);
 };
 
@@ -103,7 +103,7 @@ class SmFontDialog : public ModalDialog
 
     void            InitColor_Impl();
 
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
 public:
     SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes);
@@ -228,7 +228,7 @@ public:
     void WriteTo (SmFormat &rFormat) /*const*/;
 
     // Window
-    virtual void    DataChanged( const DataChangedEvent &rEvt );
+    virtual void    DataChanged( const DataChangedEvent &rEvt ) SAL_OVERRIDE;
 };
 
 
@@ -267,11 +267,11 @@ class SmShowSymbolSetWindow : public Control
     void SetScrollBarRange();
     Point OffsetPoint(const Point &rPoint) const;
 
-    virtual void    Paint(const Rectangle&);
-    virtual void    MouseButtonDown(const MouseEvent& rMEvt);
-    virtual void    KeyInput(const KeyEvent& rKEvt);
-    virtual void    Resize();
-    virtual Size    GetOptimalSize() const;
+    virtual void    Paint(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;
 
     DECL_LINK( ScrollHdl, ScrollBar* );
 public:
@@ -309,9 +309,9 @@ class SmShowSymbol : public Control
 {
     Link  aDblClickHdlLink;
 
-    virtual void    Paint(const Rectangle&);
-    virtual void    MouseButtonDown(const MouseEvent& rMEvt);
-    virtual void    Resize();
+    virtual void    Paint(const Rectangle&) SAL_OVERRIDE;
+    virtual void    MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual void    Resize() SAL_OVERRIDE;
 
     void setFontSize(Font &rFont) const;
 
@@ -357,7 +357,7 @@ class SmSymbolDialog : public ModalDialog
     const SmSym    *GetSymbol() const;
     void            InitColor_Impl();
 
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
 public:
     SmSymbolDialog(Window * pParent, OutputDevice *pFntListDevice,
@@ -372,7 +372,7 @@ public:
 
 class SmShowChar : public Control
 {
-    virtual void    Paint(const Rectangle&);
+    virtual void    Paint(const Rectangle&) SAL_OVERRIDE;
 
 public:
     SmShowChar(Window *pParent, const ResId& rResId)
@@ -462,7 +462,7 @@ class SmSymDefineDialog : public ModalDialog
 
     void            InitColor_Impl();
 
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
 public:
     SmSymDefineDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr, bool bFreeRes = true);
@@ -471,7 +471,7 @@ public:
     using OutputDevice::SetFont;
 
     // Dialog
-    virtual short   Execute();
+    virtual short   Execute() SAL_OVERRIDE;
 
     bool SelectOldSymbolSet(const OUString &rSymbolSetName)
     {
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 1fa846711276..b5d9e2b280ce 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -114,13 +114,13 @@ class SmDocShell : public SfxObjectShell, public SfxListener
 
 
     virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType,
-                        const SfxHint& rHint, const TypeId& rHintType);
+                        const SfxHint& rHint, const TypeId& rHintType) SAL_OVERRIDE;
 
     bool        WriteAsMathType3( SfxMedium& );
 
     virtual void        Draw(OutputDevice *pDevice,
                              const JobSetup & rSetup,
-                             sal_uInt16 nAspect = ASPECT_CONTENT);
+                             sal_uInt16 nAspect = ASPECT_CONTENT) SAL_OVERRIDE;
 
     virtual void        FillClass(SvGlobalName* pClassName,
                                   sal_uInt32*  pFormat,
@@ -128,18 +128,18 @@ class SmDocShell : public SfxObjectShell, public SfxListener
                                   OUString* pFullTypeName,
                                   OUString* pShortTypeName,
                                   sal_Int32 nFileFormat,
-                                  bool bTemplate = false ) const;
+                                  bool bTemplate = false ) const SAL_OVERRIDE;
 
     virtual sal_Bool        SetData( const OUString& rData );
-    virtual sal_uLong       GetMiscStatus() const;
-    virtual void        OnDocumentPrinterChanged( Printer * );
-    virtual bool        InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
-    virtual bool        Load( SfxMedium& rMedium );
+    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;
             void        ImplSave(  SvStorageStreamRef xStrm  );
-    virtual bool        Save();
-    virtual bool        SaveAs( SfxMedium& rMedium );
-    virtual bool        ConvertTo( SfxMedium &rMedium );
-    virtual bool        SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+    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;
 
     Printer             *GetPrt();
     OutputDevice*       GetRefDev();
@@ -147,7 +147,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener
     bool                IsFormulaArranged() const { return bIsFormulaArranged; }
     void                SetFormulaArranged(bool bVal) { bIsFormulaArranged = bVal; }
 
-    virtual bool        ConvertFrom(SfxMedium &rMedium);
+    virtual bool        ConvertFrom(SfxMedium &rMedium) SAL_OVERRIDE;
 
     /** Called whenever the formula is changed
      * Deletes the current cursor
@@ -207,15 +207,15 @@ public:
 
     void        Repaint();
 
-    virtual     ::svl::IUndoManager *GetUndoManager ();
+    virtual     ::svl::IUndoManager *GetUndoManager () SAL_OVERRIDE;
 
     virtual     SfxItemPool& GetPool() const;
 
     void        Execute( SfxRequest& rReq );
     void        GetState(SfxItemSet &);
 
-    virtual void SetVisArea (const Rectangle & rVisArea);
-    virtual void SetModified(bool bModified);
+    virtual void SetVisArea (const Rectangle & rVisArea) SAL_OVERRIDE;
+    virtual void SetModified(bool bModified) SAL_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 4d684da98314..e2c14d63ad37 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -60,21 +60,21 @@ class SmEditWindow : public Window, public DropTargetHelper
                     aCursorMoveTimer;
     ESelection      aOldSelection;
 
-    virtual void KeyInput(const KeyEvent& rKEvt);
-    virtual void Command(const CommandEvent& rCEvt);
+    virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
+    virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE;
     DECL_LINK(MenuSelectHdl, Menu *);
     DECL_LINK(ModifyTimerHdl, Timer *);
     DECL_LINK(CursorMoveTimerHdl, Timer *);
 
-    virtual void DataChanged( const DataChangedEvent& );
-    virtual void Resize();
-    virtual void MouseMove(const MouseEvent &rEvt);
-    virtual void MouseButtonUp(const MouseEvent &rEvt);
-    virtual void MouseButtonDown(const MouseEvent &rEvt);
+    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 sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
-    virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt );
-    virtual void Paint(const Rectangle& rRect);
+    virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE;
+    virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
+    virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE;
 
     DECL_LINK(EditStatusHdl ,EditStatus *);
     DECL_LINK(ScrollHdl, ScrollBar *);
@@ -98,10 +98,10 @@ public:
     SfxItemPool *   GetEditEngineItemPool();
 
     // Window
-    virtual void        SetText(const OUString &rText);
-    virtual OUString    GetText() const;
-    virtual void        GetFocus();
-    virtual void        LoseFocus();
+    virtual void        SetText(const OUString &rText) SAL_OVERRIDE;
+    virtual OUString    GetText() const SAL_OVERRIDE;
+    virtual void        GetFocus() SAL_OVERRIDE;
+    virtual void        LoseFocus() SAL_OVERRIDE;
 
     ESelection          GetSelection() const;
     void                SetSelection(const ESelection &rSel);
@@ -131,7 +131,7 @@ public:
     void                StartCursorMove();
 
     // for Accessibility
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
 
     using Window::GetAccessible;
     SmEditAccessible *   GetAccessible()  { return pAccessible; }
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index cd3180fdb2f8..a10aa92b027d 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -313,19 +313,19 @@ public:
             SmStructureNode( const SmStructureNode &rNode );
     virtual ~SmStructureNode();
 
-    virtual bool        IsVisible() const;
+    virtual bool        IsVisible() const SAL_OVERRIDE;
 
-    virtual sal_uInt16      GetNumSubNodes() const;
+    virtual sal_uInt16      GetNumSubNodes() const SAL_OVERRIDE;
             void        SetNumSubNodes(sal_uInt16 nSize) { aSubNodes.resize(nSize); }
 
     using   SmNode::GetSubNode;
-    virtual SmNode *    GetSubNode(sal_uInt16 nIndex);
+    virtual SmNode *    GetSubNode(sal_uInt16 nIndex) SAL_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;
+    virtual void  GetAccessibleText( OUStringBuffer &rText ) const SAL_OVERRIDE;
 
     void SetSubNode(size_t nIndex, SmNode* pNode)
     {
@@ -360,10 +360,10 @@ protected:
 
 public:
 
-    virtual bool        IsVisible() const;
-    virtual sal_uInt16      GetNumSubNodes() const;
+    virtual bool        IsVisible() const SAL_OVERRIDE;
+    virtual sal_uInt16      GetNumSubNodes() const SAL_OVERRIDE;
     using   SmNode::GetSubNode;
-    virtual SmNode *    GetSubNode(sal_uInt16 nIndex);
+    virtual SmNode *    GetSubNode(sal_uInt16 nIndex) SAL_OVERRIDE;
 };
 
 
@@ -379,7 +379,7 @@ protected:
 
 public:
 
-    virtual void  GetAccessibleText( OUStringBuffer &rText ) const;
+    virtual void  GetAccessibleText( OUStringBuffer &rText ) const SAL_OVERRIDE;
 };
 
 
@@ -398,13 +398,13 @@ public:
     :   SmGraphicNode(NRECTANGLE, rNodeToken)
     {}
 
-    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth);
-    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight);
+    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth) SAL_OVERRIDE;
+    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) SAL_OVERRIDE;
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
 
-    void CreateTextFromNode(OUString &rText);
-    void Accept(SmVisitor* pVisitor);
+    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -427,12 +427,12 @@ public:
     Size         GetToSize() const { return aToSize; }
     Polygon     &GetPolygon() { return aPoly; }
 
-    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth);
-    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight);
+    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth) SAL_OVERRIDE;
+    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) SAL_OVERRIDE;
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
 
-    void Accept(SmVisitor* pVisitor);
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -487,12 +487,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);
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    virtual void CreateTextFromNode(OUString &rText);
+    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  GetAccessibleText( OUStringBuffer &rText ) const;
-    void Accept(SmVisitor* pVisitor);
+    virtual void  GetAccessibleText( OUStringBuffer &rText ) const SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_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.
@@ -520,10 +520,10 @@ protected:
 public:
     SmSpecialNode(const SmToken &rNodeToken);
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
+    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);
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -545,8 +545,8 @@ public:
     :   SmSpecialNode(NGLYPH_SPECIAL, rNodeToken, FNT_MATH)
     {}
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void Accept(SmVisitor* pVisitor);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -570,13 +570,13 @@ protected:
 public:
     SmMathSymbolNode(const SmToken &rNodeToken);
 
-    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth);
-    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight);
+    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth) SAL_OVERRIDE;
+    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) SAL_OVERRIDE;
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void CreateTextFromNode(OUString &rText);
-    void Accept(SmVisitor* pVisitor);
+    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;
 };
 
 
@@ -612,10 +612,10 @@ public:
     {}
 
     sal_uLong GetBodyWidth() const {return nBodyWidth;};
-    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nHeight);
-    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight);
+    virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nHeight) SAL_OVERRIDE;
+    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) SAL_OVERRIDE;
 
-    void Accept(SmVisitor* pVisitor);
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -636,9 +636,9 @@ public:
     :   SmMathSymbolNode(NDYNINTSYMBOL, rNodeToken)
     {}
 
-    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight);
+    virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight) SAL_OVERRIDE;
 
-    void Accept(SmVisitor* pVisitor);
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -659,9 +659,9 @@ public:
     }
     SmPlaceNode() : SmMathSymbolNode(NPLACE, SmToken(TPLACE, MS_PLACE, "<?>")) {};
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void Accept(SmVisitor* pVisitor);
+    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;
 };
 
 
@@ -681,9 +681,9 @@ public:
         SetText(OUString(MS_ERROR));
     }
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void Accept(SmVisitor* pVisitor);
+    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;
 };
 
 
@@ -705,12 +705,12 @@ public:
     {}
 
     using   SmNode::GetLeftMost;
-    virtual SmNode * GetLeftMost();
+    virtual SmNode * GetLeftMost() SAL_OVERRIDE;
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    virtual long GetFormulaBaseline() const;
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    virtual long GetFormulaBaseline() const SAL_OVERRIDE;
 
-    void Accept(SmVisitor* pVisitor);
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -742,9 +742,9 @@ public:
     void  SetUseExtraSpaces(bool bVal) { bUseExtraSpaces = bVal; }
     bool  IsUseExtraSpaces() const { return bUseExtraSpaces; };
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void Accept(SmVisitor* pVisitor);
+    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;
 };
 
 
@@ -763,9 +763,9 @@ public:
     :   SmLineNode(NEXPRESSION, rNodeToken)
     {}
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void CreateTextFromNode(OUString &rText);
-    void Accept(SmVisitor* pVisitor);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -784,8 +784,8 @@ public:
         SetNumSubNodes(2);
     }
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void Accept(SmVisitor* pVisitor);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -816,9 +816,9 @@ public:
         SetNumSubNodes(3);
     }
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void CreateTextFromNode(OUString &rText);
-    void Accept(SmVisitor* pVisitor);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 
     SmNode* Argument();
     const SmNode* Argument() const;
@@ -850,9 +850,9 @@ public:
         SetNumSubNodes(2);
     }
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void CreateTextFromNode(OUString &rText);
-    void Accept(SmVisitor* pVisitor);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 
     SmDynIntegralSymbolNode* Symbol();
     const SmDynIntegralSymbolNode* Symbol() const;
@@ -883,8 +883,8 @@ public:
         SetNumSubNodes(3);
     }
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void Accept(SmVisitor* pVisitor);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 
     SmMathSymbolNode* Symbol();
     const SmMathSymbolNode* Symbol() const;
@@ -919,11 +919,11 @@ public:
     }
 
     using   SmNode::GetLeftMost;
-    virtual SmNode * GetLeftMost();
+    virtual SmNode * GetLeftMost() SAL_OVERRIDE;
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void CreateTextFromNode(OUString &rText);
-    void Accept(SmVisitor* pVisitor);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -952,8 +952,8 @@ public:
     bool    IsAscending() const { return bAscending; }
     void    SetAscending(bool bVal)  { bAscending = bVal; }
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void Accept(SmVisitor* pVisitor);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -1033,9 +1033,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);
-    void CreateTextFromNode(OUString &rText);
-    void Accept(SmVisitor* pVisitor);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 
 };
 
@@ -1071,9 +1071,9 @@ public:
     SmMathSymbolNode* ClosingBrace();
     const SmMathSymbolNode* ClosingBrace() const;
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void CreateTextFromNode(OUString &rText);
-    void Accept(SmVisitor* pVisitor);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -1095,9 +1095,9 @@ class SmBracebodyNode : public SmStructureNode
 public:
     inline SmBracebodyNode(const SmToken &rNodeToken);
 
-    virtual void    Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
+    virtual void    Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
     long            GetBodyHeight() const { return nBodyHeight; }
-    void Accept(SmVisitor* pVisitor);
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -1134,8 +1134,8 @@ public:
     SmNode* Script();
     const SmNode* Script() const;
 
-    virtual void    Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void Accept(SmVisitor* pVisitor);
+    virtual void    Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -1176,8 +1176,8 @@ public:
 
     long CalcSymbolHeight(const SmNode &rSymbol, const SmFormat &rFormat) const;
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void Accept(SmVisitor* pVisitor);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -1192,8 +1192,8 @@ public:
     :   SmStructureNode(NALIGN, rNodeToken)
     {}
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void Accept(SmVisitor* pVisitor);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -1216,9 +1216,9 @@ public:
     :   SmStructureNode(NATTRIBUT, rNodeToken)
     {}
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void CreateTextFromNode(OUString &rText);
-    void Accept(SmVisitor* pVisitor);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 
     SmNode* Attribute();
     const SmNode* Attribute() const;
@@ -1250,10 +1250,10 @@ public:
     const Fraction & GetSizeParameter() const {return aFontSize;}
     const sal_uInt16& GetSizeType() const {return nSizeType;}
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void CreateTextFromNode(OUString &rText);
-    void Accept(SmVisitor* pVisitor);
+    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;
 };
 
 
@@ -1281,11 +1281,11 @@ public:
     void SetRowCol(sal_uInt16 nMatrixRows, sal_uInt16 nMatrixCols);
 
     using   SmNode::GetLeftMost;
-    virtual SmNode * GetLeftMost();
+    virtual SmNode * GetLeftMost() SAL_OVERRIDE;
 
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void CreateTextFromNode(OUString &rText);
-    void Accept(SmVisitor* pVisitor);
+    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat) SAL_OVERRIDE;
+    void CreateTextFromNode(OUString &rText) SAL_OVERRIDE;
+    void Accept(SmVisitor* pVisitor) SAL_OVERRIDE;
 };
 
 
@@ -1311,9 +1311,9 @@ public:
     sal_uInt16       GetBlankNum() const { return nNum; }
     void         SetBlankNum(sal_uInt16 nNumber) { nNum = nNumber; }
 
-    virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
-    virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
-    void Accept(SmVisitor* pVisitor);
+    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;
 };
 
 
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index c2e4ee9e044f..aa3540602650 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -106,7 +106,7 @@ public:
     SmModule(SfxObjectFactory* pObjFact);
     virtual ~SmModule();
 
-    virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
+    virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE;
 
     svtools::ColorConfig &  GetColorConfig();
 
@@ -132,9 +132,9 @@ public:
     }
 
     //virtual methods for options dialog
-    virtual SfxItemSet*  CreateItemSet( sal_uInt16 nId );
-    virtual void         ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
-    virtual SfxTabPage*  CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet );
+    virtual SfxItemSet*  CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE;
+    virtual void         ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual SfxTabPage*  CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 
 #define SM_MOD() ( *(SmModule**) GetAppData(SHL_SM) )
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 6dd282e44c9a..fa37df046b2b 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -125,7 +125,7 @@ private:
     bool                m_bModified;
 
     virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType,
-                        const SfxHint& rHint, const TypeId& rHintType);
+                        const SfxHint& rHint, const TypeId& rHintType) SAL_OVERRIDE;
 
 public:
     SmSymbolManager();
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index c4d7a6142533..e3d5e6290ed2 100644
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -39,8 +39,8 @@ protected:
     ImageList  *aImageLists [NUM_TBX_CATEGORIES + 1];   /* regular */
     sal_uInt16      nActiveCategoryRID;
 
-    virtual bool    Close();
-    virtual void    GetFocus();
+    virtual bool    Close() SAL_OVERRIDE;
+    virtual void    GetFocus() SAL_OVERRIDE;
 
     void            ApplyImageLists( sal_uInt16 nCategoryRID );
 
@@ -57,8 +57,8 @@ public:
     ~SmToolBoxWindow();
 
     // Window
-    virtual void    StateChanged( StateChangedType nStateChange );
-    virtual void    DataChanged( const DataChangedEvent &rEvt );
+    virtual void    StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
+    virtual void    DataChanged( const DataChangedEvent &rEvt ) SAL_OVERRIDE;
 
     void        AdjustPosSize( bool bSetPos );
     void        SetCategory(sal_uInt16 nCategory);
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index 04ad1fefefd7..d9b95025b5b0 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -59,44 +59,44 @@ class SmModel : public SfxBaseModel,
     SmPrintUIOptions* m_pPrintUIOptions;
 protected:
     virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE;
     virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue )
-        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException );
+        throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_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);
-    virtual void SAL_CALL acquire(  ) throw();
-    virtual void SAL_CALL release(  ) throw();
+    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;
 
     //XTypeProvider
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_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);
+    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;
 
     //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);
-    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);
-    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);
+    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;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception );
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    virtual OUString SAL_CALL getImplementationName(void) 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(void) throw( ::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 );
+    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;
 
     // oox::FormulaExportBase
-    virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer, oox::core::OoxmlVersion version );
-    virtual void writeFormulaRtf(OStringBuffer& rBuffer, rtl_TextEncoding nEncoding);
+    virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer, oox::core::OoxmlVersion version ) SAL_OVERRIDE;
+    virtual void writeFormulaRtf(OStringBuffer& rBuffer, rtl_TextEncoding nEncoding) SAL_OVERRIDE;
     // oox::FormulaImportBase
-    virtual void readFormulaOoxml( oox::formulaimport::XmlStream& stream );
-    virtual Size getFormulaSize() const;
+    virtual void readFormulaOoxml( oox::formulaimport::XmlStream& stream ) SAL_OVERRIDE;
+    virtual Size getFormulaSize() const SAL_OVERRIDE;
 
     static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static();
     static OUString getImplementationName_Static();
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index f1ecd57b5e20..5323576f2055 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -161,10 +161,10 @@ public:
 
     SmFontPickListBox& operator = (const SmFontPickList& rList);
 
-    virtual void    Insert(const Font &rFont);
+    virtual void    Insert(const Font &rFont) SAL_OVERRIDE;
     using   Window::Update;
-    virtual void    Update(const Font &rFont, const Font &rNewFont);
-    virtual void    Remove(const Font &rFont);
+    virtual void    Update(const Font &rFont, const Font &rNewFont) SAL_OVERRIDE;
+    virtual void    Remove(const Font &rFont) SAL_OVERRIDE;
 };
 
 #endif
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index a26cd239356e..63c9d85818be 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -74,11 +74,11 @@ private:
 protected:
     void        SetFormulaDrawPos(const Point &rPos) { aFormulaDrawPos = rPos; }
 
-    virtual void DataChanged( const DataChangedEvent& );
-    virtual void Paint(const Rectangle&);
-    virtual void KeyInput(const KeyEvent& rKEvt);
-    virtual void Command(const CommandEvent& rCEvt);
-    virtual void StateChanged( StateChangedType eChanged );
+    virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE;
+    virtual void Paint(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;
     DECL_LINK(MenuSelectHdl, Menu *);
 
 private:
@@ -92,10 +92,10 @@ public:
     ~SmGraphicWindow();
 
     // Window
-    virtual void    MouseButtonDown(const MouseEvent &rMEvt);
-    virtual void    MouseMove(const MouseEvent &rMEvt);
-    virtual void    GetFocus();
-    virtual void    LoseFocus();
+    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;
 
     SmViewShell *   GetView()   { return pViewShell; }
 
@@ -113,7 +113,7 @@ public:
     void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
 
     // for Accessibility
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
 
     using   Window::GetAccessible;
     SmGraphicAccessible *   GetAccessible_Impl()  { return pAccessible; }
@@ -129,7 +129,7 @@ public:
     SmGraphicController(SmGraphicWindow &, sal_uInt16, SfxBindings & );
     virtual void StateChanged(sal_uInt16             nSID,
                               SfxItemState       eState,
-                              const SfxPoolItem* pState);
+                              const SfxPoolItem* pState) SAL_OVERRIDE;
 };
 
 /**************************************************************************/
@@ -147,7 +147,7 @@ public:
 
     virtual void StateChanged(sal_uInt16             nSID,
                               SfxItemState       eState,
-                              const SfxPoolItem* pState);
+                              const SfxPoolItem* pState) SAL_OVERRIDE;
 };
 
 /**************************************************************************/
@@ -165,16 +165,16 @@ class SmCmdBoxWindow : public SfxDockingWindow
 protected :
 
     // Window
-    virtual void    GetFocus();
-    virtual void Resize();
-    virtual void Paint(const Rectangle& rRect);
-    virtual void StateChanged( StateChangedType nStateChange );
+    virtual void    GetFocus() SAL_OVERRIDE;
+    virtual void Resize() SAL_OVERRIDE;
+    virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE;
+    virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
 
-    virtual Size CalcDockingSize(SfxChildAlignment eAlign);
+    virtual Size CalcDockingSize(SfxChildAlignment eAlign) SAL_OVERRIDE;
     virtual SfxChildAlignment CheckAlignment(SfxChildAlignment eActual,
-                                             SfxChildAlignment eWish);
+                                             SfxChildAlignment eWish) SAL_OVERRIDE;
 
-    virtual void    ToggleFloatingMode();
+    virtual void    ToggleFloatingMode() SAL_OVERRIDE;
 
 public:
     SmCmdBoxWindow(SfxBindings    *pBindings,
@@ -233,7 +233,7 @@ class SmViewShell: public SfxViewShell
     bool                bPasteState;
 
     DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
-    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_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
@@ -256,23 +256,23 @@ protected:
                   sal_uInt16        MaxWidth);
 
     virtual sal_uInt16 Print(SfxProgress &rProgress, sal_Bool bIsAPI);
-    virtual SfxPrinter *GetPrinter(bool bCreate = false);
+    virtual SfxPrinter *GetPrinter(bool bCreate = false) SAL_OVERRIDE;
     virtual sal_uInt16 SetPrinter(SfxPrinter *pNewPrinter,
-                              sal_uInt16     nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false);
+                              sal_uInt16     nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false) SAL_OVERRIDE;
 
     void Insert( SfxMedium& rMedium );
     void InsertFrom(SfxMedium &rMedium);
 
-    virtual bool HasPrintOptionsPage() const;
+    virtual bool HasPrintOptionsPage() const SAL_OVERRIDE;
     virtual SfxTabPage *CreatePrintOptionsPage(Window           *pParent,
-                                               const SfxItemSet &rOptions);
-    virtual void Deactivate(bool IsMDIActivate);
-    virtual void Activate(bool IsMDIActivate);
-    virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize);
-    virtual void InnerResizePixel(const Point &rOfs, const Size  &rSize);
-    virtual void OuterResizePixel(const Point &rOfs, const Size  &rSize);
-    virtual void QueryObjAreaPixel( Rectangle& rRect ) const;
-    virtual void SetZoomFactor( const Fraction &rX, const Fraction &rY );
+                                               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;
 
 public:
     TYPEINFO_OVERRIDE();
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index 7c4dcf7b6d50..f06b6b385ca3 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -58,35 +58,35 @@ class SmVisitorTest : public SmVisitor
 {
 public:
     virtual ~SmVisitorTest() {}
-    void Visit( SmTableNode* pNode );
-    void Visit( SmBraceNode* pNode );
-    void Visit( SmBracebodyNode* pNode );
-    void Visit( SmOperNode* pNode );
-    void Visit( SmAlignNode* pNode );
-    void Visit( SmAttributNode* pNode );
-    void Visit( SmFontNode* pNode );
-    void Visit( SmUnHorNode* pNode );
-    void Visit( SmBinHorNode* pNode );
-    void Visit( SmBinVerNode* pNode );
-    void Visit( SmBinDiagonalNode* pNode );
-    void Visit( SmSubSupNode* pNode );
-    void Visit( SmMatrixNode* pNode );
-    void Visit( SmPlaceNode* pNode );
-    void Visit( SmTextNode* pNode );
-    void Visit( SmSpecialNode* pNode );
-    void Visit( SmGlyphSpecialNode* pNode );
-    void Visit( SmMathSymbolNode* pNode );
-    void Visit( SmBlankNode* pNode );
-    void Visit( SmErrorNode* pNode );
-    void Visit( SmLineNode* pNode );
-    void Visit( SmExpressionNode* pNode );
-    void Visit( SmPolyLineNode* pNode );
-    void Visit( SmRootNode* pNode );
-    void Visit( SmRootSymbolNode* pNode );
-    void Visit( SmDynIntegralNode* pNode );
-    void Visit( SmDynIntegralSymbolNode* pNode );
-    void Visit( SmRectangleNode* pNode );
-    void Visit( SmVerticalBraceNode* pNode );
+    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;
 private:
     /** Auxiliary method for visiting the children of a pNode */
     void VisitChildren( SmNode* pNode );
@@ -103,35 +103,35 @@ private:
 class SmDefaultingVisitor : public SmVisitor
 {
 public:
-    void Visit( SmTableNode* pNode );
-    void Visit( SmBraceNode* pNode );
-    void Visit( SmBracebodyNode* pNode );
-    void Visit( SmOperNode* pNode );
-    void Visit( SmAlignNode* pNode );
-    void Visit( SmAttributNode* pNode );
-    void Visit( SmFontNode* pNode );
-    void Visit( SmUnHorNode* pNode );
-    void Visit( SmBinHorNode* pNode );
-    void Visit( SmBinVerNode* pNode );
-    void Visit( SmBinDiagonalNode* pNode );
-    void Visit( SmSubSupNode* pNode );
-    void Visit( SmMatrixNode* pNode );
-    void Visit( SmPlaceNode* pNode );
-    void Visit( SmTextNode* pNode );
-    void Visit( SmSpecialNode* pNode );
-    void Visit( SmGlyphSpecialNode* pNode );
-    void Visit( SmMathSymbolNode* pNode );
-    void Visit( SmBlankNode* pNode );
-    void Visit( SmErrorNode* pNode );
-    void Visit( SmLineNode* pNode );
-    void Visit( SmExpressionNode* pNode );
-    void Visit( SmPolyLineNode* pNode );
-    void Visit( SmRootNode* pNode );
-    void Visit( SmRootSymbolNode* pNode );
-    void Visit( SmDynIntegralNode* pNode );
-    void Visit( SmDynIntegralSymbolNode* pNode );
-    void Visit( SmRectangleNode* pNode );
-    void Visit( SmVerticalBraceNode* pNode );
+    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;
 protected:
     ~SmDefaultingVisitor() {}
 
@@ -148,7 +148,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 );
+    void Visit( SmTextNode* pNode ) SAL_OVERRIDE;
     using SmDefaultingVisitor::Visit;
 private:
     OutputDevice &rDev;
@@ -158,7 +158,7 @@ private:
     bool isCaretVisible;
 protected:
     /** Default method for drawing pNodes */
-    void DefaultVisit( SmNode* pNode );
+    void DefaultVisit( SmNode* pNode ) SAL_OVERRIDE;
 };
 
 // SmCaretPos2LineVisitor
@@ -176,7 +176,7 @@ public:
         pos.pSelectedNode->Accept( this );
     }
     virtual ~SmCaretPos2LineVisitor() {}
-    void Visit( SmTextNode* pNode );
+    void Visit( SmTextNode* pNode ) SAL_OVERRIDE;
     using SmDefaultingVisitor::Visit;
     SmCaretLine GetResult( ){
         return line;
@@ -187,7 +187,7 @@ private:
     SmCaretPos pos;
 protected:
     /** Default method for computing lines for pNodes */
-    void DefaultVisit( SmNode* pNode );
+    void DefaultVisit( SmNode* pNode ) SAL_OVERRIDE;
 };
 
 // SmDrawingVisitor
@@ -208,35 +208,35 @@ public:
         pTree->Accept( this );
     }
     virtual ~SmDrawingVisitor() {}
-    void Visit( SmTableNode* pNode );
-    void Visit( SmBraceNode* pNode );
-    void Visit( SmBracebodyNode* pNode );
-    void Visit( SmOperNode* pNode );
-    void Visit( SmAlignNode* pNode );
-    void Visit( SmAttributNode* pNode );
-    void Visit( SmFontNode* pNode );
-    void Visit( SmUnHorNode* pNode );
-    void Visit( SmBinHorNode* pNode );
-    void Visit( SmBinVerNode* pNode );
-    void Visit( SmBinDiagonalNode* pNode );
-    void Visit( SmSubSupNode* pNode );
-    void Visit( SmMatrixNode* pNode );
-    void Visit( SmPlaceNode* pNode );
-    void Visit( SmTextNode* pNode );
-    void Visit( SmSpecialNode* pNode );
-    void Visit( SmGlyphSpecialNode* pNode );
-    void Visit( SmMathSymbolNode* pNode );
-    void Visit( SmBlankNode* pNode );
-    void Visit( SmErrorNode* pNode );
-    void Visit( SmLineNode* pNode );
-    void Visit( SmExpressionNode* pNode );
-    void Visit( SmPolyLineNode* pNode );
-    void Visit( SmRootNode* pNode );
-    void Visit( SmRootSymbolNode* pNode );
-    void Visit( SmDynIntegralNode* pNode );
-    void Visit( SmDynIntegralSymbolNode* pNode );
-    void Visit( SmRectangleNode* pNode );
-    void Visit( SmVerticalBraceNode* pNode );
+    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;
 private:
     /** Draw the children of a pNode
      * This the default method, use by most pNodes
@@ -267,13 +267,13 @@ class SmSetSelectionVisitor : public SmDefaultingVisitor
 public:
     SmSetSelectionVisitor( SmCaretPos startPos, SmCaretPos endPos, SmNode* pNode);
     virtual ~SmSetSelectionVisitor() {}
-    void Visit( SmBinHorNode* pNode );
-    void Visit( SmUnHorNode* pNode );
-    void Visit( SmFontNode* pNode );
-    void Visit( SmTextNode* pNode );
-    void Visit( SmExpressionNode* pNode );
-    void Visit( SmLineNode* pNode );
-    void Visit( SmAlignNode* pNode );
+    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;
     using SmDefaultingVisitor::Visit;
     /** Set IsSelected on all pNodes of pSubTree */
     static void SetSelectedOnAll( SmNode* pSubTree, bool IsSelected = true );
@@ -284,7 +284,7 @@ private:
      * Also note that pNodes such as SmBinVerNode cannot be selected, don't this method for
      * it.
      */
-    void DefaultVisit( SmNode* pNode );
+    void DefaultVisit( SmNode* pNode ) SAL_OVERRIDE;
     void VisitCompositionNode( SmNode* pNode );
     /** Caret position where the selection starts */
     SmCaretPos  StartPos;
@@ -327,35 +327,35 @@ public:
     /** Builds a caret position graph for pRootNode */
     SmCaretPosGraphBuildingVisitor( SmNode* pRootNode );
     virtual ~SmCaretPosGraphBuildingVisitor();
-    void Visit( SmTableNode* pNode );
-    void Visit( SmBraceNode* pNode );
-    void Visit( SmBracebodyNode* pNode );
-    void Visit( SmOperNode* pNode );
-    void Visit( SmAlignNode* pNode );
-    void Visit( SmAttributNode* pNode );
-    void Visit( SmFontNode* pNode );
-    void Visit( SmUnHorNode* pNode );
-    void Visit( SmBinHorNode* pNode );
-    void Visit( SmBinVerNode* pNode );
-    void Visit( SmBinDiagonalNode* pNode );
-    void Visit( SmSubSupNode* pNode );
-    void Visit( SmMatrixNode* pNode );
-    void Visit( SmPlaceNode* pNode );
-    void Visit( SmTextNode* pNode );
-    void Visit( SmSpecialNode* pNode );
-    void Visit( SmGlyphSpecialNode* pNode );
-    void Visit( SmMathSymbolNode* pNode );
-    void Visit( SmBlankNode* pNode );
-    void Visit( SmErrorNode* pNode );
-    void Visit( SmLineNode* pNode );
-    void Visit( SmExpressionNode* pNode );
-    void Visit( SmPolyLineNode* pNode );
-    void Visit( SmRootNode* pNode );
-    void Visit( SmRootSymbolNode* pNode );
-    void Visit( SmDynIntegralNode* pNode );
-    void Visit( SmDynIntegralSymbolNode* pNode );
-    void Visit( SmRectangleNode* pNode );
-    void Visit( SmVerticalBraceNode* pNode );
+    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;
     SmCaretPosGraph* takeGraph()
     {
         SmCaretPosGraph *pRet = pGraph;
@@ -378,35 +378,35 @@ class SmCloningVisitor : public SmVisitor
 public:
     SmCloningVisitor( ){ pResult = NULL; }
     virtual ~SmCloningVisitor() {}
-    void Visit( SmTableNode* pNode );
-    void Visit( SmBraceNode* pNode );
-    void Visit( SmBracebodyNode* pNode );
-    void Visit( SmOperNode* pNode );
-    void Visit( SmAlignNode* pNode );
-    void Visit( SmAttributNode* pNode );
-    void Visit( SmFontNode* pNode );
-    void Visit( SmUnHorNode* pNode );
-    void Visit( SmBinHorNode* pNode );
-    void Visit( SmBinVerNode* pNode );
-    void Visit( SmBinDiagonalNode* pNode );
-    void Visit( SmSubSupNode* pNode );
-    void Visit( SmMatrixNode* pNode );
-    void Visit( SmPlaceNode* pNode );
-    void Visit( SmTextNode* pNode );
-    void Visit( SmSpecialNode* pNode );
-    void Visit( SmGlyphSpecialNode* pNode );
-    void Visit( SmMathSymbolNode* pNode );
-    void Visit( SmBlankNode* pNode );
-    void Visit( SmErrorNode* pNode );
-    void Visit( SmLineNode* pNode );
-    void Visit( SmExpressionNode* pNode );
-    void Visit( SmPolyLineNode* pNode );
-    void Visit( SmRootNode* pNode );
-    void Visit( SmRootSymbolNode* pNode );
-    void Visit( SmDynIntegralNode* pNode );
-    void Visit( SmDynIntegralSymbolNode* pNode );
-    void Visit( SmRectangleNode* pNode );
-    void Visit( SmVerticalBraceNode* pNode );
+    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;
     /** Clone a pNode */
     SmNode* Clone( SmNode* pNode );
 private:
@@ -426,7 +426,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 );
+    void Visit( SmTextNode* pNode ) SAL_OVERRIDE;
     using SmDefaultingVisitor::Visit;
 private:
     /** Reference to drawing device */
@@ -438,7 +438,7 @@ private:
     /** Extend the area that must be selected  */
     void ExtendSelectionArea( Rectangle aArea );
     /** Default visiting method */
-    void DefaultVisit( SmNode* pNode );
+    void DefaultVisit( SmNode* pNode ) SAL_OVERRIDE;
     /** Visit the children of a given pNode */
     void VisitChildren( SmNode* pNode );
 };
@@ -452,35 +452,35 @@ public:
     SmNodeToTextVisitor( SmNode* pNode, OUString &rText );
     virtual ~SmNodeToTextVisitor() {}
 
-    void Visit( SmTableNode* pNode );
-    void Visit( SmBraceNode* pNode );
-    void Visit( SmBracebodyNode* pNode );
-    void Visit( SmOperNode* pNode );
-    void Visit( SmAlignNode* pNode );
-    void Visit( SmAttributNode* pNode );
-    void Visit( SmFontNode* pNode );
-    void Visit( SmUnHorNode* pNode );
-    void Visit( SmBinHorNode* pNode );
-    void Visit( SmBinVerNode* pNode );
-    void Visit( SmBinDiagonalNode* pNode );
-    void Visit( SmSubSupNode* pNode );
-    void Visit( SmMatrixNode* pNode );
-    void Visit( SmPlaceNode* pNode );
-    void Visit( SmTextNode* pNode );
-    void Visit( SmSpecialNode* pNode );
-    void Visit( SmGlyphSpecialNode* pNode );
-    void Visit( SmMathSymbolNode* pNode );
-    void Visit( SmBlankNode* pNode );
-    void Visit( SmErrorNode* pNode );
-    void Visit( SmLineNode* pNode );
-    void Visit( SmExpressionNode* pNode );
-    void Visit( SmPolyLineNode* pNode );
-    void Visit( SmRootNode* pNode );
-    void Visit( SmRootSymbolNode* pNode );
-    void Visit( SmDynIntegralNode* pNode );
-    void Visit( SmDynIntegralSymbolNode* pNode );
-    void Visit( SmRectangleNode* pNode );
-    void Visit( SmVerticalBraceNode* pNode );
+    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;
 private:
     /** Extract text from a pNode that constitues a line */
     void LineToText( SmNode* pNode ) {