User: ihi Date: 2006/10/18 06:10:38 Modified: dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
Log: INTEGRATION: CWS dba205b (1.3.146); FILE MERGED 2006/09/27 08:51:32 fs 1.3.146.2: #i69864# 2006/08/04 11:29:52 fs 1.3.146.1: #i62667# API from MNSFolders.hxx made using Unicode 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.4&r2=1.5 Delta lines: +9 -8 ------------------- --- MNSProfileDiscover.cxx 17 Sep 2006 03:00:21 -0000 1.4 +++ MNSProfileDiscover.cxx 18 Oct 2006 13:10:35 -0000 1.5 @@ -161,9 +161,9 @@ //step 1 : get mozilla registry file nsCOMPtr<nsILocalFile> localFile; - ::rtl::OString regDir = getRegistryFileName(MozillaProductType_Mozilla); - nsCAutoString registryDir(regDir.getStr()); - rv = NS_NewNativeLocalFile(registryDir, PR_TRUE, + ::rtl::OUString regDir( getRegistryFileName( MozillaProductType_Mozilla ) ); + nsAutoString registryDir(regDir.getStr()); + rv = NS_NewLocalFile(registryDir, PR_TRUE, getter_AddRefs(localFile)); NS_ENSURE_SUCCESS(rv,rv); PRBool bExist; @@ -263,9 +263,10 @@ ProductStruct &m_Product = m_ProductProfileList[index]; nsresult rv; - ::rtl::OString regDir = getRegistryDir(product); - ::rtl::OUString regDirU = ::rtl::OUString::createFromAscii(regDir) + ::rtl::OUString::createFromAscii("profiles.ini"); - IniParser parser(regDirU); + ::rtl::OUString regDir = getRegistryDir(product); + ::rtl::OUString profilesIni( regDir ); + profilesIni += ::rtl::OUString::createFromAscii( "profiles.ini" ); + IniParser parser( profilesIni ); IniSectionMap &mAllSection = *(parser.getAllSection()); IniSectionMap::iterator iBegin = mAllSection.begin(); @@ -317,9 +318,9 @@ nsCAutoString filePath(sPath.getStr()); if (isRelative) { - nsCAutoString registryDir(regDir.getStr()); + nsAutoString registryDir( regDir.getStr() ); nsCOMPtr<nsILocalFile> mAppData; - rv = NS_NewNativeLocalFile(registryDir, PR_TRUE, + rv = NS_NewLocalFile(registryDir, PR_TRUE, getter_AddRefs(mAppData)); if (NS_FAILED(rv)) continue; rv = rootDir->SetRelativeDescriptor(mAppData, filePath); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
