diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-10-27 11:14:32 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-10-27 11:14:32 +0000 |
| commit | 20c7949a91688e9172b0ed5b41ea1c582033da19 (patch) | |
| tree | 9fff36cf8a5eaee034a4b0ea3f4ee3b686db982e | |
| parent | 2c29430803d53f8443d8d0247e494f208d6c99f7 (diff) | |
INTEGRATION: CWS krmisc (1.23.6); FILE MERGED
2006/10/12 07:06:26 kr 1.23.6.2: fixed: finally got it right #i59981#
2006/10/10 11:11:47 kr 1.23.6.1: fixed: #i59981#
| -rw-r--r-- | sal/rtl/source/ustring.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sal/rtl/source/ustring.c b/sal/rtl/source/ustring.c index 4245e294ac2e..14256f709dbe 100644 --- a/sal/rtl/source/ustring.c +++ b/sal/rtl/source/ustring.c @@ -4,9 +4,9 @@ * * $RCSfile: ustring.c,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: vg $ $Date: 2006-09-25 13:14:36 $ + * last change: $Author: rt $ $Date: 2006-10-27 12:14:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -158,8 +158,8 @@ sal_Int32 SAL_CALL rtl_ustr_ascii_compare_WithLength( const sal_Unicode* pStr1, sal_Int32 nStr1Len, const sal_Char* pStr2 ) { - sal_Int32 nRet; - while( ((nRet = ((sal_Int32)(*pStr1))- + sal_Int32 nRet = 0; + while( ((nRet = (nStr1Len ? (sal_Int32)(*pStr1) : 0)- ((sal_Int32)((unsigned char)(*pStr2)))) == 0) && nStr1Len && *pStr2 ) { |