gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-20 20:26:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Attributed range fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@8586 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2001-01-13 20:33:58 +00:00
parent 23b40dc703
commit 158e28ec5e
3 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Source/GSAttributedString.m
View file

@ -303,11 +303,15 @@ _setAttributesFrom(
*/
[_infoArray removeAllObjects];
if (aRange.length <= 0)
return;
attr = [attributedString attributesAtIndex: aRange.location
effectiveRange: &range];
if (aRange.length == 0)
{
attr = [NSDictionary dictionary];
}
else
{
attr = [attributedString attributesAtIndex: aRange.location
effectiveRange: &range];
}
attr = cacheAttributes(attr);
info = NEWINFO(z, attr, 0);
ADDOBJECT(info);
@ -447,9 +451,11 @@ _attributesAtIndexEffectiveRange(
if (aString != nil && [aString isKindOfClass: [NSAttributedString class]])
{
NSAttributedString *as = (NSAttributedString*)aString;
unsigned len;
aString = [as string];
_setAttributesFrom(as, NSMakeRange(0, [aString length]), _infoArray);
len = [aString length];
_setAttributesFrom(as, NSMakeRange(0, len), _infoArray);
}
else
{
@ -546,7 +552,6 @@ _attributesAtIndexEffectiveRange(
aString = [as string];
_setAttributesFrom(as, NSMakeRange(0, [aString length]), _infoArray);
SANITY();
}
else
{
@ -565,6 +570,7 @@ SANITY();
_textChars = [[NSMutableString allocWithZone: z] init];
else
_textChars = [aString mutableCopyWithZone: z];
SANITY();
return self;
}
@ -800,6 +806,7 @@ SANITY();
moveLocations = [aString length] - range.length;
if (effectiveRange.location == range.location
&& effectiveRange.length == range.length
&& (moveLocations + range.length) == 0)
{
/*
@ -812,7 +819,6 @@ SANITY();
arraySize--;
}
SANITY();
/*
* Now adjust the positions of the ranges following the one we are using.
*/
@ -822,7 +828,6 @@ SANITY();
info->loc += moveLocations;
arrayIndex++;
}
SANITY();
[_textChars replaceCharactersInRange: range withString: aString];
finish:
SANITY();