MAC_OS_X_VERSION_MAX_ALLOWED is always >= 1080 now

Change-Id: Ieae67cbf917cdf4bca2b0d6c1697eddc6137dbe2

4 files changed, 0 insertions, 57 deletions

diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index d162af3c2490..cef9074623ae 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -385,11 +385,7 @@ bool FilterHelper::filenameMatchesFilter(NSString* sFilename)
     }
 
     NSFileManager *manager = [NSFileManager defaultManager];
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
-    NSDictionary* pAttribs = [manager fileAttributesAtPath: sFilename traverseLink: NO];
-#else
     NSDictionary* pAttribs = [manager attributesOfItemAtPath: sFilename error: nil];
-#endif
     if( pAttribs )
     {
         NSObject* pType = [pAttribs objectForKey: NSFileType];
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm
index 80acb10b6745..858eb27f04a4 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm
@@ -83,25 +83,6 @@ NSString* resolveAlias( NSString* i_pSystemPath )
                                                    kCFURLPOSIXPathStyle, false);
     if( rUrl != NULL )
     {
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
-        FSRef rFS;
-        if( CFURLGetFSRef( rUrl, &rFS ) )
-        {
-            Boolean bIsFolder = false;
-            Boolean bAlias = false;
-            OSErr err = FSResolveAliasFile( &rFS, true, &bIsFolder, &bAlias);
-            if( (err == noErr) && bAlias )
-            {
-                CFURLRef rResolvedUrl = CFURLCreateFromFSRef( kCFAllocatorDefault, &rFS );
-                if( rResolvedUrl != NULL )
-                {
-                    pResolvedPath = (NSString*)CFURLCopyFileSystemPath( rResolvedUrl, kCFURLPOSIXPathStyle );
-                    CFRelease( rResolvedUrl );
-                }
-            }
-        }
-        CFRelease( rUrl );
-#else
         CFErrorRef rError;
         CFDataRef rBookmark = CFURLCreateBookmarkDataFromFile( NULL, rUrl, &rError );
         CFRelease( rUrl );
@@ -121,7 +102,6 @@ NSString* resolveAlias( NSString* i_pSystemPath )
                 CFRelease( rResolvedUrl );
             }
         }
-#endif
     }
     
     return pResolvedPath;
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 3e69877bc421..588baa6986cc 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -769,11 +769,7 @@ void SalAquaFilePicker::updateSaveFileNameExtension() {
         rtl::OUString suffix = (*(aStringList.begin())).copy(1);
         NSString *requiredFileType = [NSString stringWithOUString:suffix];
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
-        [m_pDialog setRequiredFileType:requiredFileType];
-#else
         [m_pDialog setAllowedFileTypes:[NSArray arrayWithObjects:requiredFileType, nil]];
-#endif
 
         OSL_TRACE("disallowing other file types");
         [m_pDialog setAllowsOtherFileTypes:NO];
diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index baff7c36f28a..664088fa2fe0 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -165,19 +165,6 @@ int SalAquaPicker::run()
 
     int retVal = 0;
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
-    NSString *startDirectory;
-    if (m_sDisplayDirectory.getLength() > 0) {
-        NSString *temp = [NSString stringWithOUString:m_sDisplayDirectory];
-        NSURL *url = [NSURL URLWithString:temp];
-        startDirectory = [url path];
-
-        OSL_TRACE("start dir: %s", [startDirectory UTF8String]);
-    }
-    else {
-        startDirectory = NSHomeDirectory();
-    }
-#else
     NSURL *startDirectory;
     if (m_sDisplayDirectory.getLength() > 0) {
         NSString *temp = [NSString stringWithOUString:m_sDisplayDirectory];
@@ -188,26 +175,17 @@ int SalAquaPicker::run()
     else {
         startDirectory = [NSURL fileURLWithPath:NSHomeDirectory() isDirectory:YES];
     }
-#endif
 
     switch(m_nDialogType) {
         case NAVIGATIONSERVICES_DIRECTORY:
         case NAVIGATIONSERVICES_OPEN:
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
-            retVal = [(NSOpenPanel*)m_pDialog runModalForDirectory:startDirectory file:nil types:nil];
-#else
             [m_pDialog setDirectoryURL:startDirectory];
             retVal = [(NSOpenPanel*)m_pDialog runModal];
-#endif
             break;
         case NAVIGATIONSERVICES_SAVE:
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
-            retVal = [m_pDialog runModalForDirectory:startDirectory file:[NSString stringWithOUString:((SalAquaFilePicker*)this)->getSaveFileName()]];
-#else
             [m_pDialog setDirectoryURL:startDirectory];
             [m_pDialog setNameFieldStringValue:[NSString stringWithOUString:((SalAquaFilePicker*)this)->getSaveFileName()]];
             retVal = [m_pDialog runModal];
-#endif
             break;
         // [m_pDialog beginSheetForDirectory:startDirectory file:[m_pDialog saveFilename] modalForWindow:[NSApp keyWindow] modalDelegate:((SalAquaFilePicker*)this)->getDelegate() didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:nil];
         default:
@@ -215,17 +193,10 @@ int SalAquaPicker::run()
     }
 
     if (retVal == NSFileHandlingPanelOKButton) {
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
-        NSString* pDir = [m_pDialog directory];
-        if (pDir) {
-            implsetDisplayDirectory([[NSURL fileURLWithPath:pDir] OUStringForInfo:FULLPATH]);
-        }
-#else
         NSURL* pDir = [m_pDialog directoryURL];
         if (pDir) {
             implsetDisplayDirectory([pDir OUStringForInfo:FULLPATH]);
         }
-#endif
     }
     DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);