Author: fredkiefer
Date: Wed Aug 12 23:16:37 2015
New Revision: 38875
URL: http://svn.gna.org/viewcvs/gnustep?rev=38875&view=rev
Log:
Clean up last change.
Modified:
libs/gui/trunk/Source/NSTextView.m
Modified: libs/gui/trunk/Source/NSTextView.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSTextView.m?rev=38875&r1=38874&r2=38875&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSTextView.m (original)
+++ libs/gui/trunk/Source/NSTextView.m Wed Aug 12 23:16:37 2015
@@ -5131,23 +5131,23 @@
if ([type isEqualToString: NSStringPboardType])
{
ret = [pboard setString: [[self string] substringWithRange:
_layoutManager->_selected_range]
- forType: NSStringPboardType] || ret;
+ forType: NSStringPboardType];
}
else if ([type isEqualToString: NSRTFPboardType])
{
ret = [pboard setData: [self RTFFromRange:
_layoutManager->_selected_range]
- forType: NSRTFPboardType] || ret;
+ forType: NSRTFPboardType];
}
else if ([type isEqualToString: NSRTFDPboardType])
- {
- ret = [pboard setData: [self RTFDFromRange:
_layoutManager->_selected_range]
- forType: NSRTFDPboardType] || ret;
- }
+ {
+ ret = [pboard setData: [self RTFDFromRange:
_layoutManager->_selected_range]
+ forType: NSRTFDPboardType];
+ }
else if ([type isEqualToString: NSSmartPastePboardType] &&
[self selectionGranularity] == NSSelectByWord)
{
ret = [pboard setData: [NSData data]
- forType: NSSmartPastePboardType] || ret;
+ forType: NSSmartPastePboardType];
}
else if ([type isEqualToString: NSColorPboardType])
{
@@ -5169,9 +5169,8 @@
dict = [_textStorage fontAttributesInRange:
_layoutManager->_selected_range];
if (dict != nil)
{
- [pboard setData: [NSArchiver archivedDataWithRootObject: dict]
- forType: NSFontPboardType];
- ret = YES;
+ ret = [pboard setData: [NSArchiver archivedDataWithRootObject: dict]
+ forType: NSFontPboardType];
}
}
else if ([type isEqualToString: NSRulerPboardType])
@@ -5181,11 +5180,11 @@
dict = [_textStorage rulerAttributesInRange:
_layoutManager->_selected_range];
if (dict != nil)
{
- [pboard setData: [NSArchiver archivedDataWithRootObject: dict]
- forType: NSRulerPboardType];
- ret = YES;
+ ret = [pboard setData: [NSArchiver archivedDataWithRootObject: dict]
+ forType: NSRulerPboardType];
}
}
+
return ret;
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
