diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-10-16 10:13:46 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-10-16 11:22:12 +0300 |
commit | b02e958fa0bf7d062a5b8aff03d22325e3068feb (patch) | |
tree | e76ec94b574b2f371cbcfe88611dda27d8c80467 /fpicker/source/aqua/SalAquaPicker.mm | |
parent | Resolves: fdo#81496 crash in calc format page (diff) | |
download | core-b02e958fa0bf7d062a5b8aff03d22325e3068feb.tar.gz core-b02e958fa0bf7d062a5b8aff03d22325e3068feb.zip |
MAC_OS_X_VERSION_MAX_ALLOWED is always >= 1080 now
Change-Id: Ieae67cbf917cdf4bca2b0d6c1697eddc6137dbe2
Diffstat (limited to 'fpicker/source/aqua/SalAquaPicker.mm')
-rw-r--r-- | fpicker/source/aqua/SalAquaPicker.mm | 29 |
1 files changed, 0 insertions, 29 deletions
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); |