From 87a8191f3092d321dd045da19295b79b1247c248 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Wed, 14 May 2008 08:41:16 +0000
Subject: INTEGRATION: CWS vcl88 (1.15.18); FILE MERGED 2008/04/17 05:49:53 pl
 1.15.18.2: RESYNC: (1.15-1.16); FILE MERGED 2008/04/15 15:04:43 pl 1.15.18.1:
 #i87991# catch NULL ptr (thanks cmc)

---
 fpicker/source/unx/gnome/SalGtkPicker.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'fpicker')

diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx
index 938ab3c06e70..69adb8c64c67 100644
--- a/fpicker/source/unx/gnome/SalGtkPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: SalGtkPicker.cxx,v $
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -61,6 +61,9 @@ using namespace ::com::sun::star::uno;
 
 rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn)
 {
+    if (!pIn)
+        return rtl::OUString();
+
     rtl::OUString sURL( const_cast<const sal_Char *>(pIn), strlen(pIn),
         RTL_TEXTENCODING_UTF8 );
 
-- 
cgit