Split TYPEINFO into plain and TYPEINFO_OVERRIDE

...where the latter contains SAL_OVERRIDE annotations

Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1

16 files changed, 24 insertions, 24 deletions

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 122cb0da4dc1..57cbf016b7e4 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -137,7 +137,7 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
     void                        Deinitialize();
 
 public:
-                                TYPEINFO();
+                                TYPEINFO_OVERRIDE();
                                 SFX_DECL_INTERFACE(SFX_INTERFACE_SFXAPP)
 
                                 SfxApplication();
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 86e466a4146b..19e91785e031 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -86,7 +86,7 @@ private:
     ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty > m_aCmisProperties;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SfxDocumentInfoItem();
     SfxDocumentInfoItem( const OUString &rFileName,
         const ::com::sun::star::uno::Reference<
diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index 2bebdddc6d01..be335ebf95b7 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
@@ -42,7 +42,7 @@ class SFX2_DLLPUBLIC SfxEventHint : public SfxHint
     sal_uInt16              nEventId;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SfxEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj = 0 )
                         :   pObjShell(pObj),
                             aEventName(aName),
@@ -66,7 +66,7 @@ class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint
     ::com::sun::star::uno::Reference< css::frame::XController2 > xViewController;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     SfxViewEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj, const css::uno::Reference< css::frame::XController >& xController )
                         : SfxEventHint( nId, aName, pObj )
@@ -91,7 +91,7 @@ class SfxNamedHint : public SfxHint
     OUString            _aArgs;
 
 public:
-                        TYPEINFO();
+                        TYPEINFO_OVERRIDE();
 
                         SfxNamedHint( const OUString& rName,
                                       const OUString& rArgs,
@@ -119,7 +119,7 @@ class SfxPrintingHint : public SfxViewEventHint
     sal_Int32 mnPrintableState;
     com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aOpts;
 public:
-        TYPEINFO();
+        TYPEINFO_OVERRIDE();
 
         SfxPrintingHint(
                 sal_Int32 nEvent,
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index eacefeb1b46f..3f96dedf95c8 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -74,7 +74,7 @@ class SFX2_DLLPUBLIC SfxEventNamesItem : public SfxPoolItem
     SfxEventNamesList aEventsList;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     SfxEventNamesItem ( const sal_uInt16 nId ) : SfxPoolItem( nId ) {}
 
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 7678e0bfdceb..0bf2a8763397 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -233,7 +233,7 @@ class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem
     SAL_DLLPRIVATE void SetFramePtr_Impl( SfxFrame* /*pFrameP*/ ) { pFrame = wFrame; }
 
 public:
-                            TYPEINFO();
+                            TYPEINFO_OVERRIDE();
 
                             SfxFrameItem( sal_uInt16 nWhich, SfxViewFrame *p );
                             SfxFrameItem( SfxFrame *p=0 );
@@ -256,7 +256,7 @@ class SFX2_DLLPUBLIC SfxUsrAnyItem : public SfxPoolItem
 {
     ::com::sun::star::uno::Any  aValue;
 public:
-                                TYPEINFO();
+                                TYPEINFO_OVERRIDE();
                                 SfxUsrAnyItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Any& rAny );
     ::com::sun::star::uno::Any  GetValue() const
                                 { return aValue; }
@@ -272,7 +272,7 @@ class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem
                                 m_xFrame;
 
 public:
-                                TYPEINFO();
+                                TYPEINFO_OVERRIDE();
                                 SfxUnoFrameItem();
                                 SfxUnoFrameItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame );
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index ffa57edcf7ef..7c17b1cad4b8 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -223,7 +223,7 @@ class SfxFrameDescriptorItem : public SfxPoolItem
 {
     SfxFrameProperties                  aProperties;
 public:
-                                        TYPEINFO();
+                                        TYPEINFO_OVERRIDE();
 
                                         SfxFrameDescriptorItem ( const sal_uInt16 nId = SID_FRAMEDESCRIPTOR )
                                             : SfxPoolItem( nId )
diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx
index 85b855bed684..3b443b570666 100644
--- a/include/sfx2/minfitem.hxx
+++ b/include/sfx2/minfitem.hxx
@@ -35,7 +35,7 @@ class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem
     OUString                aCommentText;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SfxMacroInfoItem( sal_uInt16 nWhich,
                     const BasicManager* pMgr,
                     const OUString &rLibName,
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 52ccefb7f968..48ab868b0f23 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -66,7 +66,7 @@ private:
     SAL_DLLPRIVATE void Construct_Impl();
 
 public:
-                                TYPEINFO();
+                                TYPEINFO_OVERRIDE();
                                 SFX_DECL_INTERFACE(SFX_INTERFACE_SFXMODULE)
 
                                 SfxModule( ResMgr* pMgrP, bool bDummy,
diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx
index f19caa357790..862e29fe4abd 100644
--- a/include/sfx2/objitem.hxx
+++ b/include/sfx2/objitem.hxx
@@ -32,7 +32,7 @@ class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem
     SfxShell*                _pSh;
 
 public:
-                             TYPEINFO();
+                             TYPEINFO_OVERRIDE();
                              SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=0 );
 
     virtual bool             operator==( const SfxPoolItem& ) const;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index a80abe39cb41..b912b969711c 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -203,7 +203,7 @@ protected:
     void AddToRecentlyUsedList();
 
 public:
-                                TYPEINFO();
+                                TYPEINFO_OVERRIDE();
                                 SFX_DECL_INTERFACE(SFX_INTERFACE_SFXDOCSH)
 
     static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
@@ -740,7 +740,7 @@ class SFX2_DLLPUBLIC SfxObjectShellItem: public SfxPoolItem
     SfxObjectShell*         pObjSh;
 
 public:
-                            TYPEINFO();
+                            TYPEINFO_OVERRIDE();
                             SfxObjectShellItem() :
                                 SfxPoolItem( 0 ),
                                 pObjSh( 0 )
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index b34cda6b58ea..526e6385dd12 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -166,7 +166,7 @@ protected:
     SAL_DLLPRIVATE void SetShellObj_Impl( SfxShellObject* pObj );
 
 public:
-                                TYPEINFO();
+                                TYPEINFO_OVERRIDE();
     virtual                     ~SfxShell();
 
     virtual SfxInterface*       GetInterface() const;
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 15853c9573e2..595769ef450d 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -50,7 +50,7 @@ struct TabDlg_Impl;
 class SFX2_DLLPUBLIC SfxTabDialogItem: public SfxSetItem
 {
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
                             SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet );
                             SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=NULL);
     virtual SfxPoolItem*    Clone(SfxItemPool* pToPool) const;
diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx
index b8e664ce31ed..262f34824630 100644
--- a/include/sfx2/tplpitem.hxx
+++ b/include/sfx2/tplpitem.hxx
@@ -30,7 +30,7 @@ class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem
 {
     OUString aStyle;
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SfxTemplateItem();
     SfxTemplateItem( sal_uInt16 nWhich,
                      const OUString &rStyle,
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 63a1cc8c71b4..43cac0dcf437 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -90,7 +90,7 @@ protected:
 public:
                             SfxViewFrame( SfxFrame& rFrame, SfxObjectShell *pDoc = NULL );
 
-                            TYPEINFO();
+                            TYPEINFO_OVERRIDE();
                             SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWFRM)
 
     static void             SetViewFrame( SfxViewFrame* );
@@ -293,7 +293,7 @@ class SFX2_DLLPUBLIC SfxViewFrameItem: public SfxPoolItem
     SfxViewFrame*           pFrame;
 
 public:
-                            TYPEINFO();
+                            TYPEINFO_OVERRIDE();
                             SfxViewFrameItem( SfxViewFrame *pViewFrame ):
                                 SfxPoolItem( 0 ),
                                 pFrame( pViewFrame)
@@ -316,7 +316,7 @@ class SfxVerbListItem : public SfxPoolItem
     com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor > aVerbs;
 
 public:
-                            TYPEINFO();
+                            TYPEINFO_OVERRIDE();
                             SfxVerbListItem( sal_uInt16 nWhichId = SID_OBJECT ) :
                                 SfxPoolItem( nWhichId )
                             {}
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index a6bbf56e14bb..6fd665ab2907 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -162,7 +162,7 @@ public:
     static SfxViewShell*        Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController );
 
     // Initialize Constructors/Destructors
-                                TYPEINFO();
+                                TYPEINFO_OVERRIDE();
                                 SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWSH)
 
                                 SfxViewShell( SfxViewFrame *pFrame, sal_uInt16 nFlags = 0 );
diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx
index 1cfdc3db0f69..da0d1343e516 100644
--- a/include/sfx2/zoomitem.hxx
+++ b/include/sfx2/zoomitem.hxx
@@ -42,7 +42,7 @@ class SFX2_DLLPUBLIC SvxZoomItem: public SfxUInt16Item
     SvxZoomType             eType;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     SvxZoomItem( SvxZoomType eZoomType = SVX_ZOOM_PERCENT,
                  sal_uInt16 nVal = 0, sal_uInt16 nWhich = SID_ATTR_ZOOM );