Tag: cws_src680_dba204b
User: fs      
Date: 2006/07/12 23:45:09

Modified:
   dba/dbaccess/source/core/inc/column.hxx

Log:
 RESYNC: (1.26-1.27); FILE MERGED

File Changes:

Directory: /dba/dbaccess/source/core/inc/
=========================================

File [changed]: column.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/inc/column.hxx?r1=1.26.10.1&r2=1.26.10.2
Delta lines:  +25 -13
---------------------
--- column.hxx  10 Jul 2006 08:00:19 -0000      1.26.10.1
+++ column.hxx  13 Jul 2006 06:45:07 -0000      1.26.10.2
@@ -132,7 +132,6 @@
                                                                                
                ::com::sun::star::lang::XUnoTunnel > OColumnBase;
 
        //------------------------------------------------------------
-       class OColumnSettings;
        class OColumn   :public comphelper::OBaseMutex
                                        ,public OColumnBase
                                        ,public ::cppu::OPropertySetHelper
@@ -250,13 +249,28 @@
        //============================================================
        //= IColumnFactory - used by OColumns for creating new columns
        //============================================================
-       class IColumnFactory
+       class SAL_NO_VTABLE IColumnFactory
        {
        public:
-               virtual OColumn*        createColumn(const ::rtl::OUString& 
_rName) const = 0;
-               virtual ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > createEmptyObject() = 0;
-               virtual void columnDropped(const ::rtl::OUString& _sName) = 0;
-               virtual void columnCloned(const 
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& 
_xClone) = 0;
+        /** creates a OColumn object which should represent the column with a 
given name
+        */
+               virtual OColumn*
+            createColumn( const ::rtl::OUString& _rName ) const = 0;
+
+        /** creates a column descriptor object.
+
+            A column descriptor object is used to append new columns to the 
collection. If such an append
+            actually happened, columnAppended is called afterwards.
+        */
+               virtual ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > createColumnDescriptor() = 0;
+
+        /** notifies that a column, created from a column descriptor, has been 
appended
+        */
+        virtual void columnAppended( const ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ) = 0;
+
+        /** notifies that a column with a given name has been dropped
+        */
+               virtual void columnDropped( const ::rtl::OUString& _sName ) = 0;
        };
 
        //============================================================
@@ -267,7 +281,6 @@
        typedef ::std::hash_map<rtl::OUString, OColumn*, 
::comphelper::UStringMixHash, ::comphelper::UStringMixEqual> OColumnMap;
        typedef ::std::vector<OColumn*> OColumnArray;
 
-       class ODBTable;
        class OContainerMediator;
        typedef ::cppu::ImplHelper1< ::com::sun::star::container::XChild > 
TXChild;
        typedef connectivity::OColumnsHelper OColumns_BASE;
@@ -293,9 +306,8 @@
 
                virtual void impl_refresh() 
throw(::com::sun::star::uno::RuntimeException);
                virtual connectivity::sdbcx::ObjectType createObject(const 
::rtl::OUString& _rName);
-               virtual ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > createEmptyObject();
-               virtual connectivity::sdbcx::ObjectType cloneObject(const 
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& 
_xDescriptor);
-               virtual void appendObject( const 
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& 
descriptor );
+               virtual ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > createDescriptor();
+        virtual connectivity::sdbcx::ObjectType appendObject( const 
::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet >& descriptor );
                virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString 
_sElementName);
 
        public:




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to