Tag: cws_src680_oj14 User: oj Date: 06/03/20 06:02:09 Modified: /dba/dbaccess/source/ui/misc/ WTypeSelect.cxx
Log: RESYNC: (1.22-1.23); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: WTypeSelect.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WTypeSelect.cxx?r1=1.22.4.2&r2=1.22.4.3 Delta lines: +8 -4 ------------------- --- WTypeSelect.cxx 20 Mar 2006 07:48:47 -0000 1.22.4.2 +++ WTypeSelect.cxx 20 Mar 2006 14:02:06 -0000 1.22.4.3 @@ -114,6 +114,7 @@ case tpFormat: case tpDefault: case tpAutoIncrement: + case tpAutoIncrementValue: break; default: OFieldDescControl::ActivateAggregate( eType ); @@ -127,6 +128,7 @@ case tpFormat: case tpDefault: case tpAutoIncrement: + case tpAutoIncrementValue: break; default: OFieldDescControl::DeactivateAggregate( eType ); @@ -159,7 +161,7 @@ // first we have to check if this name already exists sal_Bool bDoubleName = sal_False; sal_Bool bCase = sal_True; - if ( getMetaData().is() && !getMetaData()->storesMixedCaseQuotedIdentifiers() ) + if ( getMetaData().is() && !getMetaData()->supportsMixedCaseQuotedIdentifiers() ) { bCase = sal_False; USHORT nCount = aListBox.GetEntryCount(); @@ -346,6 +348,8 @@ while(m_lbColumnNames.GetEntryCount()) m_lbColumnNames.RemoveEntry(0); m_lbColumnNames.Clear(); + sal_Int32 nBreakPos; + m_pParent->CheckColumns(nBreakPos); const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector(); ODatabaseExport::TColumnVector::const_iterator aIter = pDestColumns->begin(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
