User: vg Date: 2006/09/25 02:42:51 Modified: dba/dbaccess/source/ui/misc/UITools.cxx
Log: INTEGRATION: CWS hsqldb9 (1.60.2); FILE MERGED 2006/09/05 08:41:14 oj 1.60.2.3: RESYNC: (1.61-1.62); FILE MERGED 2006/08/03 06:43:45 oj 1.60.2.2: RESYNC: (1.60-1.61); FILE MERGED 2006/08/02 06:51:37 oj 1.60.2.1: #i65100# handle timestamp sql 2003 conform File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: UITools.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/UITools.cxx?r1=1.63&r2=1.64 Delta lines: +3 -3 ------------------- --- UITools.cxx 17 Sep 2006 07:14:08 -0000 1.63 +++ UITools.cxx 25 Sep 2006 09:42:48 -0000 1.64 @@ -568,7 +568,7 @@ || ( (aIter->second->nPrecision >= _nPrecision) && (aIter->second->nMaximumScale >= _nScale) - && (aIter->second->bAutoIncrement == _bAutoIncrement) + && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) ) ) ) @@ -585,7 +585,7 @@ if ( (aIter->second->aLocalTypeName.equalsIgnoreAsciiCase(_sTypeName)) && (nPrec >= _nPrecision) && (nScale >= _nScale) - && (aIter->second->bAutoIncrement == _bAutoIncrement) + && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) ) { OSL_ENSURE(sal_False, @@ -619,7 +619,7 @@ sal_Int32 nScale = aIter->second->nMaximumScale; if ( (nPrec >= _nPrecision) && (nScale >= _nScale) - && (aIter->second->bAutoIncrement == _bAutoIncrement) + && ( (_bAutoIncrement && aIter->second->bAutoIncrement) || !_bAutoIncrement ) ) break; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
