@@ -18,7 +18,7 @@ <string>application/rtf</string> </array> <key>CFBundleTypeName</key> - <string>NSRTFPboardType</string> + <string>RTFDocument</string> <key>CFBundleTypeOSTypes</key> <array> <string>RTF </string> Info.plist @@ -1,6 +1,8 @@ #import "NeoDocument.h" #import "NeoTextView.h" +static NSString *const kNeoRTFDocumentType = @"RTFDocument"; + @implementation NeoDocument - (NSString *) windowNibName { @@ -13,28 +15,40 @@ if (_contents != nil) { [_textView insertText: _contents]; [_textView invalidateLayout]; + [_contents release]; + _contents = nil; } } - (NSData *) dataOfType: (NSString *) typeName error: (NSError **) outError { - NSAttributedString *contents = [_textView attributedString]; - NSData *data = [contents RTFFromRange:NSMakeRange(0, [contents length]) - documentAttributes:nil]; + NSData *data = nil; + + if ([kNeoRTFDocumentType isEqualToString:typeName]) { + NSAttributedString *contents = [_textView attributedString]; + data = [contents RTFFromRange:NSMakeRange(0, [contents length]) + documentAttributes:nil]; + } + return data; } - (BOOL) readFromData: (NSData *) data ofType: (NSString *) typeName error: (NSError **) outError { - NSAttributedString *contents = - [[NSAttributedString alloc] initWithData:data - options:[NSDictionary dictionaryWithObjectsAndKeys: - NSDocumentTypeDocumentOption, NSRTFTextDocumentType, - nil] - documentAttributes:NULL - error:outError]; - [_contents release]; - _contents = contents; - - return contents != nil; + if ([kNeoRTFDocumentType isEqualToString:typeName]) { + NSAttributedString *contents = + [[NSAttributedString alloc] initWithData:data + options:[NSDictionary dictionaryWithObjectsAndKeys: + NSDocumentTypeDocumentOption, NSRTFTextDocumentType, + nil] + documentAttributes:NULL + error:outError]; + if (contents != nil) { + [_contents release]; + _contents = contents; + return YES; + } + } + + return NO; } @end src/NeoDocument.m 6b2ca0a89622cb6e719a74b6782fac4e1e7fe442 Takanori Ishikawa takanori.ishikawa@gmail.com http://github.com/ishikawa/neuro/commit/8d672182774c8f5815b266323cb66f4d2aac7943 8d672182774c8f5815b266323cb66f4d2aac7943 2009-08-01T06:16:07-07:00 2009-08-01T06:16:07-07:00 Added document type check 64870ef21022089296bfc7e5374007ffb9c97e62 Takanori Ishikawa takanori.ishikawa@gmail.com