Attachment 112472 Details for Bug 75467 – Commit 7aa4291 responsible for bug in Save as dialog

Commit 7aa4291 responsible for bug in Save as dialog

LO_7aa4291.txt (text/plain), 2.14 KB, created by Peter Nowee on 2015-01-19 14:15:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Nowee

Created: 2015-01-19 14:15:31 UTC

Size: 2.14 KB

patch

obsolete

>commit 7aa42913bb1828b877c2f73b4fe59cc3c65a67bf
>Author: Tor Lillqvist <tml@iki.fi>
>Date:   Sun Jun 16 23:01:05 2013 +0300
>
>    WaE: 'FSResolveAliasFile' is deprecated: first deprecated in OS X 10.8
>    
>    Use the bookmark API instead.
>    
>    Change-Id: I61fe91ea2c7287c52d45ddfee772ecfcfb5498b6
>
>diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm
>index c4567eb..858eb27 100644
>--- a/fpicker/source/aqua/NSURL_OOoAdditions.mm
>+++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm
>@@ -83,23 +83,25 @@ NSString* resolveAlias( NSString* i_pSystemPath )
>                                                    kCFURLPOSIXPathStyle, false);
>     if( rUrl != NULL )
>     {
>-        FSRef rFS;
>-        if( CFURLGetFSRef( rUrl, &rFS ) )
>+        CFErrorRef rError;
>+        CFDataRef rBookmark = CFURLCreateBookmarkDataFromFile( NULL, rUrl, &rError );
>+        CFRelease( rUrl );
>+        if( rBookmark != NULL )
>         {
>-            Boolean bIsFolder = false;
>-            Boolean bAlias = false;
>-            OSErr err = FSResolveAliasFile( &rFS, true, &bIsFolder, &bAlias);
>-            if( (err == noErr) && bAlias )
>+            Boolean bIsStale;
>+            CFURLRef rResolvedUrl = CFURLCreateByResolvingBookmarkData( kCFAllocatorDefault, rBookmark, kCFBookmarkResolutionWithoutUIMask,
>+                                                                        NULL, NULL, &bIsStale, &rError );
>+            CFRelease( rBookmark );
>+            if( rResolvedUrl == NULL )
>             {
>-                CFURLRef rResolvedUrl = CFURLCreateFromFSRef( kCFAllocatorDefault, &rFS );
>-                if( rResolvedUrl != NULL )
>-                {
>-                    pResolvedPath = (NSString*)CFURLCopyFileSystemPath( rResolvedUrl, kCFURLPOSIXPathStyle );
>-                    CFRelease( rResolvedUrl );
>-                }
>+                CFRelease( rError );
>+            }
>+            else
>+            {
>+                pResolvedPath = (NSString*)CFURLCopyFileSystemPath( rResolvedUrl, kCFURLPOSIXPathStyle );
>+                CFRelease( rResolvedUrl );
>             }
>         }
>-        CFRelease( rUrl );
>     }
>     
>     return pResolvedPath;

Actions: View

Attachments on bug 75467: 95178 | 112354 | 112355 | 112472 | 112473