Tag: mws_ooh680 User: kz Date: 2008-01-18 15:59:50+0000 Modified: dba/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
Log: INTEGRATION: CWS dba24d_OOH680 (1.26.70); FILE MERGED 2007/11/26 15:14:16 oj 1.26.70.3: #i49703# copy table settings 2007/11/15 15:17:33 fs 1.26.70.2: #i81658# copy-ctor: properly initialize m_nType / also init the TypeName when constructing from a property set 2007/11/15 10:06:31 fs 1.26.70.1: #i81658# also obtain the type name in ctor File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: FieldDescriptions.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx?r1=1.26&r2=1.26.106.1 Delta lines: +23 -16 --------------------- --- FieldDescriptions.cxx 2007-07-06 08:42:26+0000 1.26 +++ FieldDescriptions.cxx 2008-01-18 15:59:47+0000 1.26.106.1 @@ -99,12 +99,16 @@ OFieldDescription::OFieldDescription( const OFieldDescription& rDescr ) :m_aDefaultValue(rDescr.m_aDefaultValue) ,m_aControlDefault(rDescr.m_aControlDefault) + ,m_aWidth(rDescr.m_aWidth) + ,m_aRelativePosition(rDescr.m_aRelativePosition) ,m_pType(rDescr.m_pType) + ,m_xDest(rDescr.m_xDest) + ,m_xDestInfo(rDescr.m_xDestInfo) ,m_sName(rDescr.m_sName) ,m_sTypeName(rDescr.m_sTypeName) ,m_sDescription(rDescr.m_sDescription) ,m_sAutoIncrementValue(rDescr.m_sAutoIncrementValue) - ,m_nType(DataType::VARCHAR) + ,m_nType(rDescr.m_nType) ,m_nPrecision(rDescr.m_nPrecision) ,m_nScale(rDescr.m_nScale) ,m_nIsNullable(rDescr.m_nIsNullable) @@ -112,6 +116,7 @@ ,m_eHorJustify(rDescr.m_eHorJustify) ,m_bIsAutoIncrement(rDescr.m_bIsAutoIncrement) ,m_bIsPrimaryKey(rDescr.m_bIsPrimaryKey) + ,m_bIsCurrency(rDescr.m_bIsCurrency) ,m_bHidden(rDescr.m_bHidden) { DBG_CTOR(OFieldDescription,NULL); @@ -164,6 +169,8 @@ SetAutoIncrementValue(::comphelper::getString(xAffectedCol->getPropertyValue(PROPERTY_AUTOINCREMENTCREATION))); if(xPropSetInfo->hasPropertyByName(PROPERTY_TYPE)) SetTypeValue(::comphelper::getINT32(xAffectedCol->getPropertyValue(PROPERTY_TYPE))); + if (xPropSetInfo->hasPropertyByName(PROPERTY_TYPENAME)) + SetTypeName(::comphelper::getString(xAffectedCol->getPropertyValue(PROPERTY_TYPENAME))); if(xPropSetInfo->hasPropertyByName(PROPERTY_PRECISION)) SetPrecision(::comphelper::getINT32(xAffectedCol->getPropertyValue(PROPERTY_PRECISION))); if(xPropSetInfo->hasPropertyByName(PROPERTY_SCALE)) @@ -179,7 +186,7 @@ if(xPropSetInfo->hasPropertyByName(PROPERTY_HIDDEN)) xAffectedCol->getPropertyValue(PROPERTY_HIDDEN) >>= m_bHidden; if(xPropSetInfo->hasPropertyByName(PROPERTY_ALIGN)) - SetHorJustify( ::dbaui::mapTextJustify(::comphelper::getINT16(xAffectedCol->getPropertyValue(PROPERTY_ALIGN)))); + SetHorJustify( ::dbaui::mapTextJustify(::comphelper::getINT32(xAffectedCol->getPropertyValue(PROPERTY_ALIGN)))); if(xPropSetInfo->hasPropertyByName(PROPERTY_ISAUTOINCREMENT)) SetAutoIncrement(::cppu::any2bool(xAffectedCol->getPropertyValue(PROPERTY_ISAUTOINCREMENT))); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
