#96445# in a non-pro version, count the instances of ADO objects

1 files changed, 48 insertions, 24 deletions

diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx
index 47f2a1d7a0ed..071984993a4f 100644
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Awrapado.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: oj $ $Date: 2001-05-23 09:10:29 $
+ *  last change: $Author: fs $ $Date: 2002-01-16 08:48:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,6 +87,30 @@ namespace connectivity
 {
     namespace ado
     {
+#ifdef DBG_UTIL
+        extern sal_Int32 nAdoObjectCounter;
+
+        template <class IFACE>
+        class WpCountedAdoObject : public WpOLEBase< IFACE >
+        {
+        protected:
+            WpCountedAdoObject( IFACE* _pInt = NULL ) : WpOLEBase< IFACE >( _pInt )
+            {
+                ++nAdoObjectCounter;
+            }
+            ~WpCountedAdoObject()
+            {
+                --nAdoObjectCounter;
+            }
+        };
+#endif
+
+#ifdef DBG_UTIL
+#define OBJECT_BASE     WpCountedAdoObject
+#else
+#define OBJECT_BASE     WpOLEBase
+#endif
+
         class WpADOConnection;
         class WpADOCommand;
         class WpADORecordset;
@@ -98,17 +122,17 @@ namespace connectivity
         typedef WpOLEAppendCollection<ADOFields, ADOField, WpADOField> WpADOFields;
 
         //------------------------------------------------------------------------
-        class WpADOConnection : public WpOLEBase<ADOConnection>
+        class WpADOConnection : public OBJECT_BASE<ADOConnection>
         {
             friend class WpADOCommand;
         public:
 
-            WpADOConnection(ADOConnection* pInt)    :   WpOLEBase<ADOConnection>(pInt){}
+            WpADOConnection(ADOConnection* pInt)    :   OBJECT_BASE<ADOConnection>(pInt){}
 
             WpADOConnection(const WpADOConnection& rhs){operator=(rhs);}
 
              WpADOConnection& operator=(const WpADOConnection& rhs)
-                {WpOLEBase<ADOConnection>::operator=(rhs); return *this;}
+                {OBJECT_BASE<ADOConnection>::operator=(rhs); return *this;}
 
             //////////////////////////////////////////////////////////////////////
 
@@ -207,19 +231,19 @@ namespace connectivity
         };
 
         //------------------------------------------------------------------------
-        class WpADOCommand : public WpOLEBase<ADOCommand>
+        class WpADOCommand : public OBJECT_BASE<ADOCommand>
         {
         public:
             WpADOCommand(){}
             // Konstruktoren, operator=
             // diese rufen nur die Oberklasse
-            WpADOCommand(ADOCommand* pInt)  :   WpOLEBase<ADOCommand>(pInt){}
+            WpADOCommand(ADOCommand* pInt)  :   OBJECT_BASE<ADOCommand>(pInt){}
 
             WpADOCommand(const WpADOCommand& rhs){operator=(rhs);}
 
              WpADOCommand& operator=(const WpADOCommand& rhs)
             {
-                WpOLEBase<ADOCommand>::operator=(rhs); return *this;}
+                OBJECT_BASE<ADOCommand>::operator=(rhs); return *this;}
 
             //////////////////////////////////////////////////////////////////////
 
@@ -246,19 +270,19 @@ namespace connectivity
              sal_Bool Cancel();
         };
         //------------------------------------------------------------------------
-        class WpADOError : public WpOLEBase<ADOError>
+        class WpADOError : public OBJECT_BASE<ADOError>
         {
         public:
 
             // Konstruktoren, operator=
             // diese rufen nur die Oberklasse
 
-            WpADOError(ADOError* pInt):WpOLEBase<ADOError>(pInt){}
+            WpADOError(ADOError* pInt):OBJECT_BASE<ADOError>(pInt){}
 
             WpADOError(const WpADOError& rhs){operator=(rhs);}
 
              WpADOError& operator=(const WpADOError& rhs)
-                {WpOLEBase<ADOError>::operator=(rhs); return *this;}
+                {OBJECT_BASE<ADOError>::operator=(rhs); return *this;}
 
             //////////////////////////////////////////////////////////////////////
 
@@ -274,18 +298,18 @@ namespace connectivity
 
 
         //------------------------------------------------------------------------
-        class WpADOField : public WpOLEBase<ADOField>
+        class WpADOField : public OBJECT_BASE<ADOField>
         {
             //  friend class WpADOFields;
         public:
 
             // Konstruktoren, operator=
             // diese rufen nur die Oberklasse
-            WpADOField(ADOField* pInt=NULL):WpOLEBase<ADOField>(pInt){}
+            WpADOField(ADOField* pInt=NULL):OBJECT_BASE<ADOField>(pInt){}
             WpADOField(const WpADOField& rhs){operator=(rhs);}
 
              WpADOField& operator=(const WpADOField& rhs)
-                {WpOLEBase<ADOField>::operator=(rhs); return *this;}
+                {OBJECT_BASE<ADOField>::operator=(rhs); return *this;}
             //////////////////////////////////////////////////////////////////////
 
              ADOProperties* get_Properties();
@@ -324,17 +348,17 @@ namespace connectivity
 
 
         //------------------------------------------------------------------------
-        class WpADOProperty: public WpOLEBase<ADOProperty>
+        class WpADOProperty: public OBJECT_BASE<ADOProperty>
         {
             friend class WpADOProperties;
 
         public:
             // Konstruktoren, operator=
             // diese rufen nur die Oberklasse
-            WpADOProperty(ADOProperty* pInt):WpOLEBase<ADOProperty>(pInt){}
+            WpADOProperty(ADOProperty* pInt):OBJECT_BASE<ADOProperty>(pInt){}
             WpADOProperty(const WpADOProperty& rhs){operator=(rhs);}
              WpADOProperty& operator=(const WpADOProperty& rhs)
-                {WpOLEBase<ADOProperty>::operator=(rhs); return *this;}
+                {OBJECT_BASE<ADOProperty>::operator=(rhs); return *this;}
             //////////////////////////////////////////////////////////////////////
 
              OLEVariant GetValue() const;
@@ -347,17 +371,17 @@ namespace connectivity
         };
 
 
-        class WpADORecordset : public WpOLEBase<ADORecordset>
+        class WpADORecordset : public OBJECT_BASE<ADORecordset>
         {
 
         public:
             // Konstruktoren, operator=
             // diese rufen nur die Oberklasse
-            WpADORecordset(ADORecordset* pInt=NULL):WpOLEBase<ADORecordset>(pInt){}
+            WpADORecordset(ADORecordset* pInt=NULL):OBJECT_BASE<ADORecordset>(pInt){}
             WpADORecordset(const WpADORecordset& rhs){operator=(rhs);}
              WpADORecordset& operator=(const WpADORecordset& rhs)
             {
-                WpOLEBase<ADORecordset>::operator=(rhs);
+                OBJECT_BASE<ADORecordset>::operator=(rhs);
                 return *this;
             }
             ~WpADORecordset()
@@ -413,15 +437,15 @@ namespace connectivity
         };
 
         //------------------------------------------------------------------------
-        class WpADOParameter:public WpOLEBase<ADOParameter>
+        class WpADOParameter:public OBJECT_BASE<ADOParameter>
         {
         public:
             // Konstruktoren, operator=
             // diese rufen nur die Oberklasse
-            WpADOParameter(ADOParameter* pInt):WpOLEBase<ADOParameter>(pInt){}
-            WpADOParameter(const WpADOParameter& rhs):WpOLEBase<ADOParameter>(rhs){}
+            WpADOParameter(ADOParameter* pInt):OBJECT_BASE<ADOParameter>(pInt){}
+            WpADOParameter(const WpADOParameter& rhs):OBJECT_BASE<ADOParameter>(rhs){}
              WpADOParameter& operator=(const WpADOParameter& rhs)
-                {WpOLEBase<ADOParameter>::operator=(rhs); return *this;}
+                {OBJECT_BASE<ADOParameter>::operator=(rhs); return *this;}
             //////////////////////////////////////////////////////////////////////
 
              ::rtl::OUString GetName() const ;