[openoffice] 06/07: #i125431# "The Password is incorrect. The file cannot be opened."

[truckman]

This is an automated email from the ASF dual-hosted git repository.

truckman pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit f27fad259a88acef21ba95dc702ebd620d3a5f56
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: 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
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1726068 
13f79535-47bb-0310-9956-ffa450edef68
---
 main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx 
b/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx
index ee7d43f..dc9cc55 100644
--- a/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx
+++ b/main/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;