[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source

[Michael Stahl]

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

New commits:
commit 3ee18325cf8c06c04296173619f4535671e391e9
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Thu May 3 23:03:50 2012 +0200

    respect absolute paths for mozilla profile, fdo#45171, lp#919659
    
    Change-Id: I536238f1f3b05e0a942caa1f65444688d4d36704
    (cherry picked from commit fff2d18a08a37c0fa6a370e56591117fc08664d2)
    
    Signed-off-by: Michael Stahl <mst...@redhat.com>

diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx 
b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index be2eb8c..5e8fecb 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -202,13 +202,13 @@ namespace connectivity
                 }
                 if (profileName.getLength() != 0 || profilePath.getLength() != 
0)
                 {
-#ifndef MINIMAL_PROFILEDISCOVER
                     sal_Int32 isRelative = 0;
                     if (sIsRelative.getLength() != 0)
                     {
                         isRelative = sIsRelative.toInt32();
                     }
 
+#ifndef MINIMAL_PROFILEDISCOVER
                     nsCOMPtr<nsILocalFile> rootDir;
                     rv = NS_NewLocalFile(EmptyString(), PR_TRUE,
                                             getter_AddRefs(rootDir));
@@ -229,11 +229,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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits