[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-6-3-g61a76af

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

The following commit has been merged in the master branch:
commit 61a76af9e8a99b73510a3c617c8ce5b67787c316
Author: Rene Engelhard <rene@debian.org>
Date:   Fri May 4 00:20:33 2012 +0200

    use actually applying patch from libreoffice-3-5 branch...

diff --git a/changelog b/changelog
index d05ae9f..5170a72 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,7 @@
 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
+    libreoffice-3-5 branch to respect absolute paths for mozilla profile
     (closes: #659733) 
 
  -- Rene Engelhard <rene@debian.org>  Thu, 03 May 2012 23:37:38 +0200
diff --git a/patches/mozilla-profile-absolute-paths.diff b/patches/mozilla-profile-absolute-paths.diff
index 3ab5e0b..8bca6a4 100644
--- a/patches/mozilla-profile-absolute-paths.diff
+++ b/patches/mozilla-profile-absolute-paths.diff
@@ -1,21 +1,24 @@
-From fff2d18a08a37c0fa6a370e56591117fc08664d2 Mon Sep 17 00:00:00 2001
+From 3ee18325cf8c06c04296173619f4535671e391e9 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
+(cherry picked from commit fff2d18a08a37c0fa6a370e56591117fc08664d2)
+
+Signed-off-by: Michael Stahl <mstahl@redhat.com>
 ---
 diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
-index 959896a..9a4b211 100644
+index be2eb8c..5e8fecb 100644
 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
 +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
-@@ -203,13 +203,13 @@ namespace connectivity
+@@ -202,13 +202,13 @@ namespace connectivity
                  }
-                 if (!(profileName.isEmpty() && profilePath.isEmpty()))
+                 if (profileName.getLength() != 0 || profilePath.getLength() != 0)
                  {
 -#ifndef MINIMAL_PROFILEDISCOVER
                      sal_Int32 isRelative = 0;
-                     if (!sIsRelative.isEmpty())
+                     if (sIsRelative.getLength() != 0)
                      {
                          isRelative = sIsRelative.toInt32();
                      }
@@ -24,7 +27,7 @@ index 959896a..9a4b211 100644
                      nsCOMPtr<nsILocalFile> rootDir;
                      rv = NS_NewLocalFile(EmptyString(), PR_TRUE,
                                              getter_AddRefs(rootDir));
-@@ -230,11 +230,21 @@ namespace connectivity
+@@ -229,11 +229,21 @@ namespace connectivity
                          rv = rootDir->SetPersistentDescriptor(filePath);
                      }
                      if (NS_FAILED(rv)) continue;

-- 
LibreOffice packaging repository