mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 20:01:11 +00:00
Fix text block handling in paragraph style copy methods.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27725 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
b32b160823
commit
95fc114f62
2 changed files with 13 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
|||
2009-01-29 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/NSParagraphStyle.m: Fix all copying code to handle
|
||||
textBlocks and textLists correctly.
|
||||
|
||||
2009-01-29 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Headers/Additions/GNUstepGUI/GSDisplayServer.h
|
||||
|
|
|
@ -449,7 +449,8 @@ static NSParagraphStyle *defaultStyle = nil;
|
|||
NSParagraphStyle *c;
|
||||
|
||||
c = (NSParagraphStyle*)NSCopyObject (self, 0, aZone);
|
||||
c->_tabStops = [_tabStops mutableCopyWithZone: aZone];
|
||||
c->_textBlocks = [_textBlocks mutableCopyWithZone: aZone];
|
||||
c->_textLists = [_textLists mutableCopyWithZone: aZone];
|
||||
return c;
|
||||
}
|
||||
}
|
||||
|
@ -781,6 +782,9 @@ static NSParagraphStyle *defaultStyle = nil;
|
|||
[_tabStops removeAllObjects];
|
||||
[_tabStops addObjectsFromArray: p->_tabStops];
|
||||
|
||||
[self setTextBlocks: [p textBlocks]];
|
||||
[self setTextLists: [p textLists]];
|
||||
|
||||
_alignment = p->_alignment;
|
||||
_firstLineHeadIndent = p->_firstLineHeadIndent;
|
||||
_headIndent = p->_headIndent;
|
||||
|
@ -808,7 +812,9 @@ static NSParagraphStyle *defaultStyle = nil;
|
|||
c->isa = [NSParagraphStyle class];
|
||||
GSDebugAllocationAdd(c->isa, c);
|
||||
c->_tabStops = [_tabStops mutableCopyWithZone: aZone];
|
||||
return c;
|
||||
c->_textBlocks = [_textBlocks mutableCopyWithZone: aZone];
|
||||
c->_textLists = [_textLists mutableCopyWithZone: aZone];
|
||||
return c;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
Loading…
Reference in a new issue