convert SFX_HINT to scoped enum

Notes

(*) In SC, BULK_DATACHANGED was or'ed into the hint id. Replaced with a
dynamic_cast check.

(*) In SC, removed the hint id field from ScIndexHint, no point in
storing the hint id twice

(*) Fold the SfxStyleSheetHintId enum into the new SfxHintId enum, no
point in storing two different hint ids

(*) In some cases, multiple #define's used to map to the same SFX_HINT
value (notably the SFX_HINT_USER* values). I made all of those separate
values.

Change-Id: I990e2fb587335ebc51c9005588c6a44f768d9de5
Reviewed-on: https://gerrit.libreoffice.org/31751
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 6 insertions, 16 deletions

diff --git a/include/basic/sbdef.hxx b/include/basic/sbdef.hxx
index 39576fbe7f87..40071031eff2 100644
--- a/include/basic/sbdef.hxx
+++ b/include/basic/sbdef.hxx
@@ -59,9 +59,6 @@ namespace o3tl {
 #define SBXID_JSCRIPTMOD    0x6a62          // jm: JavaScript Module
 #define SBXID_JSCRIPTMETH   0x6a64          // jm: JavaScript Module
 
-#define SBX_HINT_BASICSTART SFX_HINT_USER04
-#define SBX_HINT_BASICSTOP  SFX_HINT_USER05
-
 enum class PropertyMode
 {
     NONE,
diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx
index e0d57a695d09..2a67dc7ad592 100644
--- a/include/basic/sbmeth.hxx
+++ b/include/basic/sbmeth.hxx
@@ -62,7 +62,7 @@ public:
 
     // Interface to execute a method from the applications
     ErrCode         Call( SbxValue* pRet,  SbxVariable* pCaller = nullptr );
-    virtual void    Broadcast( sal_uInt32 nHintId ) override;
+    virtual void    Broadcast( SfxHintId nHintId ) override;
 };
 
 typedef tools::SvRef<SbMethod> SbMethodRef;
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 35d09c45d450..d52b6ce42d42 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -94,7 +94,7 @@ class BASIC_DLLPUBLIC SbxHint : public SfxHint
 {
     SbxVariable* pVar;
 public:
-    SbxHint( sal_uInt32 n, SbxVariable* v ) : SfxHint( n ), pVar( v ) {}
+    SbxHint( SfxHintId n, SbxVariable* v ) : SfxHint( n ), pVar( v ) {}
     SbxVariable* GetVar() const { return pVar; }
 };
 
@@ -103,7 +103,7 @@ class BASIC_DLLPUBLIC SbxAlias : public SbxVariable, public SfxListener
 {
     SbxVariableRef xAlias;
     virtual ~SbxAlias() override;
-    virtual void Broadcast( sal_uInt32 ) override;
+    virtual void Broadcast( SfxHintId ) override;
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 public:
     SbxAlias( const SbxAlias& );
diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 42863984f68c..44c75dbb03b6 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -200,14 +200,6 @@ namespace o3tl
     template<> struct typed_flags<SbxFlagBits> : is_typed_flags<SbxFlagBits, 0xffff> {};
 }
 
-// Broadcaster-IDs:
-#define SBX_HINT_DYING          SFX_HINT_DYING
-#define SBX_HINT_DATAWANTED     SFX_HINT_USER00
-#define SBX_HINT_DATACHANGED    SFX_HINT_DATACHANGED
-#define SBX_HINT_CONVERTED      SFX_HINT_USER01
-#define SBX_HINT_INFOWANTED     SFX_HINT_USER02
-#define SBX_HINT_OBJECTCHANGED  SFX_HINT_USER03
-
 // List of all creators for Load/Store
 
 #define SBXCR_SBX            0x20584253        // SBX(blank)
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 9ad6cb3f92b5..82acb60f2982 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -28,6 +28,7 @@
 
 
 class SbxDecimal;
+enum class SfxHintId;
 
 struct SbxValues
 {
@@ -82,7 +83,7 @@ protected:
     OUString aPic;  // Picture-String
     OUString aToolString;  // tool string copy
 
-    virtual void Broadcast( sal_uInt32 );      // Broadcast-Call
+    virtual void Broadcast( SfxHintId );      // Broadcast-Call
     virtual ~SbxValue() override;
     virtual bool LoadData( SvStream&, sal_uInt16 ) override;
     virtual bool StoreData( SvStream& ) const override;
@@ -269,7 +270,7 @@ public:
     // Due to data reduction and better DLL-hierarchy currently via casting
     SfxBroadcaster& GetBroadcaster();
     bool IsBroadcaster() const { return pCst != nullptr; }
-    virtual void Broadcast( sal_uInt32 nHintId ) override;
+    virtual void Broadcast( SfxHintId nHintId ) override;
 
     inline const SbxObject* GetParent() const { return pParent; }
     SbxObject* GetParent() { return pParent;}