Revision: 5459
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5459&view=rev
Author:   hofman
Date:     2009-07-03 11:15:27 +0000 (Fri, 03 Jul 2009)

Log Message:
-----------
reset and return custom export templates in a single all

Modified Paths:
--------------
    trunk/SKDocumentController.h
    trunk/SKDocumentController.m
    trunk/SKNotesDocument.m
    trunk/SKPDFDocument.m

Modified: trunk/SKDocumentController.h
===================================================================
--- trunk/SKDocumentController.h        2009-07-02 21:32:07 UTC (rev 5458)
+++ trunk/SKDocumentController.h        2009-07-03 11:15:27 UTC (rev 5459)
@@ -89,7 +89,7 @@
 - (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard error:(NSError 
**)outError;
 - (id)openDocumentWithSetup:(NSDictionary *)setup error:(NSError **)outError;
 
-- (void)resetCustomExportTemplateFiles;
 - (NSArray *)customExportTemplateFiles;
+- (NSArray *)customExportTemplateFilesResetting;
 
 @end

Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m        2009-07-02 21:32:07 UTC (rev 5458)
+++ trunk/SKDocumentController.m        2009-07-03 11:15:27 UTC (rev 5459)
@@ -408,9 +408,10 @@
     return customExportTemplateFiles;
 }
 
-- (void)resetCustomExportTemplateFiles {
+- (NSArray *)customExportTemplateFilesResetting {
     [customExportTemplateFiles release];
     customExportTemplateFiles = nil;
+    return [self customExportTemplateFiles];
 }
 
 - (NSArray *)fileExtensionsFromType:(NSString *)documentTypeName {

Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m     2009-07-02 21:32:07 UTC (rev 5458)
+++ trunk/SKNotesDocument.m     2009-07-03 11:15:27 UTC (rev 5459)
@@ -136,8 +136,7 @@
 - (NSArray *)writableTypesForSaveOperation:(NSSaveOperationType)saveOperation {
     NSMutableArray *writableTypes = [[[super 
writableTypesForSaveOperation:saveOperation] mutableCopy] autorelease];
     if (saveOperation == NSSaveToOperation) {
-        [[NSDocumentController sharedDocumentController] 
resetCustomExportTemplateFiles];
-        NSEnumerator *fileEnum = [[[NSDocumentController 
sharedDocumentController] customExportTemplateFiles] objectEnumerator];
+        NSEnumerator *fileEnum = [[[NSDocumentController 
sharedDocumentController] customExportTemplateFilesResetting] objectEnumerator];
         NSString *file;
         while (file = [fileEnum nextObject]) {
             if ([[file pathExtension] caseInsensitiveCompare:@"rtfd"] != 
NSOrderedSame)

Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m       2009-07-02 21:32:07 UTC (rev 5458)
+++ trunk/SKPDFDocument.m       2009-07-03 11:15:27 UTC (rev 5459)
@@ -253,8 +253,7 @@
         [writableTypes removeObject:SKBareDVIDocumentType];
     }
     if (saveOperation == NSSaveToOperation) {
-        [[NSDocumentController sharedDocumentController] 
resetCustomExportTemplateFiles];
-        [writableTypes addObjectsFromArray:[[NSDocumentController 
sharedDocumentController] customExportTemplateFiles]];
+        [writableTypes addObjectsFromArray:[[NSDocumentController 
sharedDocumentController] customExportTemplateFilesResetting]];
     }
     return writableTypes;
 }


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to