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

removetooltypes01: #i112600# Merge changes

Browse Source
This commit is contained in:
Carsten Driesner
2011-01-21 13:08:56 +01:00
parent 27681d6091 14017c2580
commit c931cca51f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fpicker/source/aqua/AquaFilePickerDelegate.hxx
View File

@@ -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;

2
fpicker/source/aqua/AquaFilePickerDelegate.mm
View File

@@ -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;

4
fpicker/source/aqua/NSURL_OOoAdditions.mm
View File

@@ -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 )
{