[Libreoffice-commits] .: connectivity/source

[Markus Mohrhard]

 connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx |   14 ++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit fff2d18a08a37c0fa6a370e56591117fc08664d2
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu May 3 23:03:50 2012 +0200

    respect absolute paths for mozilla profile, fdo#45171, lp#919659
    
    Change-Id: I536238f1f3b05e0a942caa1f65444688d4d36704

diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index 959896a..9a4b211 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -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