[ooo-build-commit] Branch 'ooo/OOO310' - fpicker/source

[Jan Holesovsky]

 fpicker/source/aqua/AquaFilePickerDelegate.mm |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 3caba386de1dd78c0273d7210b01d643e4d00163
Author: Kurt Zenker <kz at openoffice.org>
Date:   Tue Jun 30 16:19:56 2009 +0000

    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 at 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

diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.mm b/fpicker/source/aqua/AquaFilePickerDelegate.mm
index 2bece2d..7a55749 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);
 }