Author: hdu
Date: Wed Jun 18 12:06:18 2014
New Revision: 1603423
URL: http://svn.apache.org/r1603423
Log:
#i125112# fix CStringHash functor to match full strings only
merged from AOO trunk revision 1603416
Modified:
openoffice/branches/AOO410/ (props changed)
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/sal/inc/rtl/string.hxx
Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1603416
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main:r1603416
Modified: openoffice/branches/AOO410/main/sal/inc/rtl/string.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sal/inc/rtl/string.hxx?rev=1603423&r1=1603422&r2=1603423&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sal/inc/rtl/string.hxx (original)
+++ openoffice/branches/AOO410/main/sal/inc/rtl/string.hxx Wed Jun 18 12:06:18
2014
@@ -945,10 +945,10 @@ struct OStringHash
struct CStringEqual
{
bool operator()( const char* p1, const char* p2) const {
- while( *p1)
+ while( *p1 != '\0')
if( *(p1++) != *(p2++))
return false;
- return true;
+ return (*p2 == '\0');
}
};
