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>

11 files changed, 8 insertions, 40 deletions

diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index c7532a147fbd..cec5f587fe85 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -94,7 +94,6 @@ class BASIC_DLLPUBLIC SbxHint : public SfxSimpleHint
 {
     SbxVariable* pVar;
 public:
-    TYPEINFO_OVERRIDE();
     SbxHint( sal_uIntPtr n, SbxVariable* v ) : SfxSimpleHint( n ), pVar( v ) {}
     SbxVariable* GetVar() const { return pVar; }
 };
diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx
index c9900a808e5c..d9cb6d830468 100644
--- a/include/editeng/unoedhlp.hxx
+++ b/include/editeng/unoedhlp.hxx
@@ -45,7 +45,6 @@ private:
     sal_Int32   mnEnd;
 
 public:
-            TYPEINFO_OVERRIDE();
             SvxEditSourceHint( sal_uLong nId );
             SvxEditSourceHint( sal_uLong nId, sal_uLong nValue, sal_Int32 nStart=0, sal_Int32 nEnd=0 );
 
@@ -56,7 +55,6 @@ public:
 class SvxEditSourceHintEndPara :public SvxEditSourceHint
 {
 public:
-    TYPEINFO_OVERRIDE();
     SvxEditSourceHintEndPara( sal_uInt32 nId )
         :SvxEditSourceHint(nId) {}
     SvxEditSourceHintEndPara( sal_uInt32 nId, sal_uInt32 nValue, sal_uInt32 nStart=0, sal_uInt32 nEnd=0 )
diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index be335ebf95b7..5b4970d571e4 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
@@ -42,7 +42,6 @@ class SFX2_DLLPUBLIC SfxEventHint : public SfxHint
     sal_uInt16              nEventId;
 
 public:
-    TYPEINFO_OVERRIDE();
     SfxEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj = 0 )
                         :   pObjShell(pObj),
                             aEventName(aName),
@@ -66,8 +65,6 @@ class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint
     ::com::sun::star::uno::Reference< css::frame::XController2 > xViewController;
 
 public:
-    TYPEINFO_OVERRIDE();
-
     SfxViewEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj, const css::uno::Reference< css::frame::XController >& xController )
                         : SfxEventHint( nId, aName, pObj )
                         , xViewController( xController, css::uno::UNO_QUERY )
@@ -91,8 +88,6 @@ class SfxNamedHint : public SfxHint
     OUString            _aArgs;
 
 public:
-                        TYPEINFO_OVERRIDE();
-
                         SfxNamedHint( const OUString& rName,
                                       const OUString& rArgs,
                                       SfxObjectShell *pObj = 0  )
@@ -119,8 +114,6 @@ class SfxPrintingHint : public SfxViewEventHint
     sal_Int32 mnPrintableState;
     com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aOpts;
 public:
-        TYPEINFO_OVERRIDE();
-
         SfxPrintingHint(
                 sal_Int32 nEvent,
                 const css::uno::Sequence < css::beans::PropertyValue >& rOpts,
@@ -141,7 +134,7 @@ public:
         {}
 
     sal_Int32 GetWhich() const { return mnPrintableState; }
-    const css::uno::Sequence < css::beans::PropertyValue >& GetOptions() { return aOpts; }
+    const css::uno::Sequence < css::beans::PropertyValue >& GetOptions() const { return aOpts; }
 };
 
 #endif
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 >
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 1d8831c2ffd2..f8ecdcc994f6 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -60,7 +60,6 @@ class SVX_DLLPUBLIC FmDesignModeChangedHint : public SfxHint
     bool m_bDesignMode;
 
 public:
-    TYPEINFO_OVERRIDE();
     FmDesignModeChangedHint( bool bDesMode );
     virtual ~FmDesignModeChangedHint();
 
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 6f1c5475f6b9..0d9b03b3480a 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -124,8 +124,6 @@ public:
     SdrHintKind                             meHint;
 
 public:
-    TYPEINFO_OVERRIDE();
-
     explicit SdrHint(SdrHintKind eNewHint);
     explicit SdrHint(const SdrObject& rNewObj);
 
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index c31e180a3d09..c248e8c83de9 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -101,9 +101,8 @@ class SVX_DLLPUBLIC SvxViewHint : public SfxHint
 {
 public:
     enum HintType { SVX_HINT_VIEWCHANGED };
-    TYPEINFO_OVERRIDE();
-    explicit SvxViewHint (HintType eType);
-    HintType GetHintType (void) const { return meHintType;}
+    explicit SvxViewHint(HintType eType);
+    HintType GetHintType() const { return meHintType;}
 
 private:
     HintType meHintType;
diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx
index d918aecb3f37..6af42ee5a93d 100644
--- a/include/vcl/textdata.hxx
+++ b/include/vcl/textdata.hxx
@@ -128,12 +128,10 @@ private:
     sal_uLong   mnValue;
 
 public:
-            TYPEINFO_OVERRIDE();
             TextHint( sal_uLong nId );
             TextHint( sal_uLong nId, sal_uLong nValue );
 
     sal_uLong   GetValue() const        { return mnValue; }
-    void    SetValue( sal_uLong n )     { mnValue = n; }
 };
 
 struct TEIMEInfos