You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/01/21 20:03:22 UTC

svn commit: r1726068 - /openoffice/trunk/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx

Author: damjan
Date: Thu Jan 21 19:03:22 2016
New Revision: 1726068

URL: http://svn.apache.org/viewvc?rev=1726068&view=rev
Log:
#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


Modified:
    openoffice/trunk/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx

Modified: openoffice/trunk/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx?rev=1726068&r1=1726067&r2=1726068&view=diff
==============================================================================
--- openoffice/trunk/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx (original)
+++ openoffice/trunk/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx Thu Jan 21 19:03:22 2016
@@ -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;