Split TYPEINFO into plain and TYPEINFO_OVERRIDE

...where the latter contains SAL_OVERRIDE annotations

Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1

40 files changed, 149 insertions, 149 deletions

diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index 86301c85c590..2a32681d8453 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -44,7 +44,7 @@ private:
     bool FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const OUString& rAreaName );
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     ScAreaLink( SfxObjectShell* pShell, const OUString& rFile,
                     const OUString& rFilter, const OUString& rOpt,
                     const OUString& rArea, const ScRange& rDest, sal_uLong nRefresh );
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 30230c0da358..ac9c2006f4dc 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -50,7 +50,7 @@ class SC_DLLPUBLIC ScMergeAttr: public SfxPoolItem
     SCsCOL      nColMerge;
     SCsROW      nRowMerge;
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScMergeAttr();
                 ScMergeAttr( SCsCOL nCol, SCsROW nRow = 0);
                 ScMergeAttr( const ScMergeAttr& );
@@ -101,7 +101,7 @@ class SC_DLLPUBLIC ScProtectionAttr: public SfxPoolItem
     bool        bHideCell;      ///< hide cell
     bool        bHidePrint;     ///< don't print cell
 public:
-                            TYPEINFO();
+                            TYPEINFO_OVERRIDE();
                             ScProtectionAttr();
                             ScProtectionAttr(   bool bProtect,
                                                 bool bHFormula = false,
@@ -152,7 +152,7 @@ public:
 class ScRangeItem : public SfxPoolItem
 {
 public:
-            TYPEINFO();
+            TYPEINFO_OVERRIDE();
 
             inline  ScRangeItem( const sal_uInt16 nWhich );
             inline  ScRangeItem( const sal_uInt16   nWhich,
@@ -209,7 +209,7 @@ inline ScRangeItem& ScRangeItem::operator=( const ScRangeItem &rCpy )
 class ScTableListItem : public SfxPoolItem
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     inline  ScTableListItem( const sal_uInt16 nWhich );
             ScTableListItem( const ScTableListItem& rCpy );
@@ -248,7 +248,7 @@ class SC_DLLPUBLIC ScPageHFItem : public SfxPoolItem
     EditTextObject* pRightArea;
 
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScPageHFItem( sal_uInt16 nWhich );
                 ScPageHFItem( const ScPageHFItem& rItem );
                 ~ScPageHFItem();
@@ -279,7 +279,7 @@ public:
 class SC_DLLPUBLIC ScViewObjectModeItem: public SfxEnumItem
 {
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
 
                 ScViewObjectModeItem( sal_uInt16 nWhich );
                 ScViewObjectModeItem( sal_uInt16 nWhich, ScVObjMode eMode );
@@ -302,7 +302,7 @@ public:
 class ScDoubleItem : public SfxPoolItem
 {
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScDoubleItem( sal_uInt16 nWhich, double nVal=0 );
                 ScDoubleItem( const ScDoubleItem& rItem );
                 ~ScDoubleItem();
@@ -330,7 +330,7 @@ const sal_uInt8 SC_MID_PAGE_SCALETO_HEIGHT   = 2;
 class SC_DLLPUBLIC ScPageScaleToItem : public SfxPoolItem
 {
 public:
-                                TYPEINFO();
+                                TYPEINFO_OVERRIDE();
 
     /** Default c'tor sets the width and height to 0. */
     explicit                    ScPageScaleToItem();
@@ -369,7 +369,7 @@ private:
 class ScCondFormatItem : public SfxPoolItem
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     explicit ScCondFormatItem();
     explicit ScCondFormatItem(const std::vector<sal_uInt32>& nIndex);
diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx
index b328becc244a..e988f694f517 100644
--- a/sc/inc/brdcst.hxx
+++ b/sc/inc/brdcst.hxx
@@ -32,7 +32,7 @@ class ScHint : public SfxSimpleHint
     ScAddress   aAddress;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     ScHint( sal_uLong n, const ScAddress& a );
     const ScAddress&    GetAddress() const { return aAddress; }
           ScAddress&    GetAddress()       { return aAddress; }
@@ -44,7 +44,7 @@ class ScAreaChangedHint : public SfxHint
 private:
     ScRange aNewRange;
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScAreaChangedHint(const ScRange& rRange) : aNewRange(rRange) {}
     const ScRange&  GetRange() const { return aNewRange; }
 };
diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx
index 6c52db9f950d..5e1902a3a22e 100644
--- a/sc/inc/defaultsoptions.hxx
+++ b/sc/inc/defaultsoptions.hxx
@@ -45,7 +45,7 @@ public:
 class SC_DLLPUBLIC ScTpDefaultsItem : public SfxPoolItem
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     ScTpDefaultsItem( sal_uInt16 nWhich,
                    const ScDefaultsOptions& rOpt );
     ScTpDefaultsItem( const ScTpDefaultsItem& rItem );
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 0406de07ea8c..87f45595564b 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -145,7 +145,7 @@ inline bool ScDocOptions::operator!=( const ScDocOptions& rOpt ) const
 class SC_DLLPUBLIC ScTpCalcItem : public SfxPoolItem
 {
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScTpCalcItem( sal_uInt16 nWhich,
                               const ScDocOptions& rOpt );
                 ScTpCalcItem( const ScTpCalcItem& rItem );
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 456fc8897f77..d127bf7e3f93 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -40,7 +40,7 @@ class ScTabDeletedHint : public SfxHint
 private:
     SCTAB   nTab;
 public:
-            TYPEINFO();
+            TYPEINFO_OVERRIDE();
             ScTabDeletedHint( SCTAB nTabNo = SCTAB_MAX );
     virtual ~ScTabDeletedHint();
 
@@ -52,7 +52,7 @@ class ScTabSizeChangedHint : public SfxHint
 private:
     SCTAB   nTab;
 public:
-            TYPEINFO();
+            TYPEINFO_OVERRIDE();
             ScTabSizeChangedHint( SCTAB nTabNo = SCTAB_MAX );
     virtual ~ScTabSizeChangedHint();
 
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index cd9597c73f39..e0af1b663c89 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -81,7 +81,7 @@ public:
 class SC_DLLPUBLIC ScTpFormulaItem : public SfxPoolItem
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     ScTpFormulaItem( sal_uInt16 nWhich,
                    const ScFormulaOptions& rOpt );
     ScTpFormulaItem( const ScTpFormulaItem& rItem );
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index 79e6d4455dec..5829a410d428 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -33,7 +33,7 @@ class ScPaintHint : public SfxHint
     ScPaintHint(); // disabled
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScPaintHint( const ScRange& rRng, sal_uInt16 nPaint = PAINT_ALL );
                     ~ScPaintHint();
 
@@ -59,7 +59,7 @@ class ScUpdateRefHint : public SfxHint
     SCsTAB          nDz;
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
 
                     ScUpdateRefHint( UpdateRefMode eMode, const ScRange& rR,
                                         SCsCOL nX, SCsROW nY, SCsTAB nZ );
@@ -79,7 +79,7 @@ class ScPointerChangedHint : public SfxHint
     sal_uInt16          nFlags;
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
 
                     ~ScPointerChangedHint();
 
@@ -105,7 +105,7 @@ class ScLinkRefreshedHint : public SfxHint
                             //! also use source data for area links?
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScLinkRefreshedHint();
                     ~ScLinkRefreshedHint();
 
@@ -132,7 +132,7 @@ class ScAutoStyleHint : public SfxHint
     sal_uLong   nTimeout;
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScAutoStyleHint( const ScRange& rR, const OUString& rSt1,
                                         sal_uLong nT, const OUString& rSt2 );
                     ~ScAutoStyleHint();
@@ -148,7 +148,7 @@ class ScDBRangeRefreshedHint : public SfxHint
     ScImportParam   aParam;
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScDBRangeRefreshedHint( const ScImportParam& rP );
                     ~ScDBRangeRefreshedHint();
 
@@ -160,7 +160,7 @@ class ScDataPilotModifiedHint : public SfxHint
     OUString        maName;
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScDataPilotModifiedHint( const OUString& rName );
                     ~ScDataPilotModifiedHint();
 
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index af15c42ff84a..ad27a9e229eb 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -55,7 +55,7 @@ public:
 class SC_DLLPUBLIC ScTpPrintItem : public SfxPoolItem
 {
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScTpPrintItem( sal_uInt16 nWhich,
                                const ScPrintOptions& rOpt );
                 ScTpPrintItem( const ScTpPrintItem& rItem );
diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx
index 20fba2695c30..87a855ddda84 100644
--- a/sc/inc/stlsheet.hxx
+++ b/sc/inc/stlsheet.hxx
@@ -43,7 +43,7 @@ private:
     mutable ScStyleSheet::Usage eUsage;
 
 public:
-                        TYPEINFO();
+                        TYPEINFO_OVERRIDE();
 
                         ScStyleSheet( const ScStyleSheet& rStyle );
 
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index 71ff0acb3f79..4d0b3f5ed49c 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -42,7 +42,7 @@ private:
     bool bDoPaint:1;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     ScTableLink( ScDocShell* pDocSh, const OUString& rFile,
                     const OUString& rFilter, const OUString& rOpt, sal_uLong nRefresh );
     ScTableLink( SfxObjectShell* pShell, const OUString& rFile,
diff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxx
index bd5d5f41c98f..dab538fc5f93 100644
--- a/sc/inc/unoreflist.hxx
+++ b/sc/inc/unoreflist.hxx
@@ -63,7 +63,7 @@ class ScUnoRefUndoHint : public SfxHint
     ScUnoRefEntry   aEntry;
 
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScUnoRefUndoHint( const ScUnoRefEntry& rRefEntry );
                 ~ScUnoRefUndoHint();
 
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 7ebb3b624dac..e6b6c6dc3f4a 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -115,7 +115,7 @@ private:
 class SC_DLLPUBLIC ScTpViewItem : public SfxPoolItem
 {
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScTpViewItem( sal_uInt16 nWhich, const ScViewOptions& rOpt );
                 ScTpViewItem( const ScTpViewItem&  rItem );
                 ~ScTpViewItem();
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index 46072a47ce53..ea11846f5c22 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -47,7 +47,7 @@ static bool bIsInUpdate;
     ScMatrixRef     pResult;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
             ScDdeLink( ScDocument* pD,
                         const OUString& rA, const OUString& rT, const OUString& rI,
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
index 21637726bb77..efe7801e9f13 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
@@ -54,7 +54,7 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext
     bool    bContainsCenter;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     XMLTableHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
@@ -83,7 +83,7 @@ private:
         ::com::sun::star::text::XTextCursor > xOldTextCursor;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     XMLHeaderFooterRegionContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx
index bf452db576fb..17e63f20aa46 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -89,7 +89,7 @@ protected:
 
 public:
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     XMLTableStyleContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
@@ -200,7 +200,7 @@ protected:
     virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     ScXMLMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLName,
@@ -225,7 +225,7 @@ class ScMasterPageContext : public XMLTextMasterPageContext
     void ClearContent(const OUString& rContent);
 public:
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     ScMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx
index 5ece67334d1b..14483facb32a 100644
--- a/sc/source/ui/inc/AccessibilityHints.hxx
+++ b/sc/source/ui/inc/AccessibilityHints.hxx
@@ -39,7 +39,7 @@ class ScAccWinFocusLostHint : public SfxHint
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
                 xOldAccessible;
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScAccWinFocusLostHint(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xOld );
                 ~ScAccWinFocusLostHint();
@@ -53,7 +53,7 @@ class ScAccWinFocusGotHint : public SfxHint
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
                 xNewAccessible;
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScAccWinFocusGotHint(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xNew );
                 ~ScAccWinFocusGotHint();
@@ -66,7 +66,7 @@ class ScAccGridWinFocusLostHint : public ScAccWinFocusLostHint
 {
     ScSplitPos  eOldGridWin;
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScAccGridWinFocusLostHint( ScSplitPos eOldGridWin,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xOld );
                 ~ScAccGridWinFocusLostHint();
@@ -78,7 +78,7 @@ class ScAccGridWinFocusGotHint : public ScAccWinFocusGotHint
 {
     ScSplitPos  eNewGridWin;
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScAccGridWinFocusGotHint( ScSplitPos eNewGridWin,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xNew );
                 ~ScAccGridWinFocusGotHint();
diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx
index a24c937dfe30..edb82bb00737 100644
--- a/sc/source/ui/inc/auditsh.hxx
+++ b/sc/source/ui/inc/auditsh.hxx
@@ -34,7 +34,7 @@ private:
     sal_uInt16      nFunction;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_AUDITING_SHELL)
 
                     ScAuditingShell(ScViewData* pData);
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index 7b5fbaedc397..bcfbed18f174 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -68,7 +68,7 @@ private:
 
 public:
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_CELL_SHELL)
 
                 ScCellShell(ScViewData* pData);
diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx
index 9a3719af1a96..947e616fb330 100644
--- a/sc/source/ui/inc/chartsh.hxx
+++ b/sc/source/ui/inc/chartsh.hxx
@@ -32,7 +32,7 @@ class ScChartShell: public ScDrawShell
 {
 public:
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_CHART_SHELL)
 
                 ScChartShell(ScViewData* pData);
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 8fd82092b8ff..88f2ffaec494 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -171,7 +171,7 @@ protected:
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
 
                     SFX_DECL_INTERFACE(SCID_DOC_SHELL)
                     SFX_DECL_OBJECTFACTORY();
diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index 7e5ede5fce22..fba5dc0377b9 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -48,7 +48,7 @@ protected:
     ScViewData* GetViewData()   { return pViewData; }
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_DRAW_SHELL)
 
                     ScDrawShell(ScViewData* pData);
diff --git a/sc/source/ui/inc/drformsh.hxx b/sc/source/ui/inc/drformsh.hxx
index ba72981621b3..599906d3e3d4 100644
--- a/sc/source/ui/inc/drformsh.hxx
+++ b/sc/source/ui/inc/drformsh.hxx
@@ -34,7 +34,7 @@ class ScDrawFormShell: public ScDrawShell
 {
 public:
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_FORM_SHELL)
 
                 ScDrawFormShell(ScViewData* pData);
diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx
index 2fbc1a05e61a..b7c7d272b74f 100644
--- a/sc/source/ui/inc/drtxtob.hxx
+++ b/sc/source/ui/inc/drtxtob.hxx
@@ -41,7 +41,7 @@ class ScDrawTextObjectBar : public SfxShell
     DECL_LINK( ClipboardChanged, TransferableDataHelper* );
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_DRAW_TEXT_SHELL)
 
         ScDrawTextObjectBar(ScViewData* pData);
diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx
index 69cf69e82488..f0b3384230d5 100644
--- a/sc/source/ui/inc/editsh.hxx
+++ b/sc/source/ui/inc/editsh.hxx
@@ -49,7 +49,7 @@ private:
     DECL_LINK( ClipboardChanged, TransferableDataHelper* );
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_EDIT_SHELL)
 
                     ScEditShell(EditView* pView, ScViewData* pData);
diff --git a/sc/source/ui/inc/formatsh.hxx b/sc/source/ui/inc/formatsh.hxx
index 975e2ad63597..13b004fdfb15 100644
--- a/sc/source/ui/inc/formatsh.hxx
+++ b/sc/source/ui/inc/formatsh.hxx
@@ -38,7 +38,7 @@ protected:
 
 public:
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_FORMAT_SHELL)
 
                 ScFormatShell(ScViewData* pData);
diff --git a/sc/source/ui/inc/graphsh.hxx b/sc/source/ui/inc/graphsh.hxx
index 31d2d35bcffe..a00b24e80fcb 100644
--- a/sc/source/ui/inc/graphsh.hxx
+++ b/sc/source/ui/inc/graphsh.hxx
@@ -33,7 +33,7 @@ class ScGraphicShell: public ScDrawShell
 {
 public:
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_GRAPHIC_SHELL)
 
                 ScGraphicShell(ScViewData* pData);
diff --git a/sc/source/ui/inc/mediash.hxx b/sc/source/ui/inc/mediash.hxx
index e389b600c997..eb329256403b 100644
--- a/sc/source/ui/inc/mediash.hxx
+++ b/sc/source/ui/inc/mediash.hxx
@@ -33,7 +33,7 @@ class ScMediaShell: public ScDrawShell
 {
 public:
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_MEDIA_SHELL)
 
                 ScMediaShell(ScViewData* pData);
diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx
index 2de3f6882549..f82e5621dd59 100644
--- a/sc/source/ui/inc/oleobjsh.hxx
+++ b/sc/source/ui/inc/oleobjsh.hxx
@@ -33,7 +33,7 @@ class ScOleObjectShell: public ScDrawShell
 {
 public:
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_OLEOBJECT_SHELL)
 
                 ScOleObjectShell(ScViewData* pData);
diff --git a/sc/source/ui/inc/pgbrksh.hxx b/sc/source/ui/inc/pgbrksh.hxx
index 1b04614861bb..bccfe08e25cf 100644
--- a/sc/source/ui/inc/pgbrksh.hxx
+++ b/sc/source/ui/inc/pgbrksh.hxx
@@ -30,7 +30,7 @@ class ScTabViewShell;
 class ScPageBreakShell : public SfxShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_PAGEBREAK_SHELL)
 
                     ScPageBreakShell( ScTabViewShell* pView );
diff --git a/sc/source/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx
index 059b356e0dd9..4662611db293 100644
--- a/sc/source/ui/inc/pivotsh.hxx
+++ b/sc/source/ui/inc/pivotsh.hxx
@@ -31,7 +31,7 @@ class ScDPObject;
 class ScPivotShell : public SfxShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SCID_PIVOT_SHELL)
 
                     ScPivotShell( ScTabViewShell* pView );
diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxx
index 54ec1c683ea1..7d128d07fd99 100644
--- a/sc/source/ui/inc/target.hxx
+++ b/sc/source/ui/inc/target.hxx
@@ -30,7 +30,7 @@ private:
     ScTabViewShell* pViewShell;
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
 
                     ScTabViewTarget( ScTabViewShell* pShell ) : pViewShell( pShell ) {}
     virtual         ~ScTabViewTarget();
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index 19a045cd787d..3573df0ce437 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.hxx
@@ -54,7 +54,7 @@ class ScInputStatusItem : public SfxPoolItem
     const std::vector<editeng::MisspellRanges>* mpMisspellRanges;
 
 public:
-                            TYPEINFO();
+                            TYPEINFO_OVERRIDE();
 
                             ScInputStatusItem( sal_uInt16 nWhich,
                                                const ScAddress& rCurPos,
@@ -104,7 +104,7 @@ class ScTablesHint : public SfxHint
     SCTAB nTab2;
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScTablesHint(sal_uInt16 nNewId, SCTAB nTable1, SCTAB nTable2=0);
                     ~ScTablesHint();
 
@@ -119,7 +119,7 @@ class ScEditViewHint : public SfxHint
     ScAddress                   aCursorPos;
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScEditViewHint( ScEditEngineDefaulter* pEngine, const ScAddress& rCurPos );
                     ~ScEditViewHint();
 
@@ -138,7 +138,7 @@ class ScIndexHint : public SfxHint
     sal_uInt16 nIndex;
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScIndexHint(sal_uInt16 nNewId, sal_uInt16 nIdx);
                     ~ScIndexHint();
 
@@ -152,7 +152,7 @@ public:
 class SC_DLLPUBLIC ScSortItem : public SfxPoolItem
 {
 public:
-                            TYPEINFO();
+                            TYPEINFO_OVERRIDE();
                             ScSortItem( sal_uInt16              nWhich,
                                         ScViewData*         ptrViewData,
                                         const ScSortParam*  pSortData );
@@ -179,7 +179,7 @@ private:
 class SC_DLLPUBLIC ScQueryItem : public SfxPoolItem
 {
 public:
-                            TYPEINFO();
+                            TYPEINFO_OVERRIDE();
                             ScQueryItem( sal_uInt16                 nWhich,
                                          ScViewData*            ptrViewData,
                                          const ScQueryParam*    pQueryData );
@@ -210,7 +210,7 @@ private:
 class SC_DLLPUBLIC ScSubTotalItem : public SfxPoolItem
 {
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScSubTotalItem( sal_uInt16                  nWhich,
                                 ScViewData*             ptrViewData,
                                 const ScSubTotalParam*  pSubTotalData );
@@ -237,7 +237,7 @@ private:
 class SC_DLLPUBLIC ScUserListItem : public SfxPoolItem
 {
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScUserListItem( sal_uInt16 nWhich );
                 ScUserListItem( const ScUserListItem& rItem );
                 ~ScUserListItem();
@@ -258,7 +258,7 @@ private:
 class ScConsolidateItem : public SfxPoolItem
 {
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScConsolidateItem( sal_uInt16                    nWhich,
                                    const ScConsolidateParam* pParam );
                 ScConsolidateItem( const ScConsolidateItem& rItem );
@@ -279,7 +279,7 @@ private:
 class ScPivotItem : public SfxPoolItem
 {
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScPivotItem( sal_uInt16 nWhich, const ScDPSaveData* pData,
                              const ScRange* pRange, bool bNew );
                 ScPivotItem( const ScPivotItem& rItem );
@@ -304,7 +304,7 @@ private:
 class ScSolveItem : public SfxPoolItem
 {
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScSolveItem( sal_uInt16              nWhich,
                              const ScSolveParam* pParam );
                 ScSolveItem( const ScSolveItem& rItem );
@@ -325,7 +325,7 @@ private:
 class ScTabOpItem : public SfxPoolItem
 {
 public:
-                TYPEINFO();
+                TYPEINFO_OVERRIDE();
                 ScTabOpItem( sal_uInt16              nWhich,
                              const ScTabOpParam* pParam );
                 ScTabOpItem( const ScTabOpItem& rItem );
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index b04784928643..8999631e06e7 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -38,7 +38,7 @@ class ScSimpleUndo: public SfxUndoAction
     ScSimpleUndo(const ScSimpleUndo&); // disabled
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScSimpleUndo( ScDocShell* pDocSh );
     virtual         ~ScSimpleUndo();
 
@@ -70,7 +70,7 @@ enum ScBlockUndoMode { SC_UNDO_SIMPLE, SC_UNDO_MANUALHEIGHT, SC_UNDO_AUTOHEIGHT
 class ScBlockUndo: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScBlockUndo( ScDocShell* pDocSh, const ScRange& rRange,
                                  ScBlockUndoMode eBlockMode );
     virtual         ~ScBlockUndo();
@@ -92,7 +92,7 @@ protected:
 class ScMultiBlockUndo: public ScSimpleUndo
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     ScMultiBlockUndo(ScDocShell* pDocSh, const ScRangeList& rRanges,
                      ScBlockUndoMode eBlockMode);
     virtual ~ScMultiBlockUndo();
@@ -123,7 +123,7 @@ protected:
     SdrUndoAction*  mpDrawUndo;
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal, SdrUndoAction* pDrawUndo = 0 );
     virtual         ~ScDBFuncUndo();
 
@@ -142,7 +142,7 @@ enum ScMoveUndoMode { SC_UNDO_REFFIRST, SC_UNDO_REFLAST };
 class ScMoveUndo: public ScSimpleUndo               // mit Referenzen
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScMoveUndo( ScDocShell* pDocSh,
                                 ScDocument* pRefDoc, ScRefUndoData* pRefData,
                                 ScMoveUndoMode eRefMode );
@@ -170,7 +170,7 @@ class ScUndoWrapper: public SfxUndoAction           // for manual merging of act
     SfxUndoAction*  pWrappedUndo;
 
 public:
-                            TYPEINFO();
+                            TYPEINFO_OVERRIDE();
                             ScUndoWrapper( SfxUndoAction* pUndo );
     virtual                 ~ScUndoWrapper();
 
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 520e2f974696..59b81b87ab95 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -46,7 +46,7 @@ class ScEditDataArray;
 class ScUndoInsertCells: public ScMoveUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoInsertCells( ScDocShell* pNewDocShell,
                                        const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios,
                                        InsCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData,
@@ -80,7 +80,7 @@ private:
 class ScUndoDeleteCells: public ScMoveUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoDeleteCells( ScDocShell* pNewDocShell,
                                        const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios,
                                        DelCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData );
@@ -110,7 +110,7 @@ private:
 class ScUndoDeleteMulti: public ScMoveUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
 
     ScUndoDeleteMulti( ScDocShell* pNewDocShell,
                        bool bNewRows, bool bNeedsRefresh, SCTAB nNewTab,
@@ -142,7 +142,7 @@ private:
 class ScUndoCut: public ScBlockUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoCut( ScDocShell* pNewDocShell,
                                ScRange aRange,              // adjusted for merged cells
                                ScAddress aOldEnd,           // end position without adjustment
@@ -189,7 +189,7 @@ struct ScUndoPasteOptions
 class ScUndoPaste: public ScMultiBlockUndo
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     ScUndoPaste(ScDocShell* pNewDocShell, const ScRangeList& rRanges,
                 const ScMarkData& rMark,
                 ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
@@ -226,7 +226,7 @@ private:
 class ScUndoDragDrop: public ScMoveUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoDragDrop( ScDocShell* pNewDocShell,
                                     const ScRange& rRange, ScAddress aNewDestPos, bool bNewCut,
                                     ScDocument* pUndoDocument, ScRefUndoData* pRefData,
@@ -261,7 +261,7 @@ private:
 class ScUndoDeleteContents: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoDeleteContents( ScDocShell* pNewDocShell,
                                           const ScMarkData& rMark,
                                           const ScRange& rRange,
@@ -294,7 +294,7 @@ private:
 class ScUndoFillTable: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoFillTable( ScDocShell* pNewDocShell,
                                      const ScMarkData& rMark,
                                      SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
@@ -331,7 +331,7 @@ private:
 class ScUndoSelectionAttr: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoSelectionAttr( ScDocShell* pNewDocShell,
                                          const ScMarkData& rMark,
                                          SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
@@ -368,7 +368,7 @@ private:
 class ScUndoWidthOrHeight: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
                                          const ScMarkData& rMark,
                                          SCCOLROW nNewStart, SCTAB nNewStartTab,
@@ -406,7 +406,7 @@ private:
 class ScUndoAutoFill: public ScBlockUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoAutoFill( ScDocShell* pNewDocShell,
                                     const ScRange& rRange, const ScRange& rSourceArea,
                                     ScDocument* pNewUndoDoc, const ScMarkData& rMark,
@@ -442,7 +442,7 @@ private:
 class ScUndoMerge: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption,
                                  bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo);
     virtual         ~ScUndoMerge();
@@ -467,7 +467,7 @@ private:
 class ScUndoAutoFormat: public ScBlockUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoAutoFormat( ScDocShell* pNewDocShell,
                                       const ScRange& rRange, ScDocument* pNewUndoDoc,
                                       const ScMarkData& rMark,
@@ -492,7 +492,7 @@ private:
 class ScUndoReplace: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoReplace( ScDocShell* pNewDocShell,
                                    const ScMarkData& rMark,
                                    SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
@@ -523,7 +523,7 @@ private:
 class ScUndoTabOp: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoTabOp( ScDocShell* pNewDocShell,
                                  SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                                  SCCOL nEndX,   SCROW nEndY,   SCTAB nEndZ,
@@ -556,7 +556,7 @@ private:
 class ScUndoConversion : public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
 
                     ScUndoConversion( ScDocShell* pNewDocShell, const ScMarkData& rMark,
                                       SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScDocument* pNewUndoDoc,
@@ -588,7 +588,7 @@ private:
 class ScUndoRefConversion: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoRefConversion( ScDocShell* pNewDocShell,
                                          const ScRange& aMarkRange, const ScMarkData& rMark,
                                          ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, bool bNewMulti, sal_uInt16 nNewFlag);
@@ -618,7 +618,7 @@ private:
 class ScUndoListNames: public ScBlockUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoListNames( ScDocShell* pNewDocShell,
                                      const ScRange& rRange,
                                      ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc );
@@ -642,7 +642,7 @@ private:
 class ScUndoUseScenario: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoUseScenario( ScDocShell* pNewDocShell,
                                        const ScMarkData& rMark,
                                        const ScArea& rDestArea, ScDocument* pNewUndoDoc,
@@ -667,7 +667,7 @@ private:
 class ScUndoSelectionStyle: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoSelectionStyle( ScDocShell* pNewDocShell,
                                           const ScMarkData& rMark,
                                           const ScRange& rRange,
@@ -696,7 +696,7 @@ private:
 class ScUndoRefreshLink: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoRefreshLink( ScDocShell* pNewDocShell,
                                        ScDocument* pNewUndoDoc );
     virtual         ~ScUndoRefreshLink();
@@ -717,7 +717,7 @@ private:
 class ScUndoEnterMatrix: public ScBlockUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoEnterMatrix( ScDocShell* pNewDocShell,
                                        const ScRange& rArea,
                                        ScDocument* pNewUndoDoc,
@@ -744,7 +744,7 @@ private:
 class ScUndoInsertAreaLink : public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoInsertAreaLink( ScDocShell* pShell,
                                           const OUString& rDocName,
                                           const OUString& rFltName, const OUString& rOptions,
@@ -772,7 +772,7 @@ private:
 class ScUndoRemoveAreaLink : public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoRemoveAreaLink( ScDocShell* pShell,
                                           const OUString& rDocName,
                                           const OUString& rFltName, const OUString& rOptions,
@@ -800,7 +800,7 @@ private:
 class ScUndoUpdateAreaLink : public ScSimpleUndo        //! also change BlockUndo?
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoUpdateAreaLink( ScDocShell* pShell,
                                           const OUString& rOldD,
                                           const OUString& rOldF, const OUString& rOldO,
@@ -845,7 +845,7 @@ private:
 class ScUndoIndent: public ScBlockUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoIndent( ScDocShell* pNewDocShell, const ScMarkData& rMark,
                                     ScDocument* pNewUndoDoc, bool bIncrement );
     virtual         ~ScUndoIndent();
@@ -867,7 +867,7 @@ private:
 class ScUndoTransliterate: public ScBlockUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMarkData& rMark,
                                         ScDocument* pNewUndoDoc, sal_Int32 nType );
     virtual         ~ScUndoTransliterate();
@@ -889,7 +889,7 @@ private:
 class ScUndoClearItems: public ScBlockUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark,
                                         ScDocument* pNewUndoDoc, const sal_uInt16* pW );
     virtual         ~ScUndoClearItems();
@@ -911,7 +911,7 @@ private:
 class ScUndoRemoveBreaks: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoRemoveBreaks( ScDocShell* pNewDocShell,
                                     SCTAB nNewTab, ScDocument* pNewUndoDoc );
     virtual         ~ScUndoRemoveBreaks();
@@ -932,7 +932,7 @@ private:
 class ScUndoRemoveMerge: public ScBlockUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoRemoveMerge( ScDocShell* pNewDocShell,
                                        const ScCellMergeOption& rOption,
                                        ScDocument* pNewUndoDoc );
@@ -956,7 +956,7 @@ private:
 class ScUndoBorder: public ScBlockUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoBorder( ScDocShell* pNewDocShell,
                                     const ScRangeList& rRangeList,
                                     ScDocument* pNewUndoDoc,
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index 199eae3fd021..c9297b2f0259 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -46,7 +46,7 @@ class CellValues;
 class ScUndoCursorAttr: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoCursorAttr( ScDocShell* pNewDocShell,
                             SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
                             const ScPatternAttr* pOldPat, const ScPatternAttr* pNewPat,
@@ -83,7 +83,7 @@ private:
 class ScUndoEnterData: public ScSimpleUndo
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     struct Value
     {
@@ -126,7 +126,7 @@ private:
 class ScUndoEnterValue: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
     ScUndoEnterValue(
         ScDocShell* pNewDocShell, const ScAddress& rNewPos,
         const ScCellValue& rUndoCell, double nVal );
@@ -152,7 +152,7 @@ private:
 class ScUndoSetCell : public ScSimpleUndo
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     ScUndoSetCell( ScDocShell* pDocSh, const ScAddress& rPos, const ScCellValue& rOldVal, const ScCellValue& rNewVal );
 
     virtual ~ScUndoSetCell();
@@ -177,7 +177,7 @@ private:
 class ScUndoPageBreak: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoPageBreak( ScDocShell* pNewDocShell,
                             SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
                             bool bNewColumn, bool bNewInsert );
@@ -203,7 +203,7 @@ private:
 class ScUndoPrintZoom: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoPrintZoom( ScDocShell* pNewDocShell, SCTAB nT,
                                     sal_uInt16 nOS, sal_uInt16 nOP, sal_uInt16 nNS, sal_uInt16 nNP );
     virtual         ~ScUndoPrintZoom();
@@ -228,7 +228,7 @@ private:
 class ScUndoThesaurus: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
     ScUndoThesaurus( ScDocShell* pNewDocShell,
                      SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
                      const ScCellValue& rOldText, const ScCellValue& rNewText );
@@ -260,7 +260,7 @@ private:
 class ScUndoReplaceNote : public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
 
     /** Constructs an undo action for inserting or removing a cell note. */
                     ScUndoReplaceNote(
@@ -304,7 +304,7 @@ private:
 class ScUndoShowHideNote : public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoShowHideNote( ScDocShell& rDocShell, const ScAddress& rPos, bool bShow );
     virtual         ~ScUndoShowHideNote();
 
@@ -325,7 +325,7 @@ private:
 class ScUndoDetective: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoDetective( ScDocShell* pNewDocShell,
                                     SdrUndoAction* pDraw, const ScDetOpData* pOperation,
                                     ScDetOpList* pUndoList = NULL );
@@ -350,7 +350,7 @@ private:
 class ScUndoRangeNames: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     //use nTab = -1 for global range names
                     ScUndoRangeNames( ScDocShell* pNewDocShell,
                                         ScRangeName* pOld, ScRangeName* pNew , SCTAB nTab = -1);
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index 20c6ba836b0e..9d00e52fb534 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -45,7 +45,7 @@ class ScMarkData;
 class ScUndoDoOutline: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoDoOutline( ScDocShell* pNewDocShell,
                             SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab,
                             ScDocument* pNewUndoDoc, bool bNewColumns,
@@ -74,7 +74,7 @@ private:
 class ScUndoMakeOutline: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoMakeOutline( ScDocShell* pNewDocShell,
                             SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                             SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
@@ -101,7 +101,7 @@ private:
 class ScUndoOutlineLevel: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoOutlineLevel( ScDocShell* pNewDocShell,
                             SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab,
                             ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
@@ -129,7 +129,7 @@ private:
 class ScUndoOutlineBlock: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoOutlineBlock( ScDocShell* pNewDocShell,
                             SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                             SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
@@ -156,7 +156,7 @@ private:
 class ScUndoRemoveAllOutlines: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoRemoveAllOutlines( ScDocShell* pNewDocShell,
                             SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                             SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
@@ -181,7 +181,7 @@ private:
 class ScUndoAutoOutline: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoAutoOutline( ScDocShell* pNewDocShell,
                             SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                             SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
@@ -206,7 +206,7 @@ private:
 class ScUndoSubTotals: public ScDBFuncUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoSubTotals( ScDocShell* pNewDocShell, SCTAB nNewTab,
                             const ScSubTotalParam& rNewParam, SCROW nNewEndY,
                             ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
@@ -236,7 +236,7 @@ private:
 class ScUndoSort: public ScDBFuncUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoSort( ScDocShell* pNewDocShell, SCTAB nNewTab,
                             const ScSortParam& rParam,
                             ScDocument* pNewUndoDoc,
@@ -263,7 +263,7 @@ private:
 class ScUndoQuery: public ScDBFuncUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab,
                             const ScQueryParam& rParam, ScDocument* pNewUndoDoc,
                             ScDBCollection* pNewUndoDB, const ScRange* pOld,
@@ -300,7 +300,7 @@ private:
     void            DoChange( bool bUndo );
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoAutoFilter( ScDocShell* pNewDocShell, const ScRange& rRange,
                                       const OUString& rName, bool bSet );
     virtual         ~ScUndoAutoFilter();
@@ -317,7 +317,7 @@ public:
 class ScUndoDBData: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoDBData( ScDocShell* pNewDocShell,
                             ScDBCollection* pNewUndoColl, ScDBCollection* pNewRedoColl );
     virtual         ~ScUndoDBData();
@@ -338,7 +338,7 @@ private:
 class ScUndoImportData: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoImportData( ScDocShell* pNewDocShell, SCTAB nNewTab,
                             const ScImportParam& rParam, SCCOL nNewEndX, SCROW nNewEndY,
                             SCCOL nNewFormula,
@@ -370,7 +370,7 @@ private:
 class ScUndoRepeatDB: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoRepeatDB( ScDocShell* pNewDocShell, SCTAB nNewTab,
                             SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY,
                             SCROW nResultEndRow, SCCOL nCurX, SCROW nCurY,
@@ -404,7 +404,7 @@ private:
 class ScUndoDataPilot: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoDataPilot( ScDocShell* pNewDocShell,
                             ScDocument* pOldDoc, ScDocument* pNewDoc,
                             const ScDPObject* pOldObj, const ScDPObject* pNewObj,
@@ -430,7 +430,7 @@ private:
 class ScUndoConsolidate: public ScSimpleUndo
 {
 public:
-                        TYPEINFO();
+                        TYPEINFO_OVERRIDE();
                         ScUndoConsolidate( ScDocShell* pNewDocShell,
                                 const ScArea& rArea, const ScConsolidateParam& rPar,
                                 ScDocument* pNewUndoDoc, bool bReference,
@@ -459,7 +459,7 @@ private:
 class ScUndoChartData: public ScSimpleUndo
 {
 public:
-                        TYPEINFO();
+                        TYPEINFO_OVERRIDE();
                         ScUndoChartData( ScDocShell* pNewDocShell,
                                 const OUString& rName, const ScRange& rNew,
                                 bool bColHdr, bool bRowHdr, bool bAdd );
@@ -492,7 +492,7 @@ private:
 class ScUndoDataForm: public ScBlockUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoDataForm( ScDocShell* pNewDocShell,
                                 SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                                 SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx
index 4a1fab00c867..0630a0ac3597 100644
--- a/sc/source/ui/inc/undodraw.hxx
+++ b/sc/source/ui/inc/undodraw.hxx
@@ -32,7 +32,7 @@ class ScUndoDraw: public SfxUndoAction
     void            UpdateSubShell();
 
 public:
-                            TYPEINFO();
+                            TYPEINFO_OVERRIDE();
                             ScUndoDraw( SfxUndoAction* pUndo, ScDocShell* pDocSh );
     virtual                 ~ScUndoDraw();
 
diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx
index 34d00c043a51..86756c2b599f 100644
--- a/sc/source/ui/inc/undostyl.hxx
+++ b/sc/source/ui/inc/undostyl.hxx
@@ -60,7 +60,7 @@ private:
                                 const ScStyleSaveData& rData );
 
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoModifyStyle( ScDocShell* pDocSh,
                                         SfxStyleFamily eFam,
                                         const ScStyleSaveData& rOld,
@@ -78,7 +78,7 @@ public:
 class ScUndoApplyPageStyle: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoApplyPageStyle( ScDocShell* pDocSh, const OUString& rNewStyle );
     virtual         ~ScUndoApplyPageStyle();
 
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index e24f0d94e66a..5a465c642d8d 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -47,7 +47,7 @@ class ScMarkData;
 class ScUndoInsertTab : public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoInsertTab(
                             ScDocShell* pNewDocShell,
                             SCTAB nTabNum,
@@ -75,7 +75,7 @@ private:
 class ScUndoInsertTables : public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoInsertTables(
                             ScDocShell* pNewDocShell,
                             SCTAB nTabNum,
@@ -104,7 +104,7 @@ private:
 class ScUndoDeleteTab: public ScMoveUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoDeleteTab(
                             ScDocShell* pNewDocShell,
                             const std::vector<SCTAB> &theTabs,      //SCTAB nNewTab,
@@ -131,7 +131,7 @@ private:
 class ScUndoRenameTab: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoRenameTab(
                             ScDocShell* pNewDocShell,
                             SCTAB nT,
@@ -158,7 +158,7 @@ private:
 class ScUndoMoveTab: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoMoveTab(
                         ScDocShell* pNewDocShell,
                         ::std::vector<SCTAB>* pOldTabs,
@@ -188,7 +188,7 @@ private:
 class ScUndoCopyTab: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoCopyTab(
                         ScDocShell* pNewDocShell,
                         ::std::vector<SCTAB>* pOldTabs,
@@ -216,7 +216,7 @@ private:
 class ScUndoTabColor: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoTabColor(
                             ScDocShell* pNewDocShell,
                             SCTAB nT,
@@ -243,7 +243,7 @@ private:
 class ScUndoMakeScenario: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoMakeScenario(
                             ScDocShell* pNewDocShell,
                             SCTAB nSrc, SCTAB nDest,
@@ -274,7 +274,7 @@ private:
 class ScUndoImportTab : public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoImportTab(
                             ScDocShell* pShell,
                             SCTAB nNewTab, SCTAB nNewCount );
@@ -300,7 +300,7 @@ private:
 class ScUndoRemoveLink : public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoRemoveLink(               // Call before delete!
                             ScDocShell* pShell,
                             const OUString& rDoc );
@@ -330,7 +330,7 @@ private:
 class ScUndoShowHideTab : public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoShowHideTab(
                             ScDocShell* pShell,
                             const std::vector<SCTAB>& newUndoTabs,
@@ -411,7 +411,7 @@ private:
 class ScUndoPrintRange : public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab,
                                         ScPrintRangeSaver* pOld, ScPrintRangeSaver* pNew );
     virtual         ~ScUndoPrintRange();
@@ -435,7 +435,7 @@ private:
 class ScUndoScenarioFlags: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoScenarioFlags(
                             ScDocShell* pNewDocShell, SCTAB nT,
                             const OUString& rON, const OUString& rNN,
@@ -468,7 +468,7 @@ private:
 class ScUndoRenameObject: public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoRenameObject(
                             ScDocShell* pNewDocShell, const OUString& rPN,
                             const OUString& rON, const OUString& rNN );
@@ -494,7 +494,7 @@ private:
 class ScUndoLayoutRTL : public ScSimpleUndo
 {
 public:
-                    TYPEINFO();
+                    TYPEINFO_OVERRIDE();
                     ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, bool bNewRTL );
     virtual         ~ScUndoLayoutRTL();