remove inline dtor

8 files changed, 30 insertions, 54 deletions

diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
index 1a2b89d085e1..6c97e0305a19 100644
--- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VCollection.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $
+ *  last change: $Author: oj $ $Date: 2000-10-17 08:33:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -161,20 +161,10 @@ namespace connectivity
             // the returned object is empty will be filled outside and added to the collection
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createEmptyObject() = 0;
 
-            OCollection(::cppu::OWeakObject& _rParent,sal_Bool _bCase, ::osl::Mutex& _rMutex,const ::std::vector< ::rtl::OUString> &_rVector)
-                     : m_rParent(_rParent)
-                     ,m_rMutex(_rMutex)
-                     ,m_aRefreshListeners(_rMutex)
-                     ,m_aNameMap(_bCase)
-            {
-                for(::std::vector< ::rtl::OUString>::const_iterator i=_rVector.begin(); i != _rVector.end();++i)
-                    m_aElements.push_back(m_aNameMap.insert(m_aNameMap.begin(), ObjectMap::value_type(*i,::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNamed >())));
-            }
+            OCollection(::cppu::OWeakObject& _rParent,sal_Bool _bCase, ::osl::Mutex& _rMutex,const ::std::vector< ::rtl::OUString> &_rVector);
 
         public:
-            virtual ~OCollection()
-            {
-            }
+            virtual ~OCollection();
 
             DECLARE_SERVICE_INFO();
 
diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
index f5b8554fade6..217dec8e7c3d 100644
--- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VColumn.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $
+ *  last change: $Author: oj $ $Date: 2000-10-17 08:35:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -137,7 +137,7 @@ namespace connectivity
                     sal_Bool        _IsCurrency,
                     sal_Bool        _bCase);
 
-            virtual ~OColumn(){}
+            virtual ~OColumn();
 
             DECLARE_SERVICE_INFO();
             //  IMPLEMENT_SERVICE_INFO(OColumn,"com.sun.star.sdbcx.VColumn","com.sun.star.sdbcx.Column");
diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
index 36e968345b76..03e92660e72a 100644
--- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VGroup.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $
+ *  last change: $Author: oj $ $Date: 2000-10-17 08:35:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -132,10 +132,7 @@ namespace connectivity
 
             OGroup(sal_Bool _bCase);
             OGroup( const ::rtl::OUString& _Name,sal_Bool _bCase);
-            virtual ~OGroup()
-            {
-                delete m_pUsers;
-            }
+            virtual ~OGroup();
             DECLARE_SERVICE_INFO();
 
             //XInterface
diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
index a46103319043..289f389a73d6 100644
--- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VIndex.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $
+ *  last change: $Author: oj $ $Date: 2000-10-17 08:35:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -135,10 +135,7 @@ namespace connectivity
                     sal_Bool _isClustered,
                     sal_Bool _bCase);
 
-            virtual ~OIndex( )
-            {
-                delete m_pColumns;
-            }
+            virtual ~OIndex( );
 
             DECLARE_SERVICE_INFO();
 
diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx
index 25741b6dfc78..6c2d98f04c3e 100644
--- a/connectivity/inc/connectivity/sdbcx/VKey.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VKey.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $
+ *  last change: $Author: oj $ $Date: 2000-10-17 08:35:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,10 +123,7 @@ namespace connectivity
                     sal_Int32       _DeleteRule,
                     sal_Bool _bCase);
 
-            virtual ~OKey( )
-            {
-                delete m_pColumns;
-            }
+            virtual ~OKey( );
 
             DECLARE_SERVICE_INFO();
             //XInterface
diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/connectivity/inc/connectivity/sdbcx/VTable.hxx
index 350b61fdc6cc..eb8725376bc0 100644
--- a/connectivity/inc/connectivity/sdbcx/VTable.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VTable.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VTable.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $
+ *  last change: $Author: oj $ $Date: 2000-10-17 08:35:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -153,12 +153,7 @@ namespace connectivity
                     const ::rtl::OUString& _SchemaName  = ::rtl::OUString(),
                     const ::rtl::OUString& _CatalogName = ::rtl::OUString());
 
-            virtual ~OTable()
-            {
-                delete m_pIndexes;
-                delete m_pKeys;
-                delete m_pColumns;
-            }
+            virtual ~OTable();
 
             DECLARE_SERVICE_INFO();
             //XInterface
@@ -195,9 +190,12 @@ namespace connectivity
             virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
 
             // XNamed
-            virtual ::rtl::OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException)
+            virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException)
             {
-                return m_SchemaName + ::rtl::OUString::createFromAscii(".") + m_Name;
+                // this is only correct for tables who haven't a schema or catalog name
+                OSL_ENSHURE(!m_CatalogName.getLength(),"getName(): forgot to overload getName()!");
+                OSL_ENSHURE(!m_SchemaName.getLength(),"getName(): forgot to overload getName()!");
+                return m_Name;
             }
             virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException)
             {}
diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/connectivity/inc/connectivity/sdbcx/VUser.hxx
index 2a33df59f864..fcff3c22f41b 100644
--- a/connectivity/inc/connectivity/sdbcx/VUser.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VUser.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VUser.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $
+ *  last change: $Author: oj $ $Date: 2000-10-17 08:35:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,10 +127,7 @@ namespace connectivity
             OUser(sal_Bool _bCase);
             OUser(const ::rtl::OUString& _Name,sal_Bool _bCase);
 
-            virtual ~OUser( )
-            {
-                delete m_pGroups;
-            }
+            virtual ~OUser( );
 
             DECLARE_SERVICE_INFO();
 
diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/connectivity/inc/connectivity/sdbcx/VView.hxx
index fa2de1d5e88d..27adc01641ec 100644
--- a/connectivity/inc/connectivity/sdbcx/VView.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VView.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VView.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-11 10:48:21 $
+ *  last change: $Author: oj $ $Date: 2000-10-17 08:35:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -135,7 +135,7 @@ namespace connectivity
                     const ::rtl::OUString& _rCommand = ::rtl::OUString(),
                     const ::rtl::OUString& _rSchemaName = ::rtl::OUString(),
                     const ::rtl::OUString& _rCatalogName = ::rtl::OUString());
-            virtual ~OView(){}
+            virtual ~OView();
 
             // ODescriptor
             virtual void construct();