summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2005-08-05 14:14:39 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2005-08-05 14:14:39 +0000
commit6b1f7082aa4da62709fc387c9a69385addb536f9 (patch)
tree7f42ce451533da45f71d44e4b9133dcb5df85d05 /fpicker
parent6e5606d5b17df10d3de289c90afaa9564fb530dc (diff)
INTEGRATION: CWS cmcfixes13 (1.7.6); FILE MERGED
2005/07/28 10:46:33 cmc 1.7.6.1: #i52555# # marks in filenames
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/unx/gnome/SalGtkPicker.cxx13
1 files changed, 7 insertions, 6 deletions
diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx
index 4ef79dd157d2..1756be5c0700 100644
--- a/fpicker/source/unx/gnome/SalGtkPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: SalGtkPicker.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: kz $ $Date: 2005-07-12 11:59:23 $
+ * last change: $Author: hr $ $Date: 2005-08-05 15:14:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -112,10 +112,11 @@ rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn)
if (INET_PROT_FILE == aURL.GetProtocol())
{
gchar *pEncodedFileName = g_filename_from_uri(pIn, NULL, NULL);
- rtl::OUString sEncoded(pEncodedFileName, strlen(pEncodedFileName), osl_getThreadTextEncoding());
- INetURLObject aCurrentURL(OUString::createFromAscii("file://") + sEncoded);
- aCurrentURL.SetHost(aURL.GetHost());
- sURL = aCurrentURL.getExternalURL();
+ rtl::OUString sEncoded(pEncodedFileName, strlen(pEncodedFileName),
+ osl_getThreadTextEncoding());
+ INetURLObject aCurrentURL(sEncoded, INetURLObject::FSYS_UNX);
+ aCurrentURL.SetHost(aURL.GetHost());
+ sURL = aCurrentURL.getExternalURL();
}
return sURL;
}