Tag: cws_src680_dba205b
User: oj      
Date: 2006/09/04 04:04:40

Modified:
   dba/connectivity/source/commontools/dbtools.cxx

Log:
 RESYNC: (1.62-1.63); 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.8.1&r2=1.62.8.2
Delta lines:  +4 -7
-------------------
--- dbtools.cxx 2 Aug 2006 15:49:52 -0000       1.62.8.1
+++ dbtools.cxx 4 Sep 2006 11:04:37 -0000       1.62.8.2
@@ -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]

Reply via email to