diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2015-04-05 11:56:28 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-09 08:14:10 +0000 |
| commit | 8484671379cacd4d1541c2e0629b99f7fbcbd4dc (patch) | |
| tree | 1a3566d8436c16739e1c7073fb86c16a4ce2b94b /connectivity | |
| parent | efe23e6f2707ceef5d99d5e8cef503ca7bc1e01c (diff) | |
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@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
(cherry picked from commit 21a8671e24fe19a3ba5ef14c991bae302234b229)
Reviewed-on: https://gerrit.libreoffice.org/15191
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'connectivity')
4 files changed, 18 insertions, 8 deletions
diff --git a/connectivity/source/drivers/mork/MNSFolders.cxx b/connectivity/source/drivers/mork/MNSFolders.cxx index aae88b5f8061..0abfad7f8918 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 401fc48bf1ee..6879b9d5a1e7 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 aae88b5f8061..0abfad7f8918 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 1d5e5d34c820..e61bdf2fe7fb 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 |