Revision: 3633
http://skim-app.svn.sourceforge.net/skim-app/?rev=3633&view=rev
Author: hofman
Date: 2008-04-05 05:29:56 -0700 (Sat, 05 Apr 2008)
Log Message:
-----------
Check for non-conformance to embedded/bare PDF UTIs in wrapper function
checking for PDF conformance. Also check PDF when checking for FDF, because
someone might declare com.adobe.fdf as conforming to com.adobe.pdf.
Modified Paths:
--------------
trunk/SKDocumentController.m
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2008-04-05 12:22:32 UTC (rev 3632)
+++ trunk/SKDocumentController.m 2008-04-05 12:29:56 UTC (rev 3633)
@@ -86,7 +86,9 @@
}
BOOL SKIsPDFDocumentType(NSString *docType) {
- return SKIsEqualToDocumentType(docType, SKPDFDocumentTypeName,
SKPDFDocumentUTI);
+ return SKIsEqualToDocumentType(docType, SKPDFDocumentTypeName,
SKPDFDocumentUTI) &&
+ NO == SKIsEmbeddedPDFDocumentType(docType, SKPDFDocumentTypeName,
SKPDFDocumentUTI) &&
+ NO == SKIsBarePDFDocumentType(docType, SKPDFDocumentTypeName,
SKPDFDocumentUTI);
}
BOOL SKIsPDFBundleDocumentType(NSString *docType) {
return SKIsEqualToDocumentType(docType, SKPDFBundleDocumentTypeName,
SKPDFBundleDocumentUTI);
@@ -110,7 +112,8 @@
return SKIsEqualToDocumentType(docType, SKNotesRTFDDocumentTypeName,
SKRTFDDocumentUTI);
}
BOOL SKIsNotesFDFDocumentType(NSString *docType) {
- return SKIsEqualToDocumentType(docType, SKNotesFDFDocumentTypeName,
SKFDFDocumentUTI);
+ return SKIsEqualToDocumentType(docType, SKNotesFDFDocumentTypeName,
SKFDFDocumentUTI) &&
+ NO == SKIsEqualToDocumentType(docType, SKPDFDocumentTypeName,
SKPDFDocumentUTI);
}
BOOL SKIsPostScriptDocumentType(NSString *docType) {
return SKIsEqualToDocumentType(docType, SKPostScriptDocumentTypeName,
SKPostScriptDocumentUTI);
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 the 2008 JavaOne(SM) Conference
Register now and save $200. Hurry, offer ends at 11:59 p.m.,
Monday, April 7! Use priority code J8TLD2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
