* Source/NSString.m (-rangeOfString:options:range:locale:):

Correct result range with ICU codepath


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34880 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Eric Wasylishen 2012-03-05 22:31:53 +00:00
parent 32678e3f42
commit 6461dd4aac
2 changed files with 8 additions and 3 deletions

View file

@ -1,3 +1,8 @@
2012-03-05 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSString.m (-rangeOfString:options:range:locale:):
Correct result range with ICU codepath
2012-03-05 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSXMLElement.m (-addAttribute:): Raise correct exception.

View file

@ -2162,17 +2162,17 @@ handle_printf_atsign (FILE *stream,
if ((mask & NSBackwardsSearch) == NSBackwardsSearch)
{
if (matchLocation + matchLength == NSMaxRange(aRange))
result = NSMakeRange(matchLocation, matchLength);
result = NSMakeRange(aRange.location + matchLocation, matchLength);
}
else
{
if (matchLocation == 0)
result = NSMakeRange(matchLocation, matchLength);
result = NSMakeRange(aRange.location + matchLocation, matchLength);
}
}
else
{
result = NSMakeRange(matchLocation, matchLength);
result = NSMakeRange(aRange.location + matchLocation, matchLength);
}
}
}