removetooltypes01: Rebase to DEV300m98

3 files changed, 11 insertions, 50 deletions

diff --git a/sot/inc/sot/factory.hxx b/sot/inc/sot/factory.hxx
index 58cd26e3b5a0..064c4b6388a1 100644
--- a/sot/inc/sot/factory.hxx
+++ b/sot/inc/sot/factory.hxx
@@ -73,7 +73,6 @@ public:
     void                PutSuperClass( const SotFactory * );
     virtual void *      CreateInstance( SotObject ** ppObj = NULL ) const;
     void *              CastAndAddRef( SotObject * ) const;
-    void *              AggCastAndAddRef( SotObject * ) const;
 
     sal_Bool                Is( const SotFactory * pSuperClass ) const;
     const SotFactory *  GetSuper( sal_uInt16 nPos ) const
diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx
index 163f6932d66d..0f72e61510a9 100644
--- a/sot/inc/sot/object.hxx
+++ b/sot/inc/sot/object.hxx
@@ -381,22 +381,17 @@ SotFactory * ClassName::pFactory = NULL;                                   \
 #pragma warning(disable: 4250)
 #endif
 
-class SvAggregateMemberList;
 struct IUnknown;
 class SOT_DLLPUBLIC SotObject : virtual public SvRefBase
 {
 friend class SotFactory;
 friend class SvObject;
-    SvAggregateMemberList * pAggList; // fuer Aggregation, erstes ist das MainObj
-    sal_uInt16      nStrongLockCount;
-    sal_uInt16      nOwnerLockCount;
-    sal_Bool        bOwner:1,
-                bSVObject:1,        // Ist Proxy, dann sal_True wenn andere Seite SV ist
-                bInClose:1;         // sal_True, im DoClose
-
-    void *      DownAggCast( const SotFactory * pFact );
-    void        RemoveInterface( sal_uLong );
-    void        RemoveInterface( SotObject * );
+    sal_uInt16  nStrongLockCount;
+    sal_uInt16  nOwnerLockCount;
+    sal_Bool    bOwner:1,
+                bSVObject:1,        // Ist Proxy, dann TRUE wenn andere Seite SV ist
+                bInClose:1;         // TRUE, im DoClose
+
 #if defined (GCC) && (defined (C281) || defined (C290) || defined (C291))
 public:
 #else
@@ -414,25 +409,10 @@ public:
     virtual IUnknown *  GetInterface( const SvGlobalName & );
 
     sal_Bool                Owner() const { return bOwner; }
-    sal_Bool                IsSvObject() const;
-
-    // Methoden fuer die Aggregation (siehe OLE2-Spec)
-    sal_Bool                ShouldDelete();
-    virtual void        QueryDelete();
-    SvAggregateMemberList & GetAggList();
-    void                AddInterface( SotObject * );
-    void                AddInterface( SotFactory * );
-    virtual SotObjectRef CreateAggObj( const SotFactory * );
-    void *              AggCast( const SotFactory * pFact );
-    void *              CastAndAddRef( const SotFactory * pFact );
-    SotObject *         GetMainObj() const;
-
-                        // !!! Read the Manual !!!
-    virtual sal_uInt16      FuzzyLock( sal_Bool bLock, sal_Bool bIntern, sal_Bool bClose );
-    void                Lock( sal_Bool bLock )
-                        {
-                            FuzzyLock( bLock, sal_True, sal_True );
-                        }
+
+    void*               CastAndAddRef( const SotFactory * pFact );
+
+    sal_uInt16              Lock( sal_Bool bLock ); // affects nStrongLockCount
     sal_uInt16              GetOwnerLockCount() const { return nOwnerLockCount; }
     sal_uInt16              GetStrongLockCount() const { return nStrongLockCount; }
 
@@ -450,18 +430,6 @@ private:
 //==================class SotObjectRef======================================
 SV_IMPL_REF(SotObject)
 
-inline SotObjectRef::SotObjectRef( SotObject * pObjP, SvCastEnum )
-{
-    if( pObjP )
-    {
-        pObj = (SotObject *)pObjP->AggCast( SotObject::ClassFactory() );
-        if( pObj )
-            pObj->AddRef();
-    }
-    else
-        pObj = NULL;
-}
-
 //==================class SotObject*List====================================
 SV_DECL_REF_LIST(SotObject,SotObject*)
 SV_IMPL_REF_LIST(SotObject,SotObject*)
diff --git a/sot/inc/sot/sotref.hxx b/sot/inc/sot/sotref.hxx
index ae03032e286e..a6728627ef2c 100644
--- a/sot/inc/sot/sotref.hxx
+++ b/sot/inc/sot/sotref.hxx
@@ -33,14 +33,12 @@
 #endif
 
 //========================================================================
-enum SvCastEnum { SV_AGGREGATION_CAST };
 #ifndef SVT_DECL_SOTOBJECT_DEFINED
 #define SVT_DECL_SOTOBJECT_DEFINED
 class SotObject;
 class SotObjectRef
 {
     PRV_SV_DECL_REF(SotObject)
-    inline SotObjectRef( SotObject * pObjP, SvCastEnum );
 };
 #endif
 
@@ -52,7 +50,6 @@ class ClassName##Ref                                                      \
     PRV_SV_DECL_REF(ClassName)                                            \
     inline          ClassName##Ref( const SotObjectRef & );               \
     inline          ClassName##Ref( SotObject * pObjP );                  \
-    inline          ClassName##Ref( SotObject * pObjP, SvCastEnum );      \
 };
 
 #define SO2_IMPL_REF(ClassName)                                           \
@@ -64,12 +61,9 @@ inline ClassName##Ref::ClassName##Ref( const SotObjectRef & r )           \
 inline ClassName##Ref::ClassName##Ref( SotObject * pObjP )                \
 {                                                                         \
     pObj = (ClassName *)ClassName::ClassFactory()->CastAndAddRef( pObjP );\
-}                                                                         \
-inline ClassName##Ref::ClassName##Ref( SotObject * pObjP, SvCastEnum )    \
-{                                                                         \
-    pObj = (ClassName *)ClassName::ClassFactory()->AggCastAndAddRef( pObjP );\
 }
 
+
 #define SO2_DECL_IMPL_REF(ClassName)                                      \
     SO2_DECL_REF(ClassName)                                               \
     SO2_IMPL_REF(ClassName)