some problems with refcount resolved

1 files changed, 83 insertions, 100 deletions

diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx
index 9ca8194640ed..418bad244e20 100644
--- a/dbaccess/source/core/inc/table.hxx
+++ b/dbaccess/source/core/inc/table.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: table.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2000-10-30 09:25:01 $
+ *  last change: $Author: oj $ $Date: 2000-11-03 14:41:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,10 +93,6 @@
 #ifndef _CPPUHELPER_COMPBASE2_HXX_
 #include <cppuhelper/compbase7.hxx>
 #endif
-#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_
-#include <comphelper/proparrhlp.hxx>
-#endif
-
 #ifndef _DBASHARED_APITOOLS_HXX_
 #include "apitools.hxx"
 #endif
@@ -113,102 +109,89 @@
 #include <connectivity/sdbcx/VTable.hxx>
 #endif
 
-using namespace dbaccess;
-
-typedef ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > OWeakConnection;
-class OServerComponent;
-//==========================================================================
-//= OTables
-//==========================================================================
-//typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::sdbcx::XColumnsSupplier,
-//                                          ::com::sun::star::sdbcx::XDataDescriptorFactory,
-//                                          ::com::sun::star::sdbcx::XIndexesSupplier,
-//                                          ::com::sun::star::sdbcx::XKeysSupplier,
-//                                          ::com::sun::star::sdbcx::XRename,
-//                                          ::com::sun::star::sdbcx::XAlterTable,
-//                                          ::com::sun::star::lang::XServiceInfo > OTable_Base;
-class ODBTable;
-
-typedef ::comphelper::OPropertyArrayUsageHelper < ODBTable >    ODBTable_PROP;
-typedef connectivity::sdbcx::OTable                     OTable_Base;
-
-class ODBTable  :public ODataSettings_Base
-                ,public ODBTable_PROP
-                ,public OTable_Base
+namespace dbaccess
 {
-protected:
-    OWeakConnection                                 m_aConnection;
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xTable;
-    //  OColumns                                        m_aColumns;
-
-// <properties>
-    sal_Int32                                       m_nPrivileges;
-// </properties>
-
-    void refreshPrimaryKeys(std::vector< ::rtl::OUString>& _rKeys);
-    void refreshForgeinKeys(std::vector< ::rtl::OUString>& _rKeys);
-
-
-    DECLARE_CTY_PROPERTY(ODBTable_PROP,OTable_Base)
-public:
-    /** constructs a wrapper supporting the com.sun.star.sdb.Table service.<BR>
-        @param          _rxConn         the connection the table belongs to
-        @param          _rxTable        the table from the driver can be null
-        @param          _rCatalog       the name of the catalog the table belongs to. May be empty.
-        @param          _rSchema        the name of the schema the table belongs to. May be empty.
-        @param          _rName          the name of the table
-        @param          _rType          the type of the table, as supplied by the driver
-        @param          _rDesc          the description of the table, as supplied by the driver
-    */
-    ODBTable(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >& _rxTable,
-            const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName,
-            const ::rtl::OUString& _rType, const ::rtl::OUString& _rDesc)
-        throw(::com::sun::star::sdbc::SQLException);
-    virtual ~ODBTable();
-
-    // ODescriptor
-    virtual void construct();
-
-    //XInterface
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-    //XTypeProvider
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
-// com::sun::star::lang::XTypeProvider
-    //  virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException);
-
-// com::sun::star::uno::XInterface
-    //  virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException);
-
-// OComponentHelper
-    virtual void SAL_CALL disposing(void);
-
-// ::com::sun::star::lang::XServiceInfo
-    DECLARE_SERVICE_INFO();
-
-// com::sun::star::beans::XPropertySet
-    //  virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const;
-
-// ::com::sun::star::sdbcx::XRename,
-    virtual void SAL_CALL rename( const ::rtl::OUString& _rNewName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
-
-// ::com::sun::star::sdbcx::XAlterTable,
-    virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL alterColumnByIndex( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-
-//  virtual SdbObj* getImplObj() const = 0;
-//  const OColumns& getImplColumns(void) const {return m_aColumns;}
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() const { return m_aConnection; }
-
-    virtual void refreshColumns();
-    virtual void refreshKeys();
-    virtual void refreshIndexes();
-};
 
+    typedef ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > OWeakConnection;
+    //==========================================================================
+    //= OTables
+    //==========================================================================
+    class ODBTable;
+    typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTable >   ODBTable_PROP;
+    typedef connectivity::sdbcx::OTable                             OTable_Base;
+
+    class ODBTable  :public ODataSettings_Base
+                    ,public ODBTable_PROP
+                    ,public OTable_Base
+    {
+    protected:
+        OWeakConnection                                                                 m_aConnection;
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >   m_xTable;
+    // <properties>
+        sal_Int32                                                                       m_nPrivileges;
+    // </properties>
+
+        void refreshPrimaryKeys(std::vector< ::rtl::OUString>& _rKeys);
+        void refreshForgeinKeys(std::vector< ::rtl::OUString>& _rKeys);
+
+
+        DECLARE_CTY_PROPERTY(ODBTable_PROP,OTable_Base)
+    public:
+        /** constructs a wrapper supporting the com.sun.star.sdb.Table service.<BR>
+            @param          _rxConn         the connection the table belongs to
+            @param          _rxTable        the table from the driver can be null
+            @param          _rCatalog       the name of the catalog the table belongs to. May be empty.
+            @param          _rSchema        the name of the schema the table belongs to. May be empty.
+            @param          _rName          the name of the table
+            @param          _rType          the type of the table, as supplied by the driver
+            @param          _rDesc          the description of the table, as supplied by the driver
+        */
+        ODBTable(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >& _rxTable,
+                const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName,
+                const ::rtl::OUString& _rType, const ::rtl::OUString& _rDesc)
+            throw(::com::sun::star::sdbc::SQLException);
+        virtual ~ODBTable();
+
+        // ODescriptor
+        virtual void construct();
+
+        //XInterface
+        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+        //XTypeProvider
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
+    // com::sun::star::lang::XTypeProvider
+        //  virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException);
+
+    // com::sun::star::uno::XInterface
+        //  virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw (::com::sun::star::uno::RuntimeException);
+
+    // OComponentHelper
+        virtual void SAL_CALL disposing(void);
+
+    // ::com::sun::star::lang::XServiceInfo
+        DECLARE_SERVICE_INFO();
+
+    // com::sun::star::beans::XPropertySet
+        //  virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const;
+
+    // ::com::sun::star::sdbcx::XRename,
+        virtual void SAL_CALL rename( const ::rtl::OUString& _rNewName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::sdbcx::XAlterTable,
+        virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL alterColumnByIndex( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() const { return m_aConnection; }
+
+        virtual void refreshColumns();
+        virtual void refreshKeys();
+        virtual void refreshIndexes();
+    };
+}
 #endif // _DBA_CORE_TABLE_HXX_