[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions/source
Damjan Jovanovic
damjan at apache.org
Thu Jan 21 12:08:30 PST 2016
extensions/source/mozbootstrap/MNSProfileDiscover.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 002caf7f2a2505938e7e3c37ded4a501c3c05976
Author: Damjan Jovanovic <damjan at apache.org>
Date: Thu Jan 21 19:03:22 2016 +0000
#i125431# "The Password is incorrect. The file cannot be opened."
Fix handling of the "isRelative" option in Mozilla's profiles.ini files.
Patch by: Arrigo Marchiori <ardovm at yahoo dot it>
Review by: me
diff --git a/extensions/source/mozbootstrap/MNSProfileDiscover.cxx b/extensions/source/mozbootstrap/MNSProfileDiscover.cxx
index ee7d43f..dc9cc55 100644
--- a/extensions/source/mozbootstrap/MNSProfileDiscover.cxx
+++ b/extensions/source/mozbootstrap/MNSProfileDiscover.cxx
@@ -123,9 +123,14 @@ namespace connectivity
{
isRelative = sIsRelative.toInt32();
}
+ if (isRelative)
+ {
+ // Make it absolute
+ profilePath = regDir + profilePath;
+ }
ProfileStruct* profileItem = new ProfileStruct(product,profileName,
- regDir + profilePath);
+ profilePath);
m_Product.mProfileList[profileName] = profileItem;
sal_Int32 isDefault = 0;
More information about the Libreoffice-commits
mailing list