User: hr Date: 2006/08/15 03:27:32 Modified: dba/connectivity/source/commontools/dbtools.cxx
Log: INTEGRATION: CWS dba30 (1.57.8); FILE MERGED 2006/07/19 09:47:22 fs 1.57.8.3: RESYNC: (1.59-1.61); FILE MERGED 2006/03/21 14:58:08 fs 1.57.8.2: RESYNC: (1.57-1.59); FILE MERGED 2006/01/04 11:13:25 fs 1.57.8.1: allow prepending an Exception to an SQLExceptionInfo File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: dbtools.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbtools.cxx?r1=1.62&r2=1.63 Delta lines: +1 -4 ------------------- --- dbtools.cxx 19 Jul 2006 15:51:24 -0000 1.62 +++ dbtools.cxx 15 Aug 2006 10:27:29 -0000 1.63 @@ -1075,10 +1075,7 @@ { // binaere Suche Property* pResult = ::std::lower_bound(pNewProps, pNewProps + nNewLen,pOldProps[i].Name, ::comphelper::PropertyStringLessFunctor()); - -// Property* pResult = (Property*) bsearch(pOldProps + i, (void*)pNewProps, nNewLen, sizeof(Property), -// &PropertyCompare); - if (pResult + if ( pResult && ( pResult != pNewProps + nNewLen && pResult->Name == pOldProps[i].Name ) && ( pResult->Attributes == pOldProps[i].Attributes ) && ( (pResult->Attributes & PropertyAttribute::READONLY) == 0 ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
