Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
55e74e06
Kaydet (Commit)
55e74e06
authored
Haz 18, 2013
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Avoid deprecated API
Change-Id: I703e94b999382f52331a61050eaf3d31073f5a9c
üst
4286070e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
17 deletions
+11
-17
SalAquaPicker.mm
fpicker/source/aqua/SalAquaPicker.mm
+11
-17
No files found.
fpicker/source/aqua/SalAquaPicker.mm
Dosyayı görüntüle @
55e74e06
...
@@ -165,30 +165,27 @@ int SalAquaPicker::run()
...
@@ -165,30 +165,27 @@ int SalAquaPicker::run()
int retVal = 0;
int retVal = 0;
NS
String
*startDirectory;
NS
URL
*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()
...
@@ -196,14 +193,11 @@ int SalAquaPicker::run()
}
}
if (retVal == NSFileHandlingPanelOKButton) {
if (retVal == NSFileHandlingPanelOKButton) {
NS
String* pDir = [m_pDialog directory
];
NS
URL* 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];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment