[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-6-2-g50c6ec4

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit 50c6ec4df613bab1f50e4281f59329f48c489f84
Author: Rene Engelhard <rene@debian.org>
Date:   Thu May 3 23:39:21 2012 +0200

    add patch from upstream master to respect absolute paths for mozilla profile

diff --git a/changelog b/changelog
index cef461f..d05ae9f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:3.5.2-7) UNRELEASED; urgency=low
+
+  * debian/patches/mozilla-profile-absolute-paths.diff: add patch from
+    upstream master to respect absolute paths for mozilla profile
+    (closes: #659733) 
+
+ -- Rene Engelhard <rene@debian.org>  Thu, 03 May 2012 23:37:38 +0200
+
 libreoffice (1:3.5.2-6) unstable; urgency=low
 
   [ Rene Engelhard ]
diff --git a/patches/mozilla-profile-absolute-paths.diff b/patches/mozilla-profile-absolute-paths.diff
new file mode 100644
index 0000000..3ab5e0b
--- /dev/null
+++ b/patches/mozilla-profile-absolute-paths.diff
@@ -0,0 +1,51 @@
+From fff2d18a08a37c0fa6a370e56591117fc08664d2 Mon Sep 17 00:00:00 2001
+From: Markus Mohrhard <markus.mohrhard@googlemail.com>
+Date: Thu, 03 May 2012 21:03:50 +0000
+Subject: 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
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index d465167..b833436 100644
--- a/patches/series
+++ b/patches/series
@@ -40,3 +40,4 @@ lp-926940-visio-mime-for-draw.diff
 gcc-4.4.diff
 lp-904212-add-missing-mimetypes-to-impress.desktop.diff
 ignore-sc_cellrangesbase-fails.diff
+mozilla-profile-absolute-paths.diff

-- 
LibreOffice packaging repository