diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-01-21 13:08:56 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-01-21 13:08:56 +0100 |
| commit | c931cca51fec6a327e94b22e93f0e2fb3fa1e43f (patch) | |
| tree | bf32eee85eff0d8e4bb03908752911ddbdd41be9 | |
| parent | 27681d609137cc1c8b8957ada9b2b54061311cec (diff) | |
| parent | 14017c25807282b7c039828b3fc75f173fc19b87 (diff) | |
removetooltypes01: #i112600# Merge changes
| -rw-r--r-- | fpicker/source/aqua/AquaFilePickerDelegate.hxx | 2 | ||||
| -rw-r--r-- | fpicker/source/aqua/AquaFilePickerDelegate.mm | 2 | ||||
| -rw-r--r-- | fpicker/source/aqua/NSURL_OOoAdditions.mm | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.hxx b/fpicker/source/aqua/AquaFilePickerDelegate.hxx index 9515cdb59aa9..e17defb2b712 100644 --- a/fpicker/source/aqua/AquaFilePickerDelegate.hxx +++ b/fpicker/source/aqua/AquaFilePickerDelegate.hxx @@ -45,7 +45,7 @@ class FilterHelper; - (void)setFilterHelper:(FilterHelper*)filterHelper; -- (MacOSBOOL)panel:(id)sender shouldShowFilename:(NSString *)filename; +- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename; - (void)panelSelectionDidChange:(id)sender; - (void)panel:(id)sender directoryDidChange:(NSString *)path; diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.mm b/fpicker/source/aqua/AquaFilePickerDelegate.mm index 4266453a7102..d5c906281475 100644 --- a/fpicker/source/aqua/AquaFilePickerDelegate.mm +++ b/fpicker/source/aqua/AquaFilePickerDelegate.mm @@ -56,7 +56,7 @@ #pragma mark NSSavePanel delegate methods -- (MacOSBOOL)panel:(id)sender shouldShowFilename:(NSString *)filename +- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename { if( filterHelper == NULL ) return true; diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm index ecc38b7e232b..6be80a765228 100644 --- a/fpicker/source/aqua/NSURL_OOoAdditions.mm +++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm @@ -92,8 +92,8 @@ NSString* resolveAlias( NSString* i_pSystemPath ) FSRef rFS; if( CFURLGetFSRef( rUrl, &rFS ) ) { - MacOSBoolean bIsFolder = false; - MacOSBoolean bAlias = false; + Boolean bIsFolder = false; + Boolean bAlias = false; OSErr err = FSResolveAliasFile( &rFS, true, &bIsFolder, &bAlias); if( (err == noErr) && bAlias ) { |