mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid deprecated API

Browse Source 
Change-Id: I703e94b999382f52331a61050eaf3d31073f5a9c
This commit is contained in:
Tor Lillqvist
2013-06-19 00:02:44 +03:00
parent 4286070ec5
commit 55e74e06ff
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
fpicker/source/aqua/SalAquaPicker.mm
View File

@@ -165,30 +165,27 @@ int SalAquaPicker::run()
int retVal = 0; int retVal = 0;
NSString *startDirectory; NSURL *startDirectory;
if (m_sDisplayDirectory.getLength() > 0) { if (m_sDisplayDirectory.getLength() > 0) {
NSString *temp = [NSString stringWithOUString:m_sDisplayDirectory]; NSString *temp = [NSString stringWithOUString:m_sDisplayDirectory];
NSURL *url = [NSURL URLWithString:temp]; startDirectory = [NSURL URLWithString:temp];
startDirectory = [url path];
OSL_TRACE("start dir: %s", [startDirectory UTF8String]); OSL_TRACE("start dir: %s", [startDirectory path]);
// NSLog(@"%@", startDirectory);
} }
else { else {
startDirectory = NSHomeDirectory(); startDirectory = [NSURL fileURLWithPath:NSHomeDirectory() isDirectory:YES];
} }
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
#pragma GCC diagnostic push
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#endif
switch(m_nDialogType) { switch(m_nDialogType) {
case NAVIGATIONSERVICES_DIRECTORY: case NAVIGATIONSERVICES_DIRECTORY:
case NAVIGATIONSERVICES_OPEN: case NAVIGATIONSERVICES_OPEN:
retVal = [(NSOpenPanel*)m_pDialog runModalForDirectory:startDirectory file:nil types:nil]; [m_pDialog setDirectoryURL:startDirectory];
retVal = [(NSOpenPanel*)m_pDialog runModal];
break; break;
case NAVIGATIONSERVICES_SAVE: case NAVIGATIONSERVICES_SAVE:
retVal = [m_pDialog runModalForDirectory:startDirectory file:[NSString stringWithOUString:((SalAquaFilePicker*)this)->getSaveFileName()]/*[m_pDialog saveFilename]*/]; [m_pDialog setDirectoryURL:startDirectory];
[m_pDialog setNameFieldStringValue:[NSString stringWithOUString:((SalAquaFilePicker*)this)->getSaveFileName()]];
retVal = [m_pDialog runModal];
break; break;
// [m_pDialog beginSheetForDirectory:startDirectory file:[m_pDialog saveFilename] modalForWindow:[NSApp keyWindow] modalDelegate:((SalAquaFilePicker*)this)->getDelegate() didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:nil]; // [m_pDialog beginSheetForDirectory:startDirectory file:[m_pDialog saveFilename] modalForWindow:[NSApp keyWindow] modalDelegate:((SalAquaFilePicker*)this)->getDelegate() didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:nil];
default: default:
@@ -196,14 +193,11 @@ int SalAquaPicker::run()
} }
if (retVal == NSFileHandlingPanelOKButton) { if (retVal == NSFileHandlingPanelOKButton) {
NSString* pDir = [m_pDialog directory]; NSURL* pDir = [m_pDialog directoryURL];
if (pDir) { if (pDir) {
implsetDisplayDirectory([[NSURL fileURLWithPath:pDir] OUStringForInfo:FULLPATH]); implsetDisplayDirectory([pDir OUStringForInfo:FULLPATH]);
} }
} }
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
#pragma GCC diagnostic pop
#endif
DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal); DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
[pool release]; [pool release];