Tag: cws_src680_hsqlcsv User: fs Date: 2006/10/11 00:01:57 Modified: dba/connectivity/source/commontools/dbtools.cxx
Log: RESYNC: (1.62-1.65); FILE MERGED 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.14.1&r2=1.62.14.2 Delta lines: +7 -7 ------------------- --- dbtools.cxx 19 Sep 2006 07:36:05 -0000 1.62.14.1 +++ dbtools.cxx 11 Oct 2006 07:01:53 -0000 1.62.14.2 @@ -33,6 +33,9 @@ * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_connectivity.hxx" + #ifndef _DBHELPER_DBEXCEPTION_HXX_ #include <connectivity/dbexception.hxx> #endif @@ -1075,10 +1078,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]
