User: hr Date: 2006/10/24 08:05:53 Modified: dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
Log: INTEGRATION: CWS dba205c (1.4.10); FILE MERGED 2006/10/09 12:11:03 fs 1.4.10.2: no UTF-8 encoding for registry directory, use UCS2/Unicode directly Issue number: #i69327# Submitted by: [EMAIL PROTECTED] Reviewed by: [EMAIL PROTECTED] 2006/10/09 12:09:29 fs 1.4.10.1: moving changes from dba205b herein, in preparation of #i69327# File Changes: Directory: /dba/connectivity/source/drivers/mozab/bootstrap/ ============================================================ File [changed]: MNSProfileDiscover.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx?r1=1.5&r2=1.6 Delta lines: +4 -4 ------------------- --- MNSProfileDiscover.cxx 18 Oct 2006 13:10:35 -0000 1.5 +++ MNSProfileDiscover.cxx 24 Oct 2006 15:05:50 -0000 1.6 @@ -310,7 +310,7 @@ } nsCOMPtr<nsILocalFile> rootDir; - rv = NS_NewNativeLocalFile(EmptyCString(), PR_TRUE, + rv = NS_NewLocalFile(EmptyString(), PR_TRUE, getter_AddRefs(rootDir)); if (NS_FAILED(rv)) continue; @@ -461,12 +461,12 @@ ::rtl::OUString path = getProfilePath(product,profileName); if (!path.getLength()) return sal_True; - ::rtl::OString sPath = ::rtl::OUStringToOString(path, RTL_TEXTENCODING_UTF8); - nsCAutoString filePath(sPath.getStr()); + + nsAutoString filePath(path.getStr()); nsresult rv; nsCOMPtr<nsILocalFile> localFile; - rv = NS_NewNativeLocalFile(filePath, PR_TRUE, + rv = NS_NewLocalFile(filePath, PR_TRUE, getter_AddRefs(localFile)); NS_ENSURE_SUCCESS(rv,sal_True); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
