Tag: cws_src680_oj14 User: oj Date: 2006/07/04 01:23:17 Modified: dba/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
Log: RESYNC: (1.20-1.21); FILE MERGED 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.19.8.4&r2=1.19.8.5 Delta lines: +42 -43 --------------------- --- FieldDescriptions.cxx 25 Apr 2006 12:50:06 -0000 1.19.8.4 +++ FieldDescriptions.cxx 4 Jul 2006 08:23:14 -0000 1.19.8.5 @@ -71,32 +71,32 @@ //======================================================================== // class OFieldDescription //======================================================================== -DBG_NAME(OFieldDescription); +DBG_NAME(OFieldDescription) //------------------------------------------------------------------------------ -OFieldDescription::OFieldDescription() : - m_bIsPrimaryKey(sal_False) - ,m_nFormatKey(0) - ,m_bIsAutoIncrement(sal_False) - ,m_eHorJustify(SVX_HOR_JUSTIFY_STANDARD) - ,m_nScale(0) +OFieldDescription::OFieldDescription() + :m_pType() + ,m_nType(DataType::VARCHAR) ,m_nPrecision(0) - ,m_pType() + ,m_nScale(0) ,m_nIsNullable(ColumnValue::NULLABLE) - ,m_nType(DataType::VARCHAR) + ,m_nFormatKey(0) + ,m_eHorJustify(SVX_HOR_JUSTIFY_STANDARD) + ,m_bIsAutoIncrement(sal_False) + ,m_bIsPrimaryKey(sal_False) ,m_bIsCurrency(sal_False) { DBG_CTOR(OFieldDescription,NULL); } - //------------------------------------------------------------------------------ -OFieldDescription::OFieldDescription( const OFieldDescription& rDescr ) : - m_sName(rDescr.m_sName) +OFieldDescription::OFieldDescription( const OFieldDescription& rDescr ) + :m_aDefaultValue(rDescr.m_aDefaultValue) + ,m_aControlDefault(rDescr.m_aControlDefault) + ,m_pType(rDescr.m_pType) + ,m_sName(rDescr.m_sName) ,m_sTypeName(rDescr.m_sTypeName) ,m_sDescription(rDescr.m_sDescription) - ,m_aDefaultValue(rDescr.m_aDefaultValue) - ,m_aControlDefault(rDescr.m_aControlDefault) ,m_sAutoIncrementValue(rDescr.m_sAutoIncrementValue) - ,m_pType(rDescr.m_pType) + ,m_nType(DataType::VARCHAR) ,m_nPrecision(rDescr.m_nPrecision) ,m_nScale(rDescr.m_nScale) ,m_nIsNullable(rDescr.m_nIsNullable) @@ -104,7 +104,6 @@ ,m_eHorJustify(rDescr.m_eHorJustify) ,m_bIsAutoIncrement(rDescr.m_bIsAutoIncrement) ,m_bIsPrimaryKey(rDescr.m_bIsPrimaryKey) - ,m_nType(DataType::VARCHAR) { DBG_CTOR(OFieldDescription,NULL); } @@ -123,22 +122,22 @@ SvxCellHorJustify _eHorJustify, sal_Bool _bIsAutoIncrement, sal_Bool _bIsPrimaryKey, - sal_Bool _bIsCurrency) : - m_sName(_sName) -,m_sTypeName(_sTypeName) -,m_sDescription(_sDescription) -,m_aDefaultValue(_aDefaultValue) -,m_aControlDefault(_aControlDefault) -,m_sAutoIncrementValue(_sAutoIncrementValue) -,m_pType(_pType) -,m_nPrecision(_nPrecision) -,m_nScale(_nScale) -,m_nIsNullable(_nIsNullable) -,m_nFormatKey(_nFormatKey) -,m_eHorJustify(_eHorJustify) -,m_bIsAutoIncrement(_bIsAutoIncrement) -,m_bIsPrimaryKey(_bIsPrimaryKey) -,m_bIsCurrency(_bIsCurrency) + sal_Bool _bIsCurrency) + :m_aDefaultValue(_aDefaultValue) + ,m_aControlDefault(_aControlDefault) + ,m_pType(_pType) + ,m_sName(_sName) + ,m_sTypeName(_sTypeName) + ,m_sDescription(_sDescription) + ,m_sAutoIncrementValue(_sAutoIncrementValue) + ,m_nPrecision(_nPrecision) + ,m_nScale(_nScale) + ,m_nIsNullable(_nIsNullable) + ,m_nFormatKey(_nFormatKey) + ,m_eHorJustify(_eHorJustify) + ,m_bIsAutoIncrement(_bIsAutoIncrement) + ,m_bIsPrimaryKey(_bIsPrimaryKey) + ,m_bIsCurrency(_bIsCurrency) { DBG_DTOR(OFieldDescription,NULL); } @@ -150,15 +149,15 @@ } //------------------------------------------------------------------------------ OFieldDescription::OFieldDescription(const Reference< XPropertySet >& xAffectedCol,sal_Bool _bUseAsDest) - :m_bIsPrimaryKey(sal_False) - ,m_nFormatKey(0) - ,m_bIsAutoIncrement(sal_False) - ,m_eHorJustify(SVX_HOR_JUSTIFY_STANDARD) - ,m_nScale(0) + :m_pType() + ,m_nType(DataType::VARCHAR) ,m_nPrecision(0) - ,m_pType() + ,m_nScale(0) ,m_nIsNullable(ColumnValue::NULLABLE) - ,m_nType(DataType::VARCHAR) + ,m_nFormatKey(0) + ,m_eHorJustify(SVX_HOR_JUSTIFY_STANDARD) + ,m_bIsAutoIncrement(sal_False) + ,m_bIsPrimaryKey(sal_False) ,m_bIsCurrency(sal_False) { DBG_CTOR(OFieldDescription,NULL); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
