Merge Source/NSParagraphStyle.m

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38737 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-07-02 00:38:19 +00:00
parent 9fe74e0c52
commit 392e6ceb1a

View file

@ -474,7 +474,12 @@ static NSParagraphStyle *defaultStyle = nil;
{
if ([aCoder allowsKeyedCoding])
{
// TODO_NIB: Determine keys for NSParagraphStyle, if there are any.
_firstLineHeadIndent = [aCoder decodeFloatForKey: @"NSFirstLineHeadIndent"];
_headIndent = [aCoder decodeFloatForKey: @"NSHeadIndent"];
_paragraphSpacing = [aCoder decodeFloatForKey: @"NSParagraphSpacingBefore"];
ASSIGN(_tabStops, [aCoder decodeObjectForKey: @"NSTabStops"]);
ASSIGN(_textLists, [aCoder decodeObjectForKey: @"NSTextLists"]);
_baseDirection = [aCoder decodeIntForKey: @"NSWritingDirection"];
}
else
{
@ -540,7 +545,12 @@ static NSParagraphStyle *defaultStyle = nil;
{
if ([aCoder allowsKeyedCoding])
{
// TODO_NIB: Determine keys for NSParagraphStyle, if there are any.
[aCoder encodeFloat: _firstLineHeadIndent forKey: @"NSFirstLineHeadIndent"];
[aCoder encodeFloat: _headIndent forKey: @"NSHeadIndent"];
[aCoder encodeFloat: _paragraphSpacing forKey: @"NSParagraphSpacingBefore"];
[aCoder encodeObject: _tabStops forKey: @"NSTabStops"];
[aCoder encodeObject: _textLists forKey: @"NSTextLists"];
[aCoder encodeInt: _baseDirection forKey: @"NSWritingDirection"];
}
else
{