descriptors inserted

1 files changed, 27 insertions, 28 deletions

diff --git a/connectivity/source/inc/ado/AColumn.hxx b/connectivity/source/inc/ado/AColumn.hxx
index cff2e1e6fb82..fcb10c8aba83 100644
--- a/connectivity/source/inc/ado/AColumn.hxx
+++ b/connectivity/source/inc/ado/AColumn.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AColumn.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:24 $
+ *  last change: $Author: oj $ $Date: 2000-10-30 07:34:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef _CONNECTIVITY_ADO_COLUMN_HXX_
 #define _CONNECTIVITY_ADO_COLUMN_HXX_
 
-#ifndef _CONNECTIVITY_SDBCX_COLUMN_HXX_
-#include "connectivity/sdbcx/VColumn.hxx"
+#ifndef _CONNECTIVITY_SDBCX_COLUMNDECRIPTOR_HXX_
+#include "connectivity/sdbcx/VColumnDescriptor.hxx"
 #endif
 #ifndef _CONNECTIVITY_ADO_AWRAPADOX_HXX_
 #include "ado/Awrapadox.hxx"
@@ -76,48 +76,47 @@ namespace connectivity
 {
     namespace ado
     {
-        typedef sdbcx::OColumn OColumn_ADO;
-        class OAdoColumn :  public OColumn_ADO,
-                            public ::com::sun::star::lang::XUnoTunnel
+        typedef sdbcx::OColumnDescriptor OColumn_ADO;
+        class OAdoColumnDescriptor :    public OColumn_ADO,
+                                        public ::com::sun::star::lang::XUnoTunnel
         {
             WpADOColumn     m_aColumn;
         protected:
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                     sal_Int32 nHandle,
-                                                                        const ::com::sun::star::uno::Any& rValue
+                                    const ::com::sun::star::uno::Any& rValue
                                                      )
-                                                                                                         throw (::com::sun::star::uno::Exception);
+                                 throw (::com::sun::star::uno::Exception);
             virtual void SAL_CALL getFastPropertyValue(
-                                                                        ::com::sun::star::uno::Any& rValue,
+                                    ::com::sun::star::uno::Any& rValue,
                                     sal_Int32 nHandle
                                          ) const;
         public:
             DECLARE_CTY_DEFAULTS( OColumn_ADO);
 
-            OAdoColumn(sal_Bool _bCase,_ADOColumn* _pColumn = NULL);
-            OAdoColumn(const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _TypeName,
-                    const ::rtl::OUString& _DefaultValue,
-                    sal_Int32       _IsNullable,
-                    sal_Int32       _Precision,
-                    sal_Int32       _Scale,
-                    sal_Int32       _Type,
-                    sal_Bool        _IsAutoIncrement,
-                    sal_Bool        _IsCurrency,
-                    sal_Bool _bCase);
-
-            //  virtual void construct();
-
+            OAdoColumnDescriptor(sal_Bool _bCase,_ADOColumn* _pColumn = NULL);
             // XInterface
-                        ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+            ::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);
+            virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
             // com::sun::star::lang::XUnoTunnel
-                        virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
-                        static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
+            virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
+            static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
             WpADOColumn     getColumnImpl() const { return m_aColumn;}
         };
+
+        class OAdoColumn;
+        typedef ::comphelper::OPropertyArrayUsageHelper<OAdoColumn> OAdoColumn_PROP;
+        class OAdoColumn :   public OAdoColumnDescriptor
+                            ,public OAdoColumn_PROP
+        {
+        protected:
+            DECLARE_CTY_PROPERTY(OAdoColumn_PROP,OAdoColumn)
+        public:
+            DECLARE_SERVICE_INFO();
+            OAdoColumn(sal_Bool _bCase, _ADOColumn* _pColumn=NULL);
+        };
     }
 }
 #endif // _CONNECTIVITY_ADO_COLUMN_HXX_