Author: mlytwyn
Date: Thu Jul 2 02:38:19 2015
New Revision: 38737
URL: http://svn.gna.org/viewcvs/gnustep?rev=38737&view=rev
Log:
Merge Source/NSParagraphStyle.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSParagraphStyle.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSParagraphStyle.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSParagraphStyle.m?rev=38737&r1=38736&r2=38737&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSParagraphStyle.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSParagraphStyle.m
Thu Jul 2 02:38:19 2015
@@ -474,7 +474,12 @@
{
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 @@
{
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
{
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
