Tag: cws_src680_dba205c User: fs Date: 2006/10/09 05:11:07 Modified: dba/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
Log: no UTF-8 encoding for registry directory, use UCS2/Unicode directly Issue number: #i69327# Submitted by: [EMAIL PROTECTED] Reviewed by: [EMAIL PROTECTED] File Changes: Directory: /dba/connectivity/source/drivers/mozab/bootstrap/ ============================================================ File [changed]: MNSProfile.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx?r1=1.7&r2=1.7.10.1 Delta lines: +5 -6 ------------------- --- MNSProfile.cxx 17 Sep 2006 02:59:44 -0000 1.7 +++ MNSProfile.cxx 9 Oct 2006 12:11:03 -0000 1.7.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: MNSProfile.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.10.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 02:59:44 $ + * last change: $Author: fs $ $Date: 2006/10/09 12:11:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -474,10 +474,9 @@ rtl::OUString path = xMozillaBootstrap->getProfilePath(xMozillaBootstrap->getCurrentProduct(),profileName); nsCOMPtr<nsILocalFile> localFile; - rtl::OString sPath = OUStringToOString(path, RTL_TEXTENCODING_UTF8); - nsCAutoString filePath(sPath.getStr()); + nsAutoString filePath(path.getStr()); - rv = NS_NewNativeLocalFile(filePath, PR_TRUE, + rv = NS_NewLocalFile(filePath, PR_TRUE, getter_AddRefs(localFile)); if (localFile && NS_SUCCEEDED(rv)) return localFile->QueryInterface(NS_GET_IID(nsIFile), (void**)profileDir); File [changed]: MNSProfileDiscover.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx?r1=1.4.10.1&r2=1.4.10.2 Delta lines: +6 -6 ------------------- --- MNSProfileDiscover.cxx 9 Oct 2006 12:09:29 -0000 1.4.10.1 +++ MNSProfileDiscover.cxx 9 Oct 2006 12:11:03 -0000 1.4.10.2 @@ -4,9 +4,9 @@ * * $RCSfile: MNSProfileDiscover.cxx,v $ * - * $Revision: 1.4.10.1 $ + * $Revision: 1.4.10.2 $ * - * last change: $Author: fs $ $Date: 2006/10/09 12:09:29 $ + * last change: $Author: fs $ $Date: 2006/10/09 12:11:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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]
