User: kz Date: 05/01/21 09:02:35 Modified: /dba/dbaccess/source/core/api/ definitioncolumn.cxx
Log: INTEGRATION: CWS dba22 (1.19.28); FILE MERGED 2005/01/03 12:41:47 oj 1.19.28.1: #i39686# correct property index File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: definitioncolumn.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/definitioncolumn.cxx?r1=1.19&r2=1.20 Delta lines: +13 -10 --------------------- --- definitioncolumn.cxx 22 Oct 2004 08:56:41 -0000 1.19 +++ definitioncolumn.cxx 21 Jan 2005 17:02:32 -0000 1.20 @@ -100,6 +100,7 @@ #define HAS_DESCRIPTION 0x00000001 #define HAS_DEFAULTVALUE 0x00000002 #define HAS_ROWVERSION 0x00000004 +#define HAS_AUTOINCREMENT_CREATION 0x00000008 //============================================================ //= OTableColumnDescriptor @@ -494,6 +495,7 @@ m_nColTypeID |= xInfo->hasPropertyByName(PROPERTY_DESCRIPTION) ? HAS_DESCRIPTION : 0; m_nColTypeID |= xInfo->hasPropertyByName(PROPERTY_DEFAULTVALUE) ? HAS_DEFAULTVALUE : 0; m_nColTypeID |= xInfo->hasPropertyByName(PROPERTY_ISROWVERSION) ? HAS_ROWVERSION : 0; + m_nColTypeID |= xInfo->hasPropertyByName(PROPERTY_AUTOINCREMENTCREATION) ? HAS_AUTOINCREMENT_CREATION : 0; m_xAggregate->getPropertyValue(PROPERTY_NAME) >>= m_sName; } @@ -630,13 +632,8 @@ ++nPropertyCount; if (nId & HAS_ROWVERSION) ++nPropertyCount; - - sal_Bool bAutoIncrement = sal_False; - if ( m_xAggregate.is() && m_xAggregate->getPropertySetInfo().is() && m_xAggregate->getPropertySetInfo()->hasPropertyByName( PROPERTY_AUTOINCREMENTCREATION) ) - { - bAutoIncrement = sal_True; + if ( nId & HAS_AUTOINCREMENT_CREATION ) ++nPropertyCount; - } Sequence< Property> aDescriptor(nPropertyCount); Property* pDesc = aDescriptor.getArray(); @@ -644,7 +641,7 @@ // Description, Defaultvalue, IsRowVersion DECL_PROP2(ALIGN, sal_Int32, BOUND,MAYBEVOID); - if ( bAutoIncrement ) + if ( nId & HAS_AUTOINCREMENT_CREATION ) { DECL_PROP1(AUTOINCREMENTCREATION,::rtl::OUString, MAYBEVOID); } @@ -869,6 +866,8 @@ nPropertyCount++; if (nId & HAS_ROWVERSION) nPropertyCount++; + if ( nId & HAS_AUTOINCREMENT_CREATION ) + ++nPropertyCount; Sequence< Property> aDescriptor(nPropertyCount); Property* pDesc = aDescriptor.getArray(); @@ -876,6 +875,10 @@ // Description, Defaultvalue, IsRowVersion DECL_PROP2(ALIGN, sal_Int32, BOUND, MAYBEVOID); + if ( nId & HAS_AUTOINCREMENT_CREATION ) + { + DECL_PROP1(AUTOINCREMENTCREATION,::rtl::OUString, MAYBEVOID); + } DECL_PROP2(CONTROLDEFAULT, ::rtl::OUString, BOUND,MAYBEVOID); DECL_PROP1_IFACE(CONTROLMODEL, XPropertySet , BOUND); if (nId & HAS_DEFAULTVALUE) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
