User: obo Date: 2006/07/10 08:12:33 Modified: dba/dbaccess/source/core/inc/column.hxx
Log: INTEGRATION: CWS qiq (1.25.124); FILE MERGED 2006/06/30 13:28:23 fs 1.25.124.3: warning-free code 2006/06/27 12:03:41 fs 1.25.124.2: RESYNC: (1.25-1.26); FILE MERGED 2006/06/16 11:47:40 fs 1.25.124.1: during #i51143#: refactored VCollection: - createEmptyObject now named createDescriptor - cloneObject removed - appendObject now returns the newly created object (previously done via a subsequent call to cloneObject) 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&r2=1.27 Delta lines: +23 -11 --------------------- --- column.hxx 20 Jun 2006 02:46:37 -0000 1.26 +++ column.hxx 10 Jul 2006 15:12:31 -0000 1.27 @@ -132,7 +132,6 @@ ::com::sun::star::lang::XUnoTunnel > OColumnBase; //------------------------------------------------------------ - class OColumnSettings; class OColumn :public comphelper::OBaseMutex ,public OColumnBase ,public ::cppu::OPropertySetHelper @@ -221,7 +220,7 @@ // Setting of values public: OColumnSettings(); - ~OColumnSettings(); + virtual ~OColumnSettings(); sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, @@ -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]
