5 files changed, 37 insertions, 8 deletions
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index 63ffef6cdd61..cf888adf9dcf 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -40,6 +40,7 @@ class SbiBreakpoints;
 class SbiImage;
 class SbProcedureProperty;
 class SbIfaceMapperMethod;
+class SbClassModuleObject;
 
 struct SbClassData;
 class SbModuleImpl;
@@ -125,11 +126,12 @@ public:
     BOOL LoadBinaryData( SvStream& );
     BOOL ExceedsLegacyModuleSize();
     void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
-        BOOL IsVBACompat();
-        void SetVBACompat( BOOL bCompat );
-        INT32 GetModuleType() { return mnType; }
-        void SetModuleType( INT32 nType ) { mnType = nType; }
+    BOOL IsVBACompat() const;
+    void SetVBACompat( BOOL bCompat );
+    INT32 GetModuleType() { return mnType; }
+    void SetModuleType( INT32 nType ) { mnType = nType; }
     bool GetIsProxyModule() { return bIsProxyModule; }
+    bool createCOMWrapperForIface( ::com::sun::star::uno::Any& o_rRetAny, SbClassModuleObject* pProxyClassModuleObject );
 };
 
 #ifndef __SB_SBMODULEREF_HXX
diff --git a/basic/inc/basic/sbobjmod.hxx b/basic/inc/basic/sbobjmod.hxx
index ad804dcfab38..3d638a475f9a 100644
--- a/basic/inc/basic/sbobjmod.hxx
+++ b/basic/inc/basic/sbobjmod.hxx
@@ -62,6 +62,7 @@ public:
 
 class SbUserFormModule : public SbObjModule
 {
+    com::sun::star::script::ModuleInfo m_mInfo;
     css::uno::Reference<css::lang::XEventListener> m_DialogListener;
     css::uno::Reference<css::awt::XDialog> m_xDialog;
     css::uno::Reference<css::frame::XModel> m_xModel;
@@ -70,7 +71,7 @@ class SbUserFormModule : public SbObjModule
     SbUserFormModule( const SbUserFormModule& );
     SbUserFormModule();
 
-protected:
+//protected:
     virtual void InitObject();
 public:
     TYPEINFO();
@@ -85,8 +86,23 @@ public:
     void triggerDeActivateEvent();
     void triggerInitializeEvent();
     void triggerTerminateEvent();
+
+    class SbUserFormModuleInstance* CreateInstance();
 };
 
+class SbUserFormModuleInstance : public SbUserFormModule
+{
+    SbUserFormModule* m_pParentModule;
+
+public:
+    SbUserFormModuleInstance( SbUserFormModule* pParentModule, const String& rName,
+        const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );
+
+    virtual BOOL IsClass( const String& ) const;
+    virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
+};
+
+
 #ifndef __SB_SBOBJMODULEREF_HXX
 #define __SB_SBOBJMODULEREF_HXX
 
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index 1254716c84e6..2eb194708739 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -171,8 +171,8 @@ class SbxArray : public SbxBase
 {
 // #100883 Method to set method directly to parameter array
     friend class SbMethod;
-    friend class SbTypeFactory;
     friend class SbClassModuleObject;
+    friend SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj );
     void PutDirect( SbxVariable* pVar, UINT32 nIdx );
 
     SbxArrayImpl* mpSbxArrayImpl; // Impl data
diff --git a/basic/inc/basic/sbxdef.hxx b/basic/inc/basic/sbxdef.hxx
index 8206fa2b1667..89322be776f9 100644
--- a/basic/inc/basic/sbxdef.hxx
+++ b/basic/inc/basic/sbxdef.hxx
@@ -105,6 +105,9 @@ enum SbxDataType {
     SbxUSERn  = 2047    // last user defined data type
 };
 
+const UINT32 SBX_TYPE_WITH_EVENTS_FLAG = 0x10000;
+const UINT32 SBX_FIXED_LEN_STRING_FLAG = 0x10000;   // same value as above as no conflict possible
+
 #endif
 
 #ifndef _SBX_OPERATOR
@@ -313,6 +316,7 @@ enum SbxError {                 // Ergebnis einer Rechenoperation/Konversion
 #define SBX_NO_BROADCAST 0x2000 // No broadcast on Get/Put
 #define SBX_REFERENCE 0x4000    // Parameter is Reference (DLL-call)
 #define SBX_NO_MODIFY 0x8000    // SetModified is suppressed
+#define SBX_WITH_EVENTS 0x0080  // Same value as unused SBX_HIDDEN
 
 // Broadcaster-IDs:
 #define SBX_HINT_DYING          SFX_HINT_DYING
diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 715d8c46f0f3..4d9d19b52a59 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -230,8 +230,6 @@ class SbxValueImpl;
 
 class SbxValue : public SbxBase
 {
-    friend class SbiDllMgr; // BASIC-Runtime must access aData
-
     SbxValueImpl* mpSbxValueImplImpl;   // Impl data
 
     // #55226 Transport additional infos
@@ -289,6 +287,8 @@ public:
     const SbxValues& GetValues_Impl() const { return aData; }
     virtual BOOL Put( const SbxValues& );
 
+    inline SbxValues * data() { return &aData; }
+
     SbxINT64 GetCurrency() const;
     SbxINT64 GetLong64() const;
     SbxUINT64 GetULong64() const;
@@ -447,6 +447,9 @@ class SbxVariable : public SbxValue
     String           maName;            // Name, if available
     SbxArrayRef      mpPar;             // Parameter-Array, if set
     USHORT           nHash;             // Hash-ID for search
+
+    SbxVariableImpl* getImpl( void );
+
 protected:
     SbxInfoRef  pInfo;              // Probably called information
     sal_uIntPtr nUserData;          // User data for Call()
@@ -492,6 +495,10 @@ public:
     inline SbxObject* GetParent() { return pParent; }
     virtual void SetParent( SbxObject* );
 
+    const String& GetDeclareClassName( void );
+    void SetDeclareClassName( const String& );
+    void SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener );
+
     static USHORT MakeHashCode( const String& rName );
 };