[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - connectivity/source

[Julien Nabet]

 connectivity/source/drivers/mork/MNSFolders.cxx                    |    4 ++++
 connectivity/source/drivers/mork/MNSProfileDiscover.cxx            |    9 +++++----
 connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx         |    4 ++++
 connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx |    9 +++++----
 4 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit 8484671379cacd4d1541c2e0629b99f7fbcbd4dc
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Apr 5 11:56:28 2015 +0200

    tdf#39279: Search for Thunderbird address books uses first ones found
    
    Thank you Lionel about your advice for this one.
    
    Change-Id: I4ec51b694d3b674158cb7fb4efa580e084cffda9
    Reviewed-on: https://gerrit.libreoffice.org/15163
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>
    (cherry picked from commit 21a8671e24fe19a3ba5ef14c991bae302234b229)
    Reviewed-on: https://gerrit.libreoffice.org/15191
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/source/drivers/mork/MNSFolders.cxx b/connectivity/source/drivers/mork/MNSFolders.cxx
index aae88b5..0abfad7 100644
--- a/connectivity/source/drivers/mork/MNSFolders.cxx
+++ b/connectivity/source/drivers/mork/MNSFolders.cxx
@@ -63,6 +63,10 @@ namespace
     const size_t NB_PRODUCTS = 3;
     const size_t NB_CANDIDATES = 4;
 
+    // The order (index) of entries in DefaultProductDir and
+    // ProductRootEnvironmentVariable *must* match the constants
+    // (minus 1) in offapi/com/sun/star/mozilla/MozillaProductType.idl
+    // DO NOT CHANGE THE ORDER; ADD ONLY TO THE END
     static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] =
     {
     #if defined(XP_WIN)
diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
index 401fc48..6879b9d 100644
--- a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx
@@ -46,11 +46,12 @@ namespace connectivity
 
         sal_Int32 ProfileAccess::LoadProductsInfo()
         {
-            //load SeaMonkey 2 profiles to m_ProductProfileList
-            sal_Int32 count = LoadXPToolkitProfiles(MozillaProductType_Mozilla);
-
+            //tdf#39279: LO should search Thunderbird first then Seamonkey and finally Firefox
             //load thunderbird profiles to m_ProductProfileList
-            count += LoadXPToolkitProfiles(MozillaProductType_Thunderbird);
+            sal_Int32 count = LoadXPToolkitProfiles(MozillaProductType_Thunderbird);
+
+            //load SeaMonkey 2 profiles to m_ProductProfileList
+            count += LoadXPToolkitProfiles(MozillaProductType_Mozilla);
 
             //load firefox profiles to m_ProductProfileList
             //firefox profile does not containt address book, but maybe others need them
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index aae88b5..0abfad7 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -63,6 +63,10 @@ namespace
     const size_t NB_PRODUCTS = 3;
     const size_t NB_CANDIDATES = 4;
 
+    // The order (index) of entries in DefaultProductDir and
+    // ProductRootEnvironmentVariable *must* match the constants
+    // (minus 1) in offapi/com/sun/star/mozilla/MozillaProductType.idl
+    // DO NOT CHANGE THE ORDER; ADD ONLY TO THE END
     static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] =
     {
     #if defined(XP_WIN)
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index 1d5e5d3..e61bdf2 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -125,11 +125,12 @@ namespace connectivity
 
         sal_Int32 ProfileAccess::LoadProductsInfo()
         {
-            //load SeaMonkey 2 profiles to m_ProductProfileList
-            sal_Int32 count = LoadXPToolkitProfiles(MozillaProductType_Mozilla);
-
+            //tdf#39279: LO should search Thunderbird first then Seamonkey and finally Firefox
             //load thunderbird profiles to m_ProductProfileList
-            count += LoadXPToolkitProfiles(MozillaProductType_Thunderbird);
+            sal_Int32 count = LoadXPToolkitProfiles(MozillaProductType_Thunderbird);
+
+            //load SeaMonkey 2 profiles to m_ProductProfileList
+            count += LoadXPToolkitProfiles(MozillaProductType_Mozilla);
 
             //load firefox profiles to m_ProductProfileList
             //firefox profile does not containt address book, but maybe others need them