Kaydet (Commit) fff2d18a authored tarafından Markus Mohrhard's avatar Markus Mohrhard

respect absolute paths for mozilla profile, fdo#45171, lp#919659

Change-Id: I536238f1f3b05e0a942caa1f65444688d4d36704
üst c77110b4
......@@ -203,13 +203,13 @@ namespace connectivity
}
if (!(profileName.isEmpty() && profilePath.isEmpty()))
{
#ifndef MINIMAL_PROFILEDISCOVER
sal_Int32 isRelative = 0;
if (!sIsRelative.isEmpty())
{
isRelative = sIsRelative.toInt32();
}
#ifndef MINIMAL_PROFILEDISCOVER
nsCOMPtr<nsILocalFile> rootDir;
rv = NS_NewLocalFile(EmptyString(), PR_TRUE,
getter_AddRefs(rootDir));
......@@ -230,11 +230,21 @@ namespace connectivity
rv = rootDir->SetPersistentDescriptor(filePath);
}
if (NS_FAILED(rv)) continue;
#else
rtl::OUString fullProfilePath;
if(isRelative)
{
fullProfilePath = regDir + profilePath;
}
else
{
fullProfilePath = profilePath;
}
#endif
ProfileStruct* profileItem = new ProfileStruct(product,profileName,
#ifdef MINIMAL_PROFILEDISCOVER
regDir + profilePath
fullProfilePath
#else
rootDir
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment