Revision: 14674
http://sourceforge.net/p/skim-app/code/14674
Author: hofman
Date: 2024-11-11 17:17:32 +0000 (Mon, 11 Nov 2024)
Log Message:
-----------
label is allowed to be nil
Modified Paths:
--------------
trunk/SKBookmark.m
Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m 2024-11-11 17:08:52 UTC (rev 14673)
+++ trunk/SKBookmark.m 2024-11-11 17:17:32 UTC (rev 14674)
@@ -724,7 +724,7 @@
if (aLabel == nil)
[aURL getResourceValue:&aLabel
forKey:NSURLLocalizedNameKey error:NULL];
if ([doc isKindOfClass:[NSDocument class]]) {
- bookmark = [[SKBookmark alloc] initWithSetup:[doc
currentDocumentSetup] label:aLabel ?: @""];
+ bookmark = [[SKBookmark alloc] initWithSetup:[doc
currentDocumentSetup] label:aLabel];
} else {
NSUInteger aPageNumber = [[properties
objectForKey:@"pageNumber"] unsignedIntegerValue];
if (aPageNumber > 0)
@@ -733,7 +733,7 @@
aPageNumber = [docClass isPDFDocument] ? 0 :
NSNotFound;
if (aLabel == nil)
[aURL getResourceValue:&aLabel
forKey:NSURLLocalizedNameKey error:NULL];
- bookmark = [[SKBookmark alloc] initWithURL:aURL
pageIndex:aPageNumber snapshots:nil label:aLabel ?: @""];
+ bookmark = [[SKBookmark alloc] initWithURL:aURL
pageIndex:aPageNumber snapshots:nil label:aLabel];
}
} else {
[[NSScriptCommand currentCommand]
setScriptErrorNumber:NSArgumentsWrongScriptError];
@@ -749,7 +749,7 @@
if (aLabel == nil)
[aURL getResourceValue:&aLabel
forKey:NSURLLocalizedNameKey error:NULL];
}
- bookmark = [[SKBookmark alloc]
initFolderWithChildren:aChildren label:aLabel ?: @""];
+ bookmark = [[SKBookmark alloc]
initFolderWithChildren:aChildren label:aLabel];
break;
}
case SKBookmarkTypeSession:
@@ -761,7 +761,7 @@
else
aLabel = [[[NSDate date] shortDateFormat] description];
}
- bookmark = [[SKBookmark alloc] initSessionWithSetups:setups
label:aLabel ?: @""];
+ bookmark = [[SKBookmark alloc] initSessionWithSetups:setups
label:aLabel];
break;
}
case SKBookmarkTypeSeparator:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
