From 16dfee54d9d41de50ff74f5eb52e04d204dfa4b2 Mon Sep 17 00:00:00 2001 From: Fred Kiefer Date: Tue, 10 Aug 2010 19:53:47 +0000 Subject: [PATCH] Follow Richard's changes to GSAttributedString in base. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@31110 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/GSTextStorage.m | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1c70335e..a770d1313 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-08-10 Fred Kiefer + + * Source/GSTextStorage.m: Follow Richard's changes to + GSAttributedString in base. + 2010-08-09 Wolfgang Lux * Source/NSApplication.m (-arrangeInFront:): Only order diff --git a/Source/GSTextStorage.m b/Source/GSTextStorage.m index 2772a5a12..41ea43abb 100644 --- a/Source/GSTextStorage.m +++ b/Source/GSTextStorage.m @@ -646,8 +646,10 @@ _attributesAtIndexEffectiveRange( - (void) setAttributes: (NSDictionary*)attributes range: (NSRange)range { - unsigned tmpLength, arrayIndex, arraySize; - NSRange effectiveRange; + unsigned tmpLength; + unsigned arrayIndex = 0; + unsigned arraySize; + NSRange effectiveRange = NSMakeRange(0, NSNotFound); NSRange originalRange = range; unsigned afterRangeLoc, beginRangeLoc; NSDictionary *attrs; @@ -776,8 +778,10 @@ changeInLength: 0]; - (void) replaceCharactersInRange: (NSRange)range withString: (NSString*)aString { - unsigned tmpLength, arrayIndex, arraySize; - NSRange effectiveRange; + unsigned tmpLength; + unsigned arrayIndex = 0; + unsigned arraySize; + NSRange effectiveRange = NSMakeRange(0, NSNotFound); NSDictionary *attrs; GSTextInfo *info; int moveLocations;