Tag: cws_src680_oj14 User: oj Date: 06/03/20 06:01:57 Modified: /dba/dbaccess/source/ui/misc/ WCopyTable.cxx
Log: RESYNC: (1.41-1.42); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: WCopyTable.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WCopyTable.cxx?r1=1.41.4.2&r2=1.41.4.3 Delta lines: +16 -11 --------------------- --- WCopyTable.cxx 20 Mar 2006 07:48:46 -0000 1.41.4.2 +++ WCopyTable.cxx 20 Mar 2006 14:01:54 -0000 1.41.4.3 @@ -157,7 +157,7 @@ ,m_xSourceObject(_xSourceObject) ,m_bCreatePrimaryColumn(sal_False) ,m_eCreateStyle(WIZARD_DEF_DATA) - ,m_mNameMapping(_xConnection->getMetaData().is() && _xConnection->getMetaData()->storesMixedCaseQuotedIdentifiers()) + ,m_mNameMapping(_xConnection->getMetaData().is() && _xConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers()) ,m_xFormatter(_xFormatter) ,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) ,m_xFactory(_rM) @@ -204,7 +204,7 @@ ,m_xConnection(_xConnection) ,m_bCreatePrimaryColumn(sal_False) ,m_eCreateStyle(WIZARD_DEF_DATA) - ,m_mNameMapping(_xConnection->getMetaData().is() && _xConnection->getMetaData()->storesMixedCaseQuotedIdentifiers()) + ,m_mNameMapping(_xConnection->getMetaData().is() && _xConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers()) ,m_vSourceColumns(_rSourceColumns) ,m_xFormatter(_xFormatter) ,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) @@ -249,6 +249,7 @@ m_pTypeInfo = TOTypeInfoSP(new OTypeInfo()); m_pTypeInfo->aUIName = m_sTypeNames.GetToken(TYPE_OTHER); + m_bAddPKFirstTime = sal_True; } //------------------------------------------------------------------------ OCopyTableWizard::~OCopyTableWizard() @@ -335,13 +336,17 @@ TOTypeInfoSP pTypeInfo = queryPrimaryKeyType(m_aDestTypeInfo); if ( pTypeInfo.get() ) { + if ( m_bAddPKFirstTime ) + { OFieldDescription* pField = new OFieldDescription(); pField->SetName(m_aKeyName); pField->FillFromTypeInfo(pTypeInfo,sal_True,sal_True); pField->SetPrimaryKey(sal_True); + m_bAddPKFirstTime = sal_False; insertColumn(0,pField); + } m_vColumnPos.push_back(ODatabaseExport::TPositions::value_type(1,1)); - m_vColumnTypes.push_back(pField->GetType()); + m_vColumnTypes.push_back(pTypeInfo->nType); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
