summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2009-06-30 16:19:56 +0000
committerKurt Zenker <kz@openoffice.org>2009-06-30 16:19:56 +0000
commit3caba386de1dd78c0273d7210b01d643e4d00163 (patch)
tree49816af43838be191fd43062ad793b0d0379d72c
parentd1b246f90733d6cb1a9cda4310dee0e88c62ccbd (diff)
CWS-TOOLING: integrate CWS ooo311gsl04
2009-06-25 18:59:25 +0200 pl r273391 : add forgotten patch flags for cws: ooo311gsl01,ooo311gsl02,ooo311gsl03,ooo311gsl04,svp02,c28v001 2009-06-25 18:05:10 +0200 pl r273388 : CWS-TOOLING: rebase CWS ooo311gsl04 to branches/OOO310@272865 (milestone: OOO310:m13) 2009-06-15 16:57:19 +0200 pl r273001 : #i98804# check for nil 2009-06-11 07:14:52 +0200 hdu r272842 : #i102603# make rotated+shuffled text export work again
-rw-r--r--fpicker/source/aqua/AquaFilePickerDelegate.mm4
1 files changed, 3 insertions, 1 deletions
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.mm b/fpicker/source/aqua/AquaFilePickerDelegate.mm
index 2bece2d90e..7a55749519 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.mm
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.mm
@@ -59,8 +59,10 @@
- (MacOSBOOL)panel:(id)sender shouldShowFilename:(NSString *)filename
{
- if (filterHelper == NULL)
+ if( filterHelper == NULL )
return true;
+ if( filename == nil )
+ return false;
return filterHelper->filenameMatchesFilter(filename);
}