mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-06-01 16:21:56 +00:00
Clean up last change.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38875 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
da2f99b24e
commit
f922f3a5a5
1 changed files with 12 additions and 13 deletions
|
@ -5131,23 +5131,23 @@ overridden version does not.
|
||||||
if ([type isEqualToString: NSStringPboardType])
|
if ([type isEqualToString: NSStringPboardType])
|
||||||
{
|
{
|
||||||
ret = [pboard setString: [[self string] substringWithRange: _layoutManager->_selected_range]
|
ret = [pboard setString: [[self string] substringWithRange: _layoutManager->_selected_range]
|
||||||
forType: NSStringPboardType] || ret;
|
forType: NSStringPboardType];
|
||||||
}
|
}
|
||||||
else if ([type isEqualToString: NSRTFPboardType])
|
else if ([type isEqualToString: NSRTFPboardType])
|
||||||
{
|
{
|
||||||
ret = [pboard setData: [self RTFFromRange: _layoutManager->_selected_range]
|
ret = [pboard setData: [self RTFFromRange: _layoutManager->_selected_range]
|
||||||
forType: NSRTFPboardType] || ret;
|
forType: NSRTFPboardType];
|
||||||
}
|
}
|
||||||
else if ([type isEqualToString: NSRTFDPboardType])
|
else if ([type isEqualToString: NSRTFDPboardType])
|
||||||
{
|
{
|
||||||
ret = [pboard setData: [self RTFDFromRange: _layoutManager->_selected_range]
|
ret = [pboard setData: [self RTFDFromRange: _layoutManager->_selected_range]
|
||||||
forType: NSRTFDPboardType] || ret;
|
forType: NSRTFDPboardType];
|
||||||
}
|
}
|
||||||
else if ([type isEqualToString: NSSmartPastePboardType] &&
|
else if ([type isEqualToString: NSSmartPastePboardType] &&
|
||||||
[self selectionGranularity] == NSSelectByWord)
|
[self selectionGranularity] == NSSelectByWord)
|
||||||
{
|
{
|
||||||
ret = [pboard setData: [NSData data]
|
ret = [pboard setData: [NSData data]
|
||||||
forType: NSSmartPastePboardType] || ret;
|
forType: NSSmartPastePboardType];
|
||||||
}
|
}
|
||||||
else if ([type isEqualToString: NSColorPboardType])
|
else if ([type isEqualToString: NSColorPboardType])
|
||||||
{
|
{
|
||||||
|
@ -5169,9 +5169,8 @@ overridden version does not.
|
||||||
dict = [_textStorage fontAttributesInRange: _layoutManager->_selected_range];
|
dict = [_textStorage fontAttributesInRange: _layoutManager->_selected_range];
|
||||||
if (dict != nil)
|
if (dict != nil)
|
||||||
{
|
{
|
||||||
[pboard setData: [NSArchiver archivedDataWithRootObject: dict]
|
ret = [pboard setData: [NSArchiver archivedDataWithRootObject: dict]
|
||||||
forType: NSFontPboardType];
|
forType: NSFontPboardType];
|
||||||
ret = YES;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ([type isEqualToString: NSRulerPboardType])
|
else if ([type isEqualToString: NSRulerPboardType])
|
||||||
|
@ -5181,11 +5180,11 @@ overridden version does not.
|
||||||
dict = [_textStorage rulerAttributesInRange: _layoutManager->_selected_range];
|
dict = [_textStorage rulerAttributesInRange: _layoutManager->_selected_range];
|
||||||
if (dict != nil)
|
if (dict != nil)
|
||||||
{
|
{
|
||||||
[pboard setData: [NSArchiver archivedDataWithRootObject: dict]
|
ret = [pboard setData: [NSArchiver archivedDataWithRootObject: dict]
|
||||||
forType: NSRulerPboardType];
|
forType: NSRulerPboardType];
|
||||||
ret = YES;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue