Revision: 2848
http://skim-app.svn.sourceforge.net/skim-app/?rev=2848&view=rev
Author: hofman
Date: 2007-09-08 07:20:39 -0700 (Sat, 08 Sep 2007)
Log Message:
-----------
Resolve some more indirect objects when parsing FDF.
Declare selectors to satisfy compiler.
Remove inline declaration for a recursive functions.
Modified Paths:
--------------
trunk/NSCell_SKExtensions.h
trunk/SKFDFParser.m
trunk/SKInfoWindowController.m
trunk/SKTypeSelectHelper.m
Modified: trunk/NSCell_SKExtensions.h
===================================================================
--- trunk/NSCell_SKExtensions.h 2007-09-08 14:07:22 UTC (rev 2847)
+++ trunk/NSCell_SKExtensions.h 2007-09-08 14:20:39 UTC (rev 2848)
@@ -42,4 +42,5 @@
@interface NSCell (SKExtensions)
+- (NSColor *)replacementHighlightColorWithFrame:(NSRect)cellFrame
inView:(NSView *)controlView;
@end
Modified: trunk/SKFDFParser.m
===================================================================
--- trunk/SKFDFParser.m 2007-09-08 14:07:22 UTC (rev 2847)
+++ trunk/SKFDFParser.m 2007-09-08 14:20:39 UTC (rev 2848)
@@ -268,6 +268,7 @@
(trailer = [fdfDict objectForKey:@"trailer"]) &&
([trailer isKindOfClass:[NSDictionary class]]) &&
(root = [trailer objectForKey:@"Root"]) &&
+ (rootDict = [fdfDict objectForKey:root]) &&
([rootDict isKindOfClass:[NSDictionary class]]) &&
(annots = [trailer objectForKey:@"Annots"]) &&
([annots isKindOfClass:[NSArray class]])) {
@@ -277,6 +278,8 @@
array = [NSMutableArray array];
while (dict = [annotEnum nextObject]) {
+ while ([dict isKindOfClass:[SKIndirectObject class]])
+ dict = [fdfDict objectForKey:dict];
if ([dict isKindOfClass:[NSDictionary class]] == NO)
return nil;
if (dict = [self noteDictionary:dict lookup:fdfDict])
Modified: trunk/SKInfoWindowController.m
===================================================================
--- trunk/SKInfoWindowController.m 2007-09-08 14:07:22 UTC (rev 2847)
+++ trunk/SKInfoWindowController.m 2007-09-08 14:20:39 UTC (rev 2848)
@@ -81,8 +81,7 @@
[self setWindowFrameAutosaveName:@"SKInfoWindow"];
}
-static inline
-NSString *SKFileSizeStringForFileURL(NSURL *fileURL, unsigned long long
*physicalSizePtr, unsigned long long *logicalSizePtr) {
+static NSString *SKFileSizeStringForFileURL(NSURL *fileURL, unsigned long long
*physicalSizePtr, unsigned long long *logicalSizePtr) {
if (fileURL == nil)
return @"";
Modified: trunk/SKTypeSelectHelper.m
===================================================================
--- trunk/SKTypeSelectHelper.m 2007-09-08 14:07:22 UTC (rev 2847)
+++ trunk/SKTypeSelectHelper.m 2007-09-08 14:20:39 UTC (rev 2848)
@@ -49,6 +49,7 @@
@end
@interface NSWindow (SKTypeAheadHelperExtensions)
+- (BOOL)replacementMakeFirstResponder:(NSResponder *)aResponder;
@end
#pragma mark -
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
