summaryrefslogtreecommitdiff
path: root/fpicker/source/unx
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2006-08-03 12:20:28 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2006-08-03 12:20:28 +0000
commit8aa9253521a92d5ac1d3e42165a6181d5a7a597d (patch)
tree6f3287d14017904a3c3cea99218619e834b8ee03 /fpicker/source/unx
parent818884ebc168b595c4f7bc43e52b00ada5134b03 (diff)
INTEGRATION: CWS fpicker6 (1.10.4); FILE MERGED
2006/08/01 17:45:26 cmc 1.10.4.1: #i63263# multiselect support
Diffstat (limited to 'fpicker/source/unx')
-rw-r--r--fpicker/source/unx/gnome/SalGtkPicker.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx
index 5fff3bf80fac..a08fc637236c 100644
--- a/fpicker/source/unx/gnome/SalGtkPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: SalGtkPicker.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: vg $ $Date: 2006-05-16 08:05:56 $
+ * last change: $Author: ihi $ $Date: 2006-08-03 13:20:28 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -80,6 +80,9 @@ using namespace ::com::sun::star::uno;
rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn)
{
+ rtl::OUString aEmpty;
+ g_return_val_if_fail (pIn != NULL, aEmpty);
+
rtl::OUString sURL( const_cast<const sal_Char *>(pIn), strlen(pIn),
RTL_TEXTENCODING_UTF8 );