Revision: 7480
http://skim-app.svn.sourceforge.net/skim-app/?rev=7480&view=rev
Author: hofman
Date: 2011-09-08 12:40:40 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
fix merging and don't allow merging with a PDF with print restrictions
Modified Paths:
--------------
trunk/SkimNotes/skimpdf.m
Modified: trunk/SkimNotes/skimpdf.m
===================================================================
--- trunk/SkimNotes/skimpdf.m 2011-09-08 11:49:58 UTC (rev 7479)
+++ trunk/SkimNotes/skimpdf.m 2011-09-08 12:40:40 UTC (rev 7480)
@@ -210,7 +210,7 @@
if (action == SKNActionMerge) {
inPath2 = SKNNormalizedPath([args objectAtIndex:3]);
inURL2 = [NSURL fileURLWithPath:inPath2];
- pdfDoc2 = [[[PDFDocument alloc] initWithURL:inURL] autorelease];
+ pdfDoc2 = [[[PDFDocument alloc] initWithURL:inURL2] autorelease];
}
NSFileManager *fm = [NSFileManager defaultManager];
@@ -220,7 +220,7 @@
error = [NSError errorWithDomain:NSPOSIXErrorDomain code:ENOENT
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"PDF file does not exist",
NSLocalizedDescriptionKey, nil]];
- } else if (pdfDoc == nil || [pdfDoc allowsPrinting] == NO || (inPath2
&& (pdfDoc2 == nil || [pdfDoc2 isLocked]))) {
+ } else if (pdfDoc == nil || [pdfDoc allowsPrinting] == NO || (inPath2
&& (pdfDoc2 == nil || [pdfDoc2 allowsPrinting] == NO))) {
error = [NSError errorWithDomain:NSPOSIXErrorDomain code:ENOENT
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"Cannot create PDF
document", NSLocalizedDescriptionKey, nil]];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Doing More with Less: The Next Generation Virtual Desktop
What are the key obstacles that have prevented many mid-market businesses
from deploying virtual desktops? How do next-generation virtual desktops
provide companies an easier-to-deploy, easier-to-manage and more affordable
virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
