BASIC : Remove useless SbxBase::GetCreator

Change-Id: I3d9aa358ffaefc11b7d2427f2b567c360be2c667
Reviewed-on: https://gerrit.libreoffice.org/28434Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

basic/inc/sbprop.hxx

@@ -35,7 +35,7 @@ class BASIC_DLLPUBLIC SbProperty : public SbxProperty
     BASIC_DLLPRIVATE SbProperty( const OUString&, SbxDataType, SbModule* );
     virtual ~SbProperty();
 public:
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICPROP,1);
+    SBX_DECL_PERSIST_NODATA(SBXID_BASICPROP,1);
     SbModule* GetModule() { return pMod; }
 };
 

basic/source/inc/sbjsmeth.hxx

@@ -33,7 +33,7 @@ public:
     SbJScriptMethod( const OUString&, SbxDataType, SbModule* );
     virtual ~SbJScriptMethod();
 
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMETH,2);
+    SBX_DECL_PERSIST_NODATA(SBXID_JSCRIPTMETH,2);
 };
 
 

basic/source/inc/sbjsmod.hxx

@@ -31,7 +31,7 @@ class SbJScriptModule : public SbModule
     virtual bool LoadData( SvStream&, sal_uInt16 ) override;
     virtual bool StoreData( SvStream& ) const override;
 public:
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMOD,1);
+    SBX_DECL_PERSIST_NODATA(SBXID_JSCRIPTMOD,1);
     SbJScriptModule( const OUString& );       // hand through
 };
 

basic/source/sbx/sbxbase.cxx

@@ -243,7 +243,7 @@ bool SbxBase::Store( SvStream& rStrm )
 {
     if( ( nFlags & SbxFlagBits::DontStore ) == SbxFlagBits::NONE )
     {
-        rStrm.WriteUInt32( GetCreator() )
+        rStrm.WriteUInt32( SBXCR_SBX )
              .WriteUInt16( GetSbxId() )
              .WriteUInt16( static_cast<sal_uInt16>(GetFlags()) )
              .WriteUInt16( GetVersion() );

include/basic/sbmeth.hxx

@@ -51,7 +51,7 @@ class BASIC_DLLPUBLIC SbMethod : public SbxMethod
     virtual ~SbMethod();
 
 public:
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMETHOD,2);
+    SBX_DECL_PERSIST_NODATA(SBXID_BASICMETHOD,2);
     virtual SbxInfo* GetInfo() override;
     SbxArray*  GetStatics();
     void       ClearStatics();

include/basic/sbmod.hxx

@@ -94,7 +94,7 @@ protected:
     void handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rHint );
     virtual ~SbModule();
 public:
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2);
+    SBX_DECL_PERSIST_NODATA(SBXID_BASICMOD,2);
                     SbModule( const OUString&, bool bCompat = false );
     virtual void    SetParent( SbxObject* ) override;
     virtual void    Clear() override;

include/basic/sbstar.hxx

@@ -85,7 +85,7 @@ protected:
 
 public:
 
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASIC,1);
+    SBX_DECL_PERSIST_NODATA(SBXID_BASIC,1);
 
     StarBASIC( StarBASIC* pParent = nullptr, bool bIsDocBasic = false );
 

include/basic/sbx.hxx

@@ -133,7 +133,7 @@ protected:
     virtual bool StoreData( SvStream& ) const override;
 
 public:
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_ARRAY,1);
+    SBX_DECL_PERSIST_NODATA(SBXID_ARRAY,1);
     SbxArray( SbxDataType=SbxVARIANT );
     SbxArray( const SbxArray& );
     SbxArray& operator=( const SbxArray& );
@@ -180,7 +180,7 @@ protected:
     virtual bool StoreData( SvStream& ) const override;
     virtual ~SbxDimArray();
 public:
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_DIMARRAY,1);
+    SBX_DECL_PERSIST_NODATA(SBXID_DIMARRAY,1);
     SbxDimArray( SbxDataType=SbxVARIANT );
     SbxDimArray( const SbxDimArray& );
     SbxDimArray& operator=( const SbxDimArray& );
@@ -222,7 +222,7 @@ protected:
     virtual void CollRemove( SbxArray* pPar );
 
 public:
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_COLLECTION,1);
+    SBX_DECL_PERSIST_NODATA(SBXID_COLLECTION,1);
     SbxCollection( const OUString& rClassname );
     SbxCollection( const SbxCollection& );
     SbxCollection& operator=( const SbxCollection& );
@@ -242,7 +242,7 @@ protected:
     virtual void CollAdd( SbxArray* pPar ) override;
     virtual void CollRemove( SbxArray* pPar ) override;
 public:
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_FIXCOLLECTION,1);
+    SBX_DECL_PERSIST_NODATA(SBXID_FIXCOLLECTION,1);
     SbxStdCollection( const OUString& rClassname, const OUString& rElemClass );
     SbxStdCollection( const SbxStdCollection& );
     SbxStdCollection& operator=( const SbxStdCollection& );

include/basic/sbxcore.hxx

@@ -33,8 +33,7 @@ class SvStream;
 // Load() and Store() must not be overridden.
 
 // This version of the Macros does not define Load/StorePrivateData()-methods
-#define SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer )       \
-    virtual sal_uInt32 GetCreator() const override { return nCre;   }    \
+#define SBX_DECL_PERSIST_NODATA( nSbxId, nVer )       \
     virtual sal_uInt16 GetVersion() const override { return nVer;   }    \
     virtual sal_uInt16 GetSbxId() const override   { return nSbxId; }
 
@@ -53,7 +52,6 @@ protected:
     SbxBase& operator=( const SbxBase& );
     virtual ~SbxBase();
 
-    virtual sal_uInt32 GetCreator() const = 0 ;
     virtual sal_uInt16 GetVersion() const = 0;
     virtual sal_uInt16 GetSbxId() const = 0;
 

include/basic/sbxmeth.hxx

@@ -28,7 +28,7 @@ class BASIC_DLLPUBLIC SbxMethod : public SbxVariable
     bool           mbIsRuntimeFunction;
     SbxDataType    mbRuntimeFunctionReturnType;
 public:
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_METHOD,1);
+    SBX_DECL_PERSIST_NODATA(SBXID_METHOD,1);
     SbxMethod( const OUString& r, SbxDataType t, bool bIsRuntimeFunction=false );
     SbxMethod( const SbxMethod& r );
     virtual ~SbxMethod();

include/basic/sbxobj.hxx

@@ -42,7 +42,7 @@ protected:
     virtual ~SbxObject();
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 public:
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_OBJECT,1);
+    SBX_DECL_PERSIST_NODATA(SBXID_OBJECT,1);
     SbxObject( const OUString& rClassname );
     SbxObject( const SbxObject& );
     SbxObject& operator=( const SbxObject& );

include/basic/sbxprop.hxx

@@ -26,7 +26,7 @@
 class BASIC_DLLPUBLIC SbxProperty : public SbxVariable
 {
 public:
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_PROPERTY,1);
+    SBX_DECL_PERSIST_NODATA(SBXID_PROPERTY,1);
     SbxProperty( const OUString& r, SbxDataType t );
     SbxProperty( const SbxProperty& r ) : SvRefBase( r ), SbxVariable( r ) {}
     virtual ~SbxProperty();

include/basic/sbxvar.hxx

@@ -88,7 +88,7 @@ protected:
     virtual bool LoadData( SvStream&, sal_uInt16 ) override;
     virtual bool StoreData( SvStream& ) const override;
 public:
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VALUE,1);
+    SBX_DECL_PERSIST_NODATA(SBXID_VALUE,1);
     SbxValue();
     SbxValue( SbxDataType, void* = nullptr );
     SbxValue( const SbxValue& );
@@ -240,7 +240,7 @@ protected:
     virtual bool LoadData( SvStream&, sal_uInt16 ) override;
     virtual bool StoreData( SvStream& ) const override;
 public:
-    SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VARIABLE,2);
+    SBX_DECL_PERSIST_NODATA(SBXID_VARIABLE,2);
     SbxVariable();
     SbxVariable( SbxDataType, void* = nullptr );
     SbxVariable( const SbxVariable& );