[Bibdesk-commit] SF.net SVN: bibdesk:[28230] trunk/bibdesk

[hofman--- via Bibdesk-commit]

Revision: 28230
          http://sourceforge.net/p/bibdesk/svn/28230
Author:   hofman
Date:     2023-04-20 14:05:23 +0000 (Thu, 20 Apr 2023)
Log Message:
-----------
get attributed string from pdf document in calling method

Modified Paths:
--------------
    trunk/bibdesk/BDSKItemPasteboardHelper.m
    trunk/bibdesk/PDFDocument_BDSKExtensions.h
    trunk/bibdesk/PDFDocument_BDSKExtensions.m

Modified: trunk/bibdesk/BDSKItemPasteboardHelper.m
===================================================================
--- trunk/bibdesk/BDSKItemPasteboardHelper.m    2023-04-20 13:49:31 UTC (rev 
28229)
+++ trunk/bibdesk/BDSKItemPasteboardHelper.m    2023-04-20 14:05:23 UTC (rev 
28230)
@@ -40,7 +40,6 @@
 #import "BibItem.h"
 #import "NSArray_BDSKExtensions.h"
 #import "NSPasteboard_BDSKExtensions.h"
-#import "PDFDocument_BDSKExtensions.h"
 #import <Quartz/Quartz.h>
 
 #define TYPES_KEY @"types"
@@ -373,8 +372,19 @@
             result = [texTask PDFData];
             if (dragCopyType == BDSKDragCopyRTF && result) {
                 PDFDocument *pdfDoc = [[PDFDocument alloc] 
initWithData:result];
-                NSAttributedString *attrString = [pdfDoc attributedString];
+                NSUInteger i, count = [pdfDoc pageCount];
+                NSMutableAttributedString *attrString = 
[[NSMutableAttributedString alloc] init];
+                [attrString beginEditing];
+                for (i = 0; i < count; i++) {
+                    if (i > 0)
+                        [[attrString mutableString] appendString:@"\n"];
+                    NSAttributedString *pageString = [[pdfDoc pageAtIndex:i] 
attributedString];
+                    if (pageString)
+                        [attrString appendAttributedString:pageString];
+                }
+                [attrString endEditing];
                 result = [attrString RTFFromRange:NSMakeRange(0, [attrString 
length]) documentAttributes:[NSDictionary 
dictionaryWithObjectsAndKeys:NSRTFTextDocumentType, 
NSDocumentTypeDocumentAttribute, nil]];
+                [attrString release];
                 [pdfDoc release];
             }
         }

Modified: trunk/bibdesk/PDFDocument_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/PDFDocument_BDSKExtensions.h  2023-04-20 13:49:31 UTC (rev 
28229)
+++ trunk/bibdesk/PDFDocument_BDSKExtensions.h  2023-04-20 14:05:23 UTC (rev 
28230)
@@ -46,6 +46,4 @@
 - (id)initWithPostScriptData:(NSData *)data;
 - (id)initWithPostScriptURL:(NSURL *)fileURL;
 
-- (NSAttributedString *)attributedString;
-
 @end

Modified: trunk/bibdesk/PDFDocument_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/PDFDocument_BDSKExtensions.m  2023-04-20 13:49:31 UTC (rev 
28229)
+++ trunk/bibdesk/PDFDocument_BDSKExtensions.m  2023-04-20 14:05:23 UTC (rev 
28230)
@@ -96,20 +96,4 @@
     return [self initWithPostScriptData:[NSData 
dataWithContentsOfURL:fileURL]];
 }
 
-- (NSAttributedString *)attributedString;
-{
-    NSUInteger i, count = [self pageCount];
-    NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] 
init];
-    [attrString beginEditing];
-    for (i = 0; i < count; i++) {
-        if (i > 0)
-            [[attrString mutableString] appendString:@"\n"];
-        NSAttributedString *pageString = [[self pageAtIndex:i] 
attributedString];
-        if (pageString)
-            [attrString appendAttributedString:pageString];
-    }
-    [attrString endEditing];
-    return [attrString autorelease];
-}
-
 @end

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



_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit