SfxHint: convert home-grown RTTI to normal C++ RTTI

Also note that I fixed a bug in SvxFontMenuControl::Notify
where the if statement had the check the wrong way around.

Change-Id: I611e8929c65818191e36bd80f2b985820ada4411
Reviewed-on: https://gerrit.libreoffice.org/11147
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>

4 files changed, 5 insertions, 21 deletions

diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index b2c3ac14d701..70df0743b47a 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -20,13 +20,10 @@
 #define INCLUDED_SVL_HINT_HXX
 
 #include <svl/svldllapi.h>
-#include <tools/rtti.hxx>
 
 class SVL_DLLPUBLIC SfxHint
 {
 public:
-    TYPEINFO();
-
     virtual ~SfxHint();
 };
 
@@ -38,7 +35,6 @@ public:
             Type* pObj; \
         \
         public: \
-            TYPEINFO_OVERRIDE(); \
             explicit Name( Type* Object ); \
             virtual ~Name(); \
         \
@@ -46,7 +42,6 @@ public:
         }
 
 #define IMPL_PTRHINT(Name, Type) \
-        TYPEINIT1(Name, SfxHint);   \
         Name::Name( Type* pObject ) { pObj = pObject; } \
         Name::~Name() {}
 
diff --git a/include/svl/isethint.hxx b/include/svl/isethint.hxx
index edbdd41b76d0..e7541c1d2bc7 100644
--- a/include/svl/isethint.hxx
+++ b/include/svl/isethint.hxx
@@ -32,8 +32,6 @@ class SVL_DLLPUBLIC SfxItemSetHint: public SfxHint
     SfxItemSet*         _pItemSet;
 
 public:
-                        TYPEINFO_OVERRIDE();
-
                         SfxItemSetHint( const SfxItemSet &rItemSet );
     virtual             ~SfxItemSetHint();
 
diff --git a/include/svl/smplhint.hxx b/include/svl/smplhint.hxx
index 8189a005456b..058b91cd43d9 100644
--- a/include/svl/smplhint.hxx
+++ b/include/svl/smplhint.hxx
@@ -21,7 +21,7 @@
 
 #include <svl/svldllapi.h>
 #include <svl/hint.hxx>
-#include <tools/rtti.hxx>
+#include <tools/solar.h>
 
 #define SFX_HINT_DYING              0x00000001
 #define SFX_HINT_NAMECHANGED        0x00000002
@@ -62,7 +62,6 @@ class SVL_DLLPUBLIC SfxSimpleHint: public SfxHint
 private:
     sal_uLong mnId;
 public:
-    TYPEINFO_OVERRIDE();
     SfxSimpleHint( sal_uLong nId ) { mnId = nId; }
     sal_uLong GetId() const { return mnId; }
 };
@@ -75,14 +74,12 @@ public:
             Type  aObj; \
         \
         public: \
-            TYPEINFO_OVERRIDE(); \
             Name( sal_uInt16 nId, const Type& rObject ); \
             virtual ~Name(); \
             const Type& GetObject() const { return aObj; } \
         }
 
 #define IMPL_OBJHINT(Name, Type) \
-        TYPEINIT1(Name, SfxSimpleHint); \
         Name::Name( sal_uInt16 nID, const Type& rObject ): \
             SfxSimpleHint( nID ), aObj(rObject) \
             { } \
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 773178d8d58f..78c1bc418b62 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -341,10 +341,8 @@ class SVL_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint
     sal_uInt16 nHint;
 
 public:
-    TYPEINFO_OVERRIDE();
-
                         SfxStyleSheetPoolHint(sal_uInt16 nArgHint) :  nHint(nArgHint){}
-    sal_uInt16              GetHint() const
+    sal_uInt16          GetHint() const
                         { return nHint; }
 };
 
@@ -353,15 +351,13 @@ public:
 class SVL_DLLPUBLIC SfxStyleSheetHint: public SfxHint
 {
     SfxStyleSheetBase*  pStyleSh;
-    sal_uInt16              nHint;
+    sal_uInt16          nHint;
 
 public:
-                        TYPEINFO_OVERRIDE();
-
                         SfxStyleSheetHint( sal_uInt16, SfxStyleSheetBase& );
     SfxStyleSheetBase*  GetStyleSheet() const
                         { return pStyleSh; }
-    sal_uInt16              GetHint() const
+    sal_uInt16          GetHint() const
                         { return nHint; }
 };
 
@@ -370,11 +366,9 @@ class SVL_DLLPUBLIC SfxStyleSheetHintExtended: public SfxStyleSheetHint
     OUString            aName;
 
 public:
-                        TYPEINFO_OVERRIDE();
-
                         SfxStyleSheetHintExtended( sal_uInt16, const OUString& rOld,
                                                    SfxStyleSheetBase& );
-    const OUString&       GetOldName() { return aName; }
+    const OUString&     GetOldName() const { return aName; }
 };
 
 class SVL_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel >