5th step to remove tools/rtti.hxx

tools/rtti.hxx removed
completed the interface of some Sdr.*  Items
and removed pseudo items

Change-Id: I0cdcd01494be35b97a27d5985aa908affa96048a
Reviewed-on: https://gerrit.libreoffice.org/19837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>

30 files changed, 22 insertions, 57 deletions

diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx
index c44e96ded1b4..97afa702c224 100644
--- a/include/svl/SfxBroadcaster.hxx
+++ b/include/svl/SfxBroadcaster.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SVL_BRDCST_HXX
 
 #include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
 
 class SfxListener;
 class SfxHint;
@@ -40,7 +39,6 @@ protected:
     void                    Forward(SfxBroadcaster& rBC, const SfxHint& rHint);
 
 public:
-                            TYPEINFO();
 
                             SfxBroadcaster();
                             SfxBroadcaster( const SfxBroadcaster &rBC );
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx
index 3dce3b88429f..715d7419d40c 100644
--- a/include/svl/aeitem.hxx
+++ b/include/svl/aeitem.hxx
@@ -35,7 +35,8 @@ protected:
     sal_uInt16                  _GetPosByValue( sal_uInt16 nValue ) const;
 
 public:
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
+
                             SfxAllEnumItem();
     explicit                SfxAllEnumItem( sal_uInt16 nWhich);
                             SfxAllEnumItem( sal_uInt16 nWhich, sal_uInt16 nVal );
diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index ad9ce1867629..6a027b3132c5 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -32,7 +32,6 @@ protected:
         SfxPoolItem(rItem) {}
 
 public:
-    TYPEINFO_OVERRIDE();
 
     virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx
index a6861141fe3e..5f23dd12116c 100644
--- a/include/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
@@ -29,7 +29,6 @@ class SVL_DLLPUBLIC CntByteItem: public SfxPoolItem
     sal_uInt8 m_nValue;
 
 public:
-    TYPEINFO_OVERRIDE();
 
     CntByteItem(sal_uInt16 which = 0, sal_uInt8 nTheValue = 0):
         SfxPoolItem(which), m_nValue(nTheValue) {}
@@ -76,7 +75,6 @@ class SVL_DLLPUBLIC CntUInt16Item: public SfxPoolItem
     sal_uInt16 m_nValue;
 
 public:
-    TYPEINFO_OVERRIDE();
 
     CntUInt16Item(sal_uInt16 which = 0, sal_uInt16 nTheValue = 0):
         SfxPoolItem(which), m_nValue(nTheValue)
@@ -126,7 +124,6 @@ class SVL_DLLPUBLIC CntInt32Item: public SfxPoolItem
     sal_Int32 m_nValue;
 
 public:
-    TYPEINFO_OVERRIDE();
 
     CntInt32Item(sal_uInt16 which = 0, sal_Int32 nTheValue = 0):
         SfxPoolItem(which), m_nValue(nTheValue)
@@ -176,7 +173,6 @@ class SVL_DLLPUBLIC CntUInt32Item: public SfxPoolItem
     sal_uInt32 m_nValue;
 
 public:
-    TYPEINFO_OVERRIDE();
 
     CntUInt32Item(sal_uInt16 which = 0, sal_uInt32 nTheValue = 0):
         SfxPoolItem(which), m_nValue(nTheValue)
diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx
index a9fb8e1aa771..8d1e04bdb267 100644
--- a/include/svl/cntwall.hxx
+++ b/include/svl/cntwall.hxx
@@ -21,7 +21,6 @@
 
 #include <svl/svldllapi.h>
 
-#include <tools/rtti.hxx>
 #include <tools/color.hxx>
 #include <svl/poolitem.hxx>
 
@@ -35,7 +34,6 @@ private:
     sal_uInt16              _nStyle;
 
 public:
-                            TYPEINFO_OVERRIDE();
 
                             CntWallpaperItem( sal_uInt16 nWhich );
                             CntWallpaperItem( sal_uInt16 nWhich, SvStream& rStream, sal_uInt16 nVersion );
diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx
index 64beb5fe4181..52cd22e1891b 100644
--- a/include/svl/ctypeitm.hxx
+++ b/include/svl/ctypeitm.hxx
@@ -31,7 +31,6 @@ private:
     OUString _aPresentation;
 
 public:
-    TYPEINFO_OVERRIDE();
 
     CntContentTypeItem();
     CntContentTypeItem( sal_uInt16 nWhich, const OUString& rType );
diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx
index 142c4c33c344..aa6d220b381d 100644
--- a/include/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
@@ -29,7 +29,6 @@ class SVL_DLLPUBLIC CntUnencodedStringItem: public SfxPoolItem
     OUString m_aValue;
 
 public:
-    TYPEINFO_OVERRIDE();
 
     CntUnencodedStringItem(sal_uInt16 which = 0): SfxPoolItem(which)
     {}
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index 84d9f4270ae4..b4f6f083c052 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -44,7 +44,6 @@ protected:
     SfxEnumItem(sal_uInt16 const nWhich, SvStream & rStream);
 
 public:
-    TYPEINFO_OVERRIDE();
 
     sal_uInt16 GetValue() const { return m_nValue; }
 
@@ -67,7 +66,7 @@ class SVL_DLLPUBLIC SfxBoolItem
     bool m_bValue;
 
 public:
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
 
     explicit SfxBoolItem(sal_uInt16 const nWhich = 0, bool const bValue = false)
         : SfxPoolItem(nWhich)
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index 3b78d7ed6cd9..f43d3d05b9aa 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
@@ -21,7 +21,6 @@
 
 #include <svl/poolitem.hxx>
 #include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
 
 class SvStream;
 
@@ -30,7 +29,6 @@ class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem
     sal_uInt16                   nVal;
 
 public:
-                             TYPEINFO_OVERRIDE();
 
     explicit                 SfxFlagItem( sal_uInt16 nWhich = 0, sal_uInt16 nValue = 0 );
                              SfxFlagItem( const SfxFlagItem& );
diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx
index 7128cda41350..94011d088583 100644
--- a/include/svl/globalnameitem.hxx
+++ b/include/svl/globalnameitem.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SVL_GLOBALNAMEITEM_HXX
 
 #include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
 #include <tools/globname.hxx>
 #include <svl/poolitem.hxx>
 
@@ -29,7 +28,8 @@ class SVL_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem
     SvGlobalName            m_aName;
 
 public:
-                            TYPEINFO_OVERRIDE();
+                            static SfxPoolItem* CreateDefault();
+
                             SfxGlobalNameItem();
                             SfxGlobalNameItem( sal_uInt16 nWhich, const SvGlobalName& );
                             virtual ~SfxGlobalNameItem();
diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx
index 95bcf11b7ba8..5f459e894990 100644
--- a/include/svl/grabbagitem.hxx
+++ b/include/svl/grabbagitem.hxx
@@ -12,7 +12,6 @@
 #include <map>
 
 #include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
 #include <svl/poolitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
@@ -23,7 +22,6 @@ private:
     std::map<OUString, css::uno::Any> m_aMap;
 
 public:
-    TYPEINFO_OVERRIDE();
 
     SfxGrabBagItem();
     SfxGrabBagItem(sal_uInt16 nWhich, const std::map<OUString, css::uno::Any>* pMap = nullptr);
diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx
index e3f2bc56f216..bbcbe44c4f6d 100644
--- a/include/svl/ilstitem.hxx
+++ b/include/svl/ilstitem.hxx
@@ -30,8 +30,7 @@ class SVL_DLLPUBLIC SfxIntegerListItem : public SfxPoolItem
     css::uno::Sequence < sal_Int32 > m_aList;
 
 public:
-    TYPEINFO_OVERRIDE();
-
+    static SfxPoolItem* CreateDefault();
     SfxIntegerListItem();
     SfxIntegerListItem( sal_uInt16 nWhich, const ::std::vector < sal_Int32 >& rList );
     SfxIntegerListItem( sal_uInt16 nWhich, const css::uno::Sequence < sal_Int32 >& rList );
diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx
index 662eed5dc7ff..570c7453a5d8 100644
--- a/include/svl/imageitm.hxx
+++ b/include/svl/imageitm.hxx
@@ -28,7 +28,7 @@ class SVL_DLLPUBLIC SfxImageItem : public SfxInt16Item
 {
     SfxImageItem_Impl*      pImp;
 public:
-                            TYPEINFO_OVERRIDE();
+                            static SfxPoolItem* CreateDefault();
                             SfxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 );
                             SfxImageItem( const SfxImageItem& );
     virtual                 ~SfxImageItem();
diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx
index ff5e7af020aa..8eceede33e21 100644
--- a/include/svl/intitem.hxx
+++ b/include/svl/intitem.hxx
@@ -27,7 +27,7 @@
 class SVL_DLLPUBLIC SfxByteItem: public CntByteItem
 {
 public:
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
 
     explicit SfxByteItem(sal_uInt16 which = 0, sal_uInt8 nValue = 0):
         CntByteItem(which, nValue) {}
@@ -43,7 +43,7 @@ class SVL_DLLPUBLIC SfxInt16Item: public SfxPoolItem
     sal_Int16 m_nValue;
 
 public:
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
 
     explicit SfxInt16Item(sal_uInt16 which = 0, sal_Int16 nTheValue = 0):
         SfxPoolItem(which), m_nValue(nTheValue)
@@ -92,7 +92,7 @@ inline void SfxInt16Item::SetValue(sal_Int16 nTheValue)
 class SVL_DLLPUBLIC SfxUInt16Item: public CntUInt16Item
 {
 public:
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
 
     explicit SfxUInt16Item(sal_uInt16 which = 0, sal_uInt16 nValue = 0):
         CntUInt16Item(which, nValue) {}
@@ -113,7 +113,7 @@ public:
 class SVL_DLLPUBLIC SfxInt32Item: public CntInt32Item
 {
 public:
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
 
     explicit SfxInt32Item(sal_uInt16 which = 0, sal_Int32 nValue = 0):
         CntInt32Item(which, nValue) {}
@@ -133,7 +133,7 @@ public:
 class SVL_DLLPUBLIC SfxUInt32Item: public CntUInt32Item
 {
 public:
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
 
     explicit SfxUInt32Item(sal_uInt16 which = 0, sal_uInt32 nValue = 0):
         CntUInt32Item(which, nValue) {}
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 3c2cba1e0e7d..ef8956f8b8b4 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -23,7 +23,6 @@
 
 #include <cstdarg>
 #include <svl/poolitem.hxx>
-#include <tools/rtti.hxx>
 
 class SfxItemPool;
 class SfxPoolItem;
diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx
index 589bcff52078..64d5ff0c36d8 100644
--- a/include/svl/lckbitem.hxx
+++ b/include/svl/lckbitem.hxx
@@ -21,7 +21,6 @@
 
 #include <svl/poolitem.hxx>
 #include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
 #include <tools/stream.hxx>
 
 class SVL_DLLPUBLIC SfxLockBytesItem : public SfxPoolItem
@@ -29,7 +28,7 @@ class SVL_DLLPUBLIC SfxLockBytesItem : public SfxPoolItem
     SvLockBytesRef          _xVal;
 
 public:
-                            TYPEINFO_OVERRIDE();
+                            static SfxPoolItem* CreateDefault();
                             SfxLockBytesItem();
                             SfxLockBytesItem( sal_uInt16 nWhich, SvStream & );
                             SfxLockBytesItem( const SfxLockBytesItem& );
diff --git a/include/svl/lstner.hxx b/include/svl/lstner.hxx
index e3ce43ff9cf0..bfa2330805ed 100644
--- a/include/svl/lstner.hxx
+++ b/include/svl/lstner.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SVL_LSTNER_HXX
 
 #include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
 
 class SfxBroadcaster;
 class SfxHint;
@@ -34,7 +33,6 @@ private:
     const SfxListener&  operator=(const SfxListener &) = delete;
 
 public:
-    TYPEINFO();
 
                         SfxListener();
                         SfxListener( const SfxListener &rCopy );
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 43e9a394048f..38babec730ef 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -24,7 +24,6 @@
 #include <rtl/ustring.hxx>
 #include <svl/svldllapi.h>
 #include <svl/poolitem.hxx>
-#include <tools/rtti.hxx>
 #include <map>
 
 class SvStream;
@@ -120,7 +119,7 @@ This item describes a Macro table.
 class SVL_DLLPUBLIC SvxMacroItem: public SfxPoolItem
 {
 public:
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
 
     explicit inline SvxMacroItem ( const sal_uInt16 nId );
 
diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx
index d594e523d168..39ce85159159 100644
--- a/include/svl/metitem.hxx
+++ b/include/svl/metitem.hxx
@@ -25,7 +25,6 @@
 class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item
 {
 public:
-                             TYPEINFO_OVERRIDE();
     explicit                 SfxMetricItem( sal_uInt16 nWhich = 0, sal_uInt32 nValue = 0 );
                              SfxMetricItem( sal_uInt16 nWhich, SvStream & );
                              SfxMetricItem( const SfxMetricItem& );
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index ff83ea32df8b..6f143bb88f88 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -28,7 +28,7 @@
 #include <svl/hint.hxx>
 #include <svl/svldllapi.h>
 #include <tools/debug.hxx>
-#include <tools/rtti.hxx>
+#include <tools/solar.h>
 
 class IntlWrapper;
 class SvStream;
@@ -161,7 +161,6 @@ protected:
                              SfxPoolItem( const SfxPoolItem& );
 
 public:
-                             TYPEINFO();
     virtual                  ~SfxPoolItem();
 
     void                     SetWhich( sal_uInt16 nId ) { m_nWhich = nId; }
@@ -252,7 +251,7 @@ class SVL_DLLPUBLIC SfxVoidItem: public SfxPoolItem
 {
     SfxVoidItem & operator=( const SfxVoidItem& ) = delete;
 public:
-                            TYPEINFO_OVERRIDE();
+                            static SfxPoolItem* CreateDefault();
                             explicit SfxVoidItem( sal_uInt16 nWhich );
                             SfxVoidItem( sal_uInt16 nWhich, SvStream & );
                             SfxVoidItem( const SfxVoidItem& );
@@ -277,7 +276,6 @@ class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem
     SfxSetItem & operator=( const SfxSetItem& ) = delete;
 
 public:
-                            TYPEINFO_OVERRIDE();
                             SfxSetItem( sal_uInt16 nWhich, SfxItemSet *pSet );
                             SfxSetItem( sal_uInt16 nWhich, const SfxItemSet &rSet );
                             SfxSetItem( const SfxSetItem&, SfxItemPool *pPool = nullptr );
diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx
index 4e5e51dddf85..ad863ea5c284 100644
--- a/include/svl/ptitem.hxx
+++ b/include/svl/ptitem.hxx
@@ -30,7 +30,7 @@ class SVL_DLLPUBLIC SfxPointItem: public SfxPoolItem
     Point                    aVal;
 
 public:
-                             TYPEINFO_OVERRIDE();
+                             static SfxPoolItem* CreateDefault();
                              SfxPointItem();
                              SfxPointItem( sal_uInt16 nWhich, const Point& rVal );
                              SfxPointItem( const SfxPointItem& );
diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx
index c6bab73dc38c..3d94941f3a4a 100644
--- a/include/svl/rectitem.hxx
+++ b/include/svl/rectitem.hxx
@@ -31,7 +31,7 @@ class SVL_DLLPUBLIC SfxRectangleItem: public SfxPoolItem
     Rectangle                aVal;
 
 public:
-                             TYPEINFO_OVERRIDE();
+                             static SfxPoolItem* CreateDefault();
                              SfxRectangleItem();
                              SfxRectangleItem( sal_uInt16 nWhich, const Rectangle& rVal );
                              SfxRectangleItem( const SfxRectangleItem& );
diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx
index 8739be11e4e5..3170df70b5c1 100644
--- a/include/svl/rngitem.hxx
+++ b/include/svl/rngitem.hxx
@@ -33,7 +33,6 @@ private:
     sal_uInt16                  nFrom;
     sal_uInt16                  nTo;
 public:
-                                TYPEINFO_OVERRIDE();
                                 SfxRangeItem();
                                 SfxRangeItem( sal_uInt16 nWID, sal_uInt16 nFrom, sal_uInt16 nTo );
                                 SfxRangeItem( const SfxRangeItem& rItem );
@@ -57,7 +56,6 @@ private:
     sal_uInt16*                 _pRanges;
 
 public:
-                                TYPEINFO_OVERRIDE();
                                 SfxUShortRangesItem();
                                 SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream );
                                 SfxUShortRangesItem( const SfxUShortRangesItem& rItem );
diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx
index 57bc2e34eaea..51662456e94c 100644
--- a/include/svl/slstitm.hxx
+++ b/include/svl/slstitm.hxx
@@ -22,7 +22,6 @@
 #include <vector>
 
 #include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
 #include <svl/poolitem.hxx>
 #include <com/sun/star/uno/Sequence.h>
 
@@ -34,7 +33,7 @@ protected:
     SfxImpStringList*   pImp;
 
 public:
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
 
     SfxStringListItem();
     SfxStringListItem( sal_uInt16 nWhich, const std::vector<OUString> *pList=nullptr );
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index acca4911fbcb..a2f3d79bfda6 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -92,7 +92,7 @@ class SVL_DLLPUBLIC SvxSearchItem :
     virtual void    ImplCommit() override;
 
 public:
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
 
     explicit SvxSearchItem( const sal_uInt16 nId );
     SvxSearchItem( const SvxSearchItem& rItem );
diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx
index ca20acc142f5..3d5a2c1a0eda 100644
--- a/include/svl/stritem.hxx
+++ b/include/svl/stritem.hxx
@@ -27,7 +27,7 @@
 class SVL_DLLPUBLIC SfxStringItem: public CntUnencodedStringItem
 {
 public:
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
 
     SfxStringItem(sal_uInt16 which = 0): CntUnencodedStringItem(which) {}
 
@@ -43,6 +43,7 @@ public:
     virtual SfxPoolItem * Clone(SfxItemPool * = nullptr) const override;
 
     void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+
 };
 
 #endif // INCLUDED_SVL_STRITEM_HXX
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index c1d9a8209b7a..174986e7300c 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -98,7 +98,6 @@ protected:
     virtual void Store( SvStream& );
 
 public:
-    TYPEINFO();
 
     // returns the internal name of this style
     virtual const OUString& GetName() const;
@@ -267,7 +266,6 @@ class SVL_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase,
                      public SfxListener, public SfxBroadcaster, public svl::StyleSheetUser
 {
 public:
-                        TYPEINFO_OVERRIDE();
 
                         SfxStyleSheet( const OUString&, const SfxStyleSheetBasePool&, SfxStyleFamily, sal_uInt16 );
                         SfxStyleSheet( const SfxStyleSheet& );
diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx
index f9d3d1248fae..621f7c9c44bc 100644
--- a/include/svl/szitem.hxx
+++ b/include/svl/szitem.hxx
@@ -31,7 +31,6 @@ private:
     Size                     aVal;
 
 public:
-                             TYPEINFO_OVERRIDE();
                              SfxSizeItem();
                              SfxSizeItem( sal_uInt16 nWhich, const Size& rVal );
                              SfxSizeItem( const SfxSizeItem& );
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 96c77cb600f1..d5bb705efbc6 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -21,7 +21,6 @@
 
 #include <svl/svldllapi.h>
 #include <rtl/ustring.hxx>
-#include <tools/rtti.hxx>
 
 #include <limits>
 #include <memory>
@@ -31,7 +30,6 @@ struct MarkedUndoAction;
 class SVL_DLLPUBLIC SfxRepeatTarget
 {
 public:
-                        TYPEINFO();
     virtual             ~SfxRepeatTarget() = 0;
 };
 
@@ -52,7 +50,6 @@ private:
     SfxLinkUndoAction*      mpSfxLinkUndoAction;
 
 public:
-                            TYPEINFO();
                             SfxUndoAction();
     virtual                 ~SfxUndoAction();
 
@@ -139,7 +136,6 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra
     Impl* mpImpl;
 
 public:
-                            TYPEINFO_OVERRIDE();
 
     SfxListUndoAction(
         const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId, SfxUndoArray *pFather );
@@ -424,7 +420,6 @@ private:
     void LinkedSfxUndoActionDestructed(const SfxUndoAction& rCandidate);
 
 public:
-                            TYPEINFO_OVERRIDE();
                             SfxLinkUndoAction(::svl::IUndoManager *pManager);
                             virtual ~SfxLinkUndoAction();
 
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index 0819d35f28e5..9479f2c737ba 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -29,7 +29,6 @@ class SVL_DLLPUBLIC SfxVisibilityItem: public SfxPoolItem
     css::frame::status::Visibility m_nValue;
 
 public:
-    TYPEINFO_OVERRIDE();
 
     explicit SfxVisibilityItem(sal_uInt16 which = 0, bool bVisible = true):
         SfxPoolItem(which)