mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#39279: Search for Thunderbird address books uses first ones found

Browse Source 
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>
This commit is contained in:
Julien Nabet 2015-04-05 11:56:28 +02:00 committed by Lionel Elie Mamane
parent b2f377d6f4
commit 21a8671e24
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
connectivity/source/drivers/mork/MNSFolders.cxx
View File

@ -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)

9
connectivity/source/drivers/mork/MNSProfileDiscover.cxx
View File

@ -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

4
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
View File

@ -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)

9
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
View File

@ -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