Split TYPEINFO into plain and TYPEINFO_OVERRIDE

...where the latter contains SAL_OVERRIDE annotations

Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1

88 files changed, 98 insertions, 98 deletions

diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 191574cf6d7e..a9db2d1ec6e9 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -208,7 +208,7 @@ protected:
 
 public:
 
-                        TYPEINFO();
+                        TYPEINFO_OVERRIDE();
 
                         SdDrawDocument(DocumentType eType, SfxObjectShell* pDocSh);
                         ~SdDrawDocument();
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index 004827c0db64..3ccc8e925e9f 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -91,7 +91,7 @@ public:
 class DiaEffectItem : public SfxEnumItem
 {
 public:
-            TYPEINFO();
+            TYPEINFO_OVERRIDE();
             DiaEffectItem( ::com::sun::star::presentation::FadeEffect eFade = com::sun::star::presentation::FadeEffect_NONE );
             DiaEffectItem( SvStream& rIn );
 
@@ -106,7 +106,7 @@ public:
 class DiaSpeedItem : public SfxEnumItem
 {
 public:
-            TYPEINFO();
+            TYPEINFO_OVERRIDE();
             DiaSpeedItem( FadeSpeed = FADE_SPEED_MEDIUM );
             DiaSpeedItem( SvStream& rIn );
 
@@ -121,7 +121,7 @@ public:
 class DiaAutoItem : public SfxEnumItem
 {
 public:
-            TYPEINFO();
+            TYPEINFO_OVERRIDE();
             DiaAutoItem( PresChange = PRESCHANGE_MANUAL );
             DiaAutoItem( SvStream& rIn );
 
@@ -135,7 +135,7 @@ public:
 class DiaTimeItem : public SfxUInt32Item
 {
 public:
-            TYPEINFO();
+            TYPEINFO_OVERRIDE();
             DiaTimeItem( sal_uInt32 nValue = 0L );
 
     virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 477093cf8250..ca93858750b3 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -74,7 +74,7 @@ class SdModule : public SfxModule, public SfxListener
 {
 public:
 
-                            TYPEINFO();
+                            TYPEINFO_OVERRIDE();
                             SFX_DECL_INTERFACE(SD_IF_SDAPP)
                             DECL_LINK( CalcFieldValueHdl, EditFieldInfo* );
 
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index f10aef2752b1..1c895723d43e 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -154,7 +154,7 @@ protected:
     double mfTransitionDuration;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     SdPage(SdDrawDocument& rNewDoc, sal_Bool bMasterPage=sal_False);
     SdPage(const SdPage& rSrcPage);
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index 50fae9bd4212..02c874eb158f 100644
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
@@ -28,7 +28,7 @@ class SdDrawDocument;
 class SD_DLLPUBLIC SdUndoAction : public SfxUndoAction
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
                             SdUndoAction(SdDrawDocument* pSdDrawDocument)
                                 : mpDoc(pSdDrawDocument)  {}
     virtual                 ~SdUndoAction() {}
diff --git a/sd/source/ui/inc/BezierObjectBar.hxx b/sd/source/ui/inc/BezierObjectBar.hxx
index 7188f69d4c6d..11036a21f28a 100644
--- a/sd/source/ui/inc/BezierObjectBar.hxx
+++ b/sd/source/ui/inc/BezierObjectBar.hxx
@@ -33,7 +33,7 @@ class BezierObjectBar
     : public SfxShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SD_IF_SDDRAWBEZIEROBJECTBAR)
 
     BezierObjectBar (ViewShell* pSdViewShell, View* pSdView);
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index c8b22c8240ec..1dee67d7a967 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -49,7 +49,7 @@ class ViewShell;
 class SD_DLLPUBLIC DrawDocShell : public SfxObjectShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SD_IF_SDDRAWDOCSHELL)
     SFX_DECL_OBJECTFACTORY();
 
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 73414906a7ff..5e566773afb1 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -65,7 +65,7 @@ class DrawViewShell
 public:
     static const int SLOTARRAY_COUNT = 24;
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     SFX_DECL_INTERFACE(SD_IF_SDDRAWVIEWSHELL)
 
diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx
index 7c1a32e7e018..fc3c8602e51c 100644
--- a/sd/source/ui/inc/GraphicDocShell.hxx
+++ b/sd/source/ui/inc/GraphicDocShell.hxx
@@ -36,7 +36,7 @@ class GraphicDocShell
     : public DrawDocShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     SFX_DECL_INTERFACE(SD_IF_SDGRAPHICDOCSHELL)
     SFX_DECL_OBJECTFACTORY();
diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx
index a7e8b6303095..3f28c15c3e80 100644
--- a/sd/source/ui/inc/GraphicObjectBar.hxx
+++ b/sd/source/ui/inc/GraphicObjectBar.hxx
@@ -34,7 +34,7 @@ class GraphicObjectBar
     : public SfxShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE( SD_IF_SDDRAWGRAFOBJECTBAR )
 
     GraphicObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView);
diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx
index d1c4b7bddd89..59663647da2c 100644
--- a/sd/source/ui/inc/GraphicViewShell.hxx
+++ b/sd/source/ui/inc/GraphicViewShell.hxx
@@ -39,7 +39,7 @@ class GraphicViewShell
     : public DrawViewShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     SFX_DECL_VIEWFACTORY(GraphicViewShell);
     SFX_DECL_INTERFACE(SD_IF_SDGRAPHICVIEWSHELL)
diff --git a/sd/source/ui/inc/GraphicViewShellBase.hxx b/sd/source/ui/inc/GraphicViewShellBase.hxx
index db8e778dedf5..37d4ed0c58ec 100644
--- a/sd/source/ui/inc/GraphicViewShellBase.hxx
+++ b/sd/source/ui/inc/GraphicViewShellBase.hxx
@@ -32,7 +32,7 @@ class GraphicViewShellBase
     : public ViewShellBase
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_VIEWFACTORY(GraphicViewShellBase);
 
     /** This constructor is used by the view factory of the SFX
diff --git a/sd/source/ui/inc/ImpressViewShellBase.hxx b/sd/source/ui/inc/ImpressViewShellBase.hxx
index c094d7bf6ba2..0da157499116 100644
--- a/sd/source/ui/inc/ImpressViewShellBase.hxx
+++ b/sd/source/ui/inc/ImpressViewShellBase.hxx
@@ -32,7 +32,7 @@ class ImpressViewShellBase
     : public ViewShellBase
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_VIEWFACTORY(ImpressViewShellBase);
 
     /** This constructor is used by the view factory of the SFX
diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx
index 676d3f1785f7..863deb6f1cc1 100644
--- a/sd/source/ui/inc/MediaObjectBar.hxx
+++ b/sd/source/ui/inc/MediaObjectBar.hxx
@@ -34,7 +34,7 @@ class MediaObjectBar
     : public SfxShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE( SD_IF_SDDRAWMEDIAOBJECTBAR )
 
     MediaObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView);
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index bc813795121d..ee71f9899226 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -69,7 +69,7 @@ public:
     void ConnectToApplication (void);
     void DisconnectFromApplication (void);
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     SdrTextObj*     GetTitleTextObject(SdrPage* pPage);
     SdrTextObj*     GetOutlineTextObject(SdrPage* pPage);
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index deb9307a89cb..5611360bf1ef 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -36,7 +36,7 @@ class OutlineViewShell
     : public ViewShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     SFX_DECL_VIEWFACTORY(OutlineViewShell);
     SFX_DECL_INTERFACE(SD_IF_SDOUTLINEVIEWSHELL)
diff --git a/sd/source/ui/inc/OutlineViewShellBase.hxx b/sd/source/ui/inc/OutlineViewShellBase.hxx
index c02d8ad388c5..6dafd4d23394 100644
--- a/sd/source/ui/inc/OutlineViewShellBase.hxx
+++ b/sd/source/ui/inc/OutlineViewShellBase.hxx
@@ -32,7 +32,7 @@ class OutlineViewShellBase
     : public ImpressViewShellBase
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_VIEWFACTORY(OutlineViewShellBase);
 
     /** This constructor is used by the view factory of the SFX
diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx
index 00c81a5ee738..0dd1c55bcb4e 100644
--- a/sd/source/ui/inc/PaneShells.hxx
+++ b/sd/source/ui/inc/PaneShells.hxx
@@ -35,7 +35,7 @@ class LeftImpressPaneShell
     : public SfxShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SD_IF_SDLEFTIMPRESSPANESHELL)
 
     LeftImpressPaneShell (void);
@@ -52,7 +52,7 @@ class LeftDrawPaneShell
     : public SfxShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SD_IF_SDLEFTDRAWPANESHELL)
 
     LeftDrawPaneShell (void);
@@ -68,7 +68,7 @@ public:
 class ToolPanelPaneShell : public SfxShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE( SD_IF_SDTOOLPANELPANESHELL )
 
     ToolPanelPaneShell();
diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx
index f23f501716a0..887dbf30e5cb 100644
--- a/sd/source/ui/inc/PresentationViewShell.hxx
+++ b/sd/source/ui/inc/PresentationViewShell.hxx
@@ -30,7 +30,7 @@ namespace sd {
 class PresentationViewShell : public DrawViewShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     SFX_DECL_VIEWFACTORY(PresViewShell);
     SFX_DECL_INTERFACE( SD_IF_SDPRESVIEWSHELL )
diff --git a/sd/source/ui/inc/PresentationViewShellBase.hxx b/sd/source/ui/inc/PresentationViewShellBase.hxx
index 832e311f8948..0e74b4dade52 100644
--- a/sd/source/ui/inc/PresentationViewShellBase.hxx
+++ b/sd/source/ui/inc/PresentationViewShellBase.hxx
@@ -32,7 +32,7 @@ class PresentationViewShellBase
     : public ViewShellBase
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_VIEWFACTORY(PresentationViewShellBase);
 
     /** This constructor is used by the view factory of the SFX
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 6e212a243075..630ced0a6659 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -42,7 +42,7 @@ class SlideSorterViewShell
     friend class controller::SlotManager;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SD_IF_SDSLIDESORTERVIEWSHELL)
 
     static ::boost::shared_ptr<SlideSorterViewShell> Create(
diff --git a/sd/source/ui/inc/SlideSorterViewShellBase.hxx b/sd/source/ui/inc/SlideSorterViewShellBase.hxx
index 3e7f9c71854c..24b2173942c4 100644
--- a/sd/source/ui/inc/SlideSorterViewShellBase.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShellBase.hxx
@@ -32,7 +32,7 @@ class SlideSorterViewShellBase
     : public ImpressViewShellBase
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_VIEWFACTORY(SlideSorterViewShellBase);
 
     /** This constructor is used by the view factory of the SFX
diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx
index 6208cd8737a5..6d760dc195d9 100644
--- a/sd/source/ui/inc/TextObjectBar.hxx
+++ b/sd/source/ui/inc/TextObjectBar.hxx
@@ -36,7 +36,7 @@ class TextObjectBar
     : public SfxShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SD_IF_SDDRAWTEXTOBJECTBAR)
 
     TextObjectBar (
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index c270616eacce..ea916dcb0696 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -67,7 +67,7 @@ struct SdViewRedrawRec
 class View : public FmFormView
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     View (
         SdDrawDocument& rDrawDoc,
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 759bed49a220..16b823b537e1 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -112,7 +112,7 @@ public:
         = DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL
         | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT;
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     ViewShell (
         SfxViewFrame *pFrame,
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 231e5dadc89a..995b8d9fad87 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -62,7 +62,7 @@ class ViewShellBase
     : public SfxViewShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_VIEWFACTORY(ViewShellBase);
     SFX_DECL_INTERFACE(SD_IF_SDVIEWSHELLBASE)
 
diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx
index 303f00f90e0d..6a10b4d30afd 100644
--- a/sd/source/ui/inc/ViewShellHint.hxx
+++ b/sd/source/ui/inc/ViewShellHint.hxx
@@ -45,7 +45,7 @@ public:
         HINT_COMPLEX_MODEL_CHANGE_END
     };
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     ViewShellHint (HintId nHintId);
 
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx
index 06a41a69acf0..18e5854527e7 100644
--- a/sd/source/ui/inc/drawview.hxx
+++ b/sd/source/ui/inc/drawview.hxx
@@ -34,7 +34,7 @@ class DrawViewShell;
 class DrawView : public ::sd::View
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     DrawView (
         DrawDocShell* pDocSh,
diff --git a/sd/source/ui/inc/fuarea.hxx b/sd/source/ui/inc/fuarea.hxx
index f58c32498760..ad0cd278c21c 100644
--- a/sd/source/ui/inc/fuarea.hxx
+++ b/sd/source/ui/inc/fuarea.hxx
@@ -27,7 +27,7 @@ namespace sd {
 class FuArea : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
 
diff --git a/sd/source/ui/inc/fubullet.hxx b/sd/source/ui/inc/fubullet.hxx
index 221d62b5a3b2..1dd91c70dd59 100644
--- a/sd/source/ui/inc/fubullet.hxx
+++ b/sd/source/ui/inc/fubullet.hxx
@@ -32,7 +32,7 @@ class ViewShell;
 class FuBullet : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuchar.hxx b/sd/source/ui/inc/fuchar.hxx
index 87b9b248f897..20ffd3d9d202 100644
--- a/sd/source/ui/inc/fuchar.hxx
+++ b/sd/source/ui/inc/fuchar.hxx
@@ -28,7 +28,7 @@ class FuChar
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
 
diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx
index 61e70fbf7a81..9c0236e914ec 100644
--- a/sd/source/ui/inc/fucon3d.hxx
+++ b/sd/source/ui/inc/fucon3d.hxx
@@ -33,7 +33,7 @@ class FuConstruct3dObject
     : public FuConstruct
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx
index 6408c087880f..8ac7bb453b9c 100644
--- a/sd/source/ui/inc/fuconarc.hxx
+++ b/sd/source/ui/inc/fuconarc.hxx
@@ -29,7 +29,7 @@ class FuConstructArc
     : public FuConstruct
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx
index 7ea3968a4d9b..0b65ff874bb6 100644
--- a/sd/source/ui/inc/fuconbez.hxx
+++ b/sd/source/ui/inc/fuconbez.hxx
@@ -34,7 +34,7 @@ class FuConstructBezierPolygon
     : public FuConstruct
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx
index bbb7f9b097b0..c29cec57b251 100644
--- a/sd/source/ui/inc/fuconcs.hxx
+++ b/sd/source/ui/inc/fuconcs.hxx
@@ -32,7 +32,7 @@ class FuConstructCustomShape
     : public FuConstruct
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuconnct.hxx b/sd/source/ui/inc/fuconnct.hxx
index 14ebd54062ab..5eac44fd27c4 100644
--- a/sd/source/ui/inc/fuconnct.hxx
+++ b/sd/source/ui/inc/fuconnct.hxx
@@ -28,7 +28,7 @@ class FuConnectionDlg
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
 
diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx
index 3e0d96374fbb..1d553336f7d2 100644
--- a/sd/source/ui/inc/fuconrec.hxx
+++ b/sd/source/ui/inc/fuconrec.hxx
@@ -36,7 +36,7 @@ class FuConstructRectangle
     : public FuConstruct
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx
index 42164eea8065..88794cbd21ca 100644
--- a/sd/source/ui/inc/fuconstr.hxx
+++ b/sd/source/ui/inc/fuconstr.hxx
@@ -32,7 +32,7 @@ class FuConstruct
     : public FuDraw
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     virtual void DoExecute( SfxRequest& rReq );
 
diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx
index e972ef187f4e..49c0e56212d8 100644
--- a/sd/source/ui/inc/fuconuno.hxx
+++ b/sd/source/ui/inc/fuconuno.hxx
@@ -32,7 +32,7 @@ class FuConstructUnoControl
     : public FuConstruct
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fucopy.hxx b/sd/source/ui/inc/fucopy.hxx
index 8abb5fdcd462..46388a11574b 100644
--- a/sd/source/ui/inc/fucopy.hxx
+++ b/sd/source/ui/inc/fucopy.hxx
@@ -28,7 +28,7 @@ class FuCopy
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fucushow.hxx b/sd/source/ui/inc/fucushow.hxx
index 6e4189dc26ef..33b3b71b5da9 100644
--- a/sd/source/ui/inc/fucushow.hxx
+++ b/sd/source/ui/inc/fucushow.hxx
@@ -28,7 +28,7 @@ class FuCustomShowDlg
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx
index 9e42c8242173..1a3e6af03a39 100644
--- a/sd/source/ui/inc/fudraw.hxx
+++ b/sd/source/ui/inc/fudraw.hxx
@@ -35,7 +35,7 @@ class FuDraw
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
     virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx
index 76876d1a3dd6..c194b9501a7b 100644
--- a/sd/source/ui/inc/fudspord.hxx
+++ b/sd/source/ui/inc/fudspord.hxx
@@ -33,7 +33,7 @@ class FuDisplayOrder
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
 
diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx
index 5eddb0bfba44..666804e49d64 100644
--- a/sd/source/ui/inc/fuediglu.hxx
+++ b/sd/source/ui/inc/fuediglu.hxx
@@ -28,7 +28,7 @@ class FuEditGluePoints
     : public FuDraw
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuexpand.hxx b/sd/source/ui/inc/fuexpand.hxx
index aa565ea426d3..9eb997d8e791 100644
--- a/sd/source/ui/inc/fuexpand.hxx
+++ b/sd/source/ui/inc/fuexpand.hxx
@@ -28,7 +28,7 @@ class FuExpandPage
     : public FuPoor
 {
  public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx
index 1f5668d84bce..99a3e47e4cbd 100644
--- a/sd/source/ui/inc/fuformatpaintbrush.hxx
+++ b/sd/source/ui/inc/fuformatpaintbrush.hxx
@@ -33,7 +33,7 @@ class DrawViewShell;
 class FuFormatPaintBrush : public FuText
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
 
diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx
index 2faaefe4081a..6606f11f9e65 100644
--- a/sd/source/ui/inc/fuhhconv.hxx
+++ b/sd/source/ui/inc/fuhhconv.hxx
@@ -30,7 +30,7 @@ class Outliner;
 class FuHangulHanjaConversion : public FuPoor
 {
  public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
 
diff --git a/sd/source/ui/inc/fuinsert.hxx b/sd/source/ui/inc/fuinsert.hxx
index 200abc1107ea..2f6ca859397e 100644
--- a/sd/source/ui/inc/fuinsert.hxx
+++ b/sd/source/ui/inc/fuinsert.hxx
@@ -28,7 +28,7 @@ class FuInsertGraphic
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
@@ -50,7 +50,7 @@ class FuInsertClipboard
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
@@ -71,7 +71,7 @@ class FuInsertOLE
     : public FuPoor
 {
  public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
@@ -91,7 +91,7 @@ class FuInsertAVMedia
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx
index ea4caca71c98..4cb8a4bd8efa 100644
--- a/sd/source/ui/inc/fuinsfil.hxx
+++ b/sd/source/ui/inc/fuinsfil.hxx
@@ -32,7 +32,7 @@ class FuInsertFile
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuline.hxx b/sd/source/ui/inc/fuline.hxx
index cc195d5f01f8..5ef287cf3a52 100644
--- a/sd/source/ui/inc/fuline.hxx
+++ b/sd/source/ui/inc/fuline.hxx
@@ -28,7 +28,7 @@ class FuLine
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     virtual void Activate();
     virtual void Deactivate();
diff --git a/sd/source/ui/inc/fulinend.hxx b/sd/source/ui/inc/fulinend.hxx
index 5e16a2d376b2..c70de5d33664 100644
--- a/sd/source/ui/inc/fulinend.hxx
+++ b/sd/source/ui/inc/fulinend.hxx
@@ -28,7 +28,7 @@ class FuLineEnd
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     virtual void Activate();
     virtual void Deactivate();
diff --git a/sd/source/ui/inc/fulink.hxx b/sd/source/ui/inc/fulink.hxx
index 496704278f3b..ba787be323ce 100644
--- a/sd/source/ui/inc/fulink.hxx
+++ b/sd/source/ui/inc/fulink.hxx
@@ -28,7 +28,7 @@ class FuLink
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fumeasur.hxx b/sd/source/ui/inc/fumeasur.hxx
index 5ba670e41b8b..19f3c95fb7c2 100644
--- a/sd/source/ui/inc/fumeasur.hxx
+++ b/sd/source/ui/inc/fumeasur.hxx
@@ -28,7 +28,7 @@ class FuMeasureDlg
     : public FuPoor
 {
  public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx
index 1e4a812c7322..ca18eb2363b5 100644
--- a/sd/source/ui/inc/fumorph.hxx
+++ b/sd/source/ui/inc/fumorph.hxx
@@ -37,7 +37,7 @@ class FuMorph
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuoaprms.hxx b/sd/source/ui/inc/fuoaprms.hxx
index 870dc4b1a6d9..0f103156e50c 100644
--- a/sd/source/ui/inc/fuoaprms.hxx
+++ b/sd/source/ui/inc/fuoaprms.hxx
@@ -28,7 +28,7 @@ class FuObjectAnimationParameters
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx
index 253fec0718fc..8a607cfcfe34 100644
--- a/sd/source/ui/inc/fuolbull.hxx
+++ b/sd/source/ui/inc/fuolbull.hxx
@@ -40,7 +40,7 @@ class FuOutlineBullet
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx
index 7aea47b56ce1..5e5602128665 100644
--- a/sd/source/ui/inc/fuoltext.hxx
+++ b/sd/source/ui/inc/fuoltext.hxx
@@ -38,7 +38,7 @@ class FuOutlineText
     : public FuOutline
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
 
diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx
index 04eba0366d8f..87c937402241 100644
--- a/sd/source/ui/inc/fuoutl.hxx
+++ b/sd/source/ui/inc/fuoutl.hxx
@@ -41,7 +41,7 @@ class FuOutline
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     virtual sal_Bool Command(const CommandEvent& rCEvt);
 
diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx
index b4db714ff09c..13753cfb0a39 100644
--- a/sd/source/ui/inc/fupage.hxx
+++ b/sd/source/ui/inc/fupage.hxx
@@ -33,7 +33,7 @@ class FuPage
     : public FuPoor
 {
  public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuparagr.hxx b/sd/source/ui/inc/fuparagr.hxx
index b59769d43613..3341f249f47b 100644
--- a/sd/source/ui/inc/fuparagr.hxx
+++ b/sd/source/ui/inc/fuparagr.hxx
@@ -28,7 +28,7 @@ class FuParagraph
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     virtual void Activate();
     virtual void Deactivate();
diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx
index 205e6865deac..ec080c35531c 100644
--- a/sd/source/ui/inc/fuprlout.hxx
+++ b/sd/source/ui/inc/fuprlout.hxx
@@ -35,7 +35,7 @@ class FuPresentationLayout
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx
index a288a5dccd07..f1b988169843 100644
--- a/sd/source/ui/inc/fuprobjs.hxx
+++ b/sd/source/ui/inc/fuprobjs.hxx
@@ -36,7 +36,7 @@ class FuPresentationObjects
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuscale.hxx b/sd/source/ui/inc/fuscale.hxx
index c1606948d041..c130589977fc 100644
--- a/sd/source/ui/inc/fuscale.hxx
+++ b/sd/source/ui/inc/fuscale.hxx
@@ -28,7 +28,7 @@ class FuScale
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx
index 7974aeae1085..4540189c8ac1 100644
--- a/sd/source/ui/inc/fusearch.hxx
+++ b/sd/source/ui/inc/fusearch.hxx
@@ -32,7 +32,7 @@ class FuSearch
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx
index 8334fc8341cc..d9536102621c 100644
--- a/sd/source/ui/inc/fusel.hxx
+++ b/sd/source/ui/inc/fusel.hxx
@@ -34,7 +34,7 @@ class FuSelection
     : public FuDraw
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fusldlg.hxx b/sd/source/ui/inc/fusldlg.hxx
index 9305c9a27736..3ec8cb1fcac6 100644
--- a/sd/source/ui/inc/fusldlg.hxx
+++ b/sd/source/ui/inc/fusldlg.hxx
@@ -28,7 +28,7 @@ class FuSlideShowDlg
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fusnapln.hxx b/sd/source/ui/inc/fusnapln.hxx
index 0dff5fe90f14..3c1188f1f10c 100644
--- a/sd/source/ui/inc/fusnapln.hxx
+++ b/sd/source/ui/inc/fusnapln.hxx
@@ -28,7 +28,7 @@ class FuSnapLine
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     virtual void Activate();
     virtual void Deactivate();
diff --git a/sd/source/ui/inc/fusumry.hxx b/sd/source/ui/inc/fusumry.hxx
index 196327d1f427..3f39ca9cd32c 100644
--- a/sd/source/ui/inc/fusumry.hxx
+++ b/sd/source/ui/inc/fusumry.hxx
@@ -28,7 +28,7 @@ class FuSummaryPage
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/futempl.hxx b/sd/source/ui/inc/futempl.hxx
index edd97e57501f..630919dbf9e4 100644
--- a/sd/source/ui/inc/futempl.hxx
+++ b/sd/source/ui/inc/futempl.hxx
@@ -28,7 +28,7 @@ class FuTemplate
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     virtual void Activate();
     virtual void Deactivate();
diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx
index 820a4994bc83..3ec8412d4e3f 100644
--- a/sd/source/ui/inc/futext.hxx
+++ b/sd/source/ui/inc/futext.hxx
@@ -38,7 +38,7 @@ class FuText
     : public FuConstruct
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/futhes.hxx b/sd/source/ui/inc/futhes.hxx
index 799a1bcc4511..ea28787601d5 100644
--- a/sd/source/ui/inc/futhes.hxx
+++ b/sd/source/ui/inc/futhes.hxx
@@ -28,7 +28,7 @@ class FuThesaurus
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/futransf.hxx b/sd/source/ui/inc/futransf.hxx
index 4064bf3a2ef9..3118255ceda9 100644
--- a/sd/source/ui/inc/futransf.hxx
+++ b/sd/source/ui/inc/futransf.hxx
@@ -29,7 +29,7 @@ class FuTransform
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/futxtatt.hxx b/sd/source/ui/inc/futxtatt.hxx
index 7057f568b622..a6cf67566e0b 100644
--- a/sd/source/ui/inc/futxtatt.hxx
+++ b/sd/source/ui/inc/futxtatt.hxx
@@ -28,7 +28,7 @@ class FuTextAttrDlg
     : public FuPoor
 {
  public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuvect.hxx b/sd/source/ui/inc/fuvect.hxx
index 12028b74f9ca..93ca46c9cf79 100644
--- a/sd/source/ui/inc/fuvect.hxx
+++ b/sd/source/ui/inc/fuvect.hxx
@@ -28,7 +28,7 @@ class FuVectorize
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
     virtual void DoExecute( SfxRequest& rReq );
diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx
index 802fa520c3bc..487c22a25fcf 100644
--- a/sd/source/ui/inc/fuzoom.hxx
+++ b/sd/source/ui/inc/fuzoom.hxx
@@ -31,7 +31,7 @@ class FuZoom
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq );
 
diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx
index c8a9ce018a3a..d5d11926596d 100644
--- a/sd/source/ui/inc/sdundogr.hxx
+++ b/sd/source/ui/inc/sdundogr.hxx
@@ -28,7 +28,7 @@ class SD_DLLPUBLIC SdUndoGroup : public SdUndoAction
 {
     std::vector<SdUndoAction*>  aCtn;
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
                    SdUndoGroup(SdDrawDocument* pSdDrawDocument)
                               : SdUndoAction(pSdDrawDocument),
                                 aCtn() {}
diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
index 2f2487e6a11e..71128fd8c645 100644
--- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
@@ -55,7 +55,7 @@ class ToolPanelViewShell
     : public ViewShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SD_IF_SDTOOLPANELSHELL)
 
     ToolPanelViewShell (
diff --git a/sd/source/ui/inc/unchss.hxx b/sd/source/ui/inc/unchss.hxx
index d4d5c260083d..257eceaa2a73 100644
--- a/sd/source/ui/inc/unchss.hxx
+++ b/sd/source/ui/inc/unchss.hxx
@@ -35,7 +35,7 @@ class StyleSheetUndoAction : public SdUndoAction
     OUString        aComment;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     StyleSheetUndoAction(SdDrawDocument* pTheDoc,
                          SfxStyleSheet*  pTheStyleSheet,
                          const SfxItemSet* pTheNewItemSet);
diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx
index 65b8471cd10f..e30bacb3ac01 100644
--- a/sd/source/ui/inc/undoback.hxx
+++ b/sd/source/ui/inc/undoback.hxx
@@ -39,7 +39,7 @@ private:
 
 public:
 
-                            TYPEINFO();
+                            TYPEINFO_OVERRIDE();
 
                             SdBackgroundObjUndoAction(
                                 SdDrawDocument& rDoc,
diff --git a/sd/source/ui/inc/undoheaderfooter.hxx b/sd/source/ui/inc/undoheaderfooter.hxx
index 65eb645282e5..b4b9cb5ecce7 100644
--- a/sd/source/ui/inc/undoheaderfooter.hxx
+++ b/sd/source/ui/inc/undoheaderfooter.hxx
@@ -36,7 +36,7 @@ class SD_DLLPUBLIC SdHeaderFooterUndoAction : public SdUndoAction
     const sd::HeaderFooterSettings  maNewSettings;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, const sd::HeaderFooterSettings& rNewSettings );
     virtual ~SdHeaderFooterUndoAction();
 
diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx
index 6ce918eb36aa..fda35cc5f3df 100644
--- a/sd/source/ui/inc/undolayer.hxx
+++ b/sd/source/ui/inc/undolayer.hxx
@@ -31,7 +31,7 @@ class SdLayerModifyUndoAction : public SdUndoAction
 {
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SdLayerModifyUndoAction( SdDrawDocument* _pDoc, SdrLayer* pLayer,
     const OUString& rOldLayerName, const OUString& rOldLayerTitle, const OUString& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable,
     const OUString& rNewLayerName, const OUString& rNewLayerTitle, const OUString& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable );
diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx
index 391ebc6fbe8f..3a8faab7cbb3 100644
--- a/sd/source/ui/inc/undopage.hxx
+++ b/sd/source/ui/inc/undopage.hxx
@@ -54,7 +54,7 @@ class SdPageFormatUndoAction : public SdUndoAction
     sal_Bool        mbNewFullSize;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SdPageFormatUndoAction( SdDrawDocument* pDoc,
                             SdPage*         pThePage,
                             const Size&     rOldSz,
@@ -117,7 +117,7 @@ class SdPageLRUndoAction : public SdUndoAction
     sal_Int32   mnNewRight;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SdPageLRUndoAction( SdDrawDocument* pDoc, SdPage* pThePage,
                         sal_Int32 nOldLft, sal_Int32 nOldRgt,
                         sal_Int32 nNewLft, sal_Int32 nNewRgt ) :
@@ -146,7 +146,7 @@ class SdPageULUndoAction : public SdUndoAction
     sal_Int32   mnNewLower;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SdPageULUndoAction( SdDrawDocument* pDoc, SdPage* pThePage,
                         sal_Int32 nOldUpr, sal_Int32 nOldLwr,
                         sal_Int32 nNewUpr, sal_Int32 nNewLwr ) :
diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx
index fd74d186b8d5..7b0257353f95 100644
--- a/sd/source/ui/inc/unmodpg.hxx
+++ b/sd/source/ui/inc/unmodpg.hxx
@@ -41,7 +41,7 @@ class ModifyPageUndoAction : public SdUndoAction
     OUString        maComment;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     ModifyPageUndoAction(
         SdDrawDocument*         pTheDoc,
         SdPage*                 pThePage,
diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx
index 678641dc9e8a..05548711c4eb 100644
--- a/sd/source/ui/inc/unoaprms.hxx
+++ b/sd/source/ui/inc/unoaprms.hxx
@@ -80,7 +80,7 @@ class SdAnimationPrmsUndoAction : public SdUndoAction
     sal_Bool            bInfoCreated;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
         SdAnimationPrmsUndoAction(SdDrawDocument* pTheDoc, SdrObject* pObj,
                                   sal_Bool bCreated):
         SdUndoAction    (pTheDoc),
diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx
index 3ff3a90ee08c..b5a69d3a5383 100644
--- a/sd/source/ui/inc/unprlout.hxx
+++ b/sd/source/ui/inc/unprlout.hxx
@@ -37,7 +37,7 @@ class SdPresentationLayoutUndoAction : public SdUndoAction
     OUString        aComment;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SdPresentationLayoutUndoAction(SdDrawDocument* pTheDoc,
                          const OUString& aTheOldLayoutName,
                          const OUString& aTheNewLayoutName,
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index e09f7d18602c..f2acc963614e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -42,7 +42,7 @@ class SelectionFunction
       private ::boost::noncopyable
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     static rtl::Reference<FuPoor> Create( SlideSorter& rSlideSorter, SfxRequest& rRequest );
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx
index 207525a31d80..b9000fb95893 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx
@@ -35,7 +35,7 @@ class SlideFunction
     : public FuPoor
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     virtual sal_Bool MouseMove (const MouseEvent& rMEvt);
     virtual sal_Bool MouseButtonUp (const MouseEvent& rMEvt);
diff --git a/sd/source/ui/table/tableobjectbar.hxx b/sd/source/ui/table/tableobjectbar.hxx
index 60301669a653..4bbdf99b267d 100644
--- a/sd/source/ui/table/tableobjectbar.hxx
+++ b/sd/source/ui/table/tableobjectbar.hxx
@@ -36,7 +36,7 @@ namespace sd { namespace ui { namespace table {
 class TableObjectBar  : public SfxShell
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE( SD_IF_SDDRAWTABLEOBJECTBAR )
 
     TableObjectBar( ::sd::ViewShell* pSdViewShell, ::sd::View* pSdView);