summaryrefslogtreecommitdiff
path: root/extensions/source/abpilot/typeselectionpage.cxx
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2015-10-23 18:39:07 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-25 15:02:44 +0000
commit4e3086da3e9873f53b5b9e1d5e511f9f77aaf62f (patch)
treed90b50de0479ab3f8e60e36a85ce448f36934d87 /extensions/source/abpilot/typeselectionpage.cxx
parentbe114fd49371beb8877c1cf34b48319967458c8a (diff)
Remove Seamonkey based address book driver
Seamonkey based address book driver is based on pre-compiled libraries and is only used on Windows 32 bit. Remove it in favor of mork driver. Given that Seamonkey based mozab driver also provides Outlook and Outlook Express address book integration, that Windows-32-bit--only feature is lost for now. If necessary, support for that feature could be rewritten from scratch, in a way that would also work for Windows 64 bit. Change-Id: Ie1c125e692598bda999767c328c9e2262a2b82af Reviewed-on: https://gerrit.libreoffice.org/19560 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions/source/abpilot/typeselectionpage.cxx')
-rw-r--r--extensions/source/abpilot/typeselectionpage.cxx25
1 files changed, 4 insertions, 21 deletions
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index bf2e9b2e02ea..15219b9976da 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -42,9 +42,6 @@ namespace abp
get(m_pThunderbird, "thunderbird");
get(m_pKab, "kde");
get(m_pMacab, "macosx");
- get(m_pLDAP, "ldap");
- get(m_pOutlook, "outlook");
- get(m_pOE, "windows");
get(m_pOther, "other");
//TODO: For now, try to keep offering the same choices like before the
@@ -66,22 +63,14 @@ namespace abp
// - OTHER
//
// On Windows:
- // - MORK, THUNDERBIRD, LDAP, OUTLOOK, OUTLOOKEXPRESS (via mozab driver,
- // if WITH_MOZILLA)
+ // - MORK, THUNDERBIRD
// - OTHER
- bool bWithMozilla = false;
bool bHaveEvolution = false;
bool bHaveKab = false;
bool bHaveMacab = false;
- bool bWithMork = false;
-#if defined WNT
-#if defined WITH_MOZILLA
- bWithMozilla = true;
-#endif
-#else
- bWithMork = true;
+#if !defined WNT
Reference< XDriverManager2 > xManager = DriverManager::create( _pParent->getORB() );
@@ -124,13 +113,10 @@ namespace abp
m_aAllTypes.push_back( ButtonItem( m_pEvolution, AST_EVOLUTION, bHaveEvolution ) );
m_aAllTypes.push_back( ButtonItem( m_pEvolutionGroupwise, AST_EVOLUTION_GROUPWISE, bHaveEvolution ) );
m_aAllTypes.push_back( ButtonItem( m_pEvolutionLdap, AST_EVOLUTION_LDAP, bHaveEvolution ) );
- m_aAllTypes.push_back( ButtonItem( m_pMORK, AST_MORK, bWithMozilla || bWithMork) );
- m_aAllTypes.push_back( ButtonItem( m_pThunderbird, AST_THUNDERBIRD, bWithMozilla || bWithMork) );
+ m_aAllTypes.push_back( ButtonItem( m_pMORK, AST_MORK, true ) );
+ m_aAllTypes.push_back( ButtonItem( m_pThunderbird, AST_THUNDERBIRD, true ) );
m_aAllTypes.push_back( ButtonItem( m_pKab, AST_KAB, bHaveKab ) );
m_aAllTypes.push_back( ButtonItem( m_pMacab, AST_MACAB, bHaveMacab ) );
- m_aAllTypes.push_back( ButtonItem( m_pLDAP, AST_LDAP, bWithMozilla ) );
- m_aAllTypes.push_back( ButtonItem( m_pOutlook, AST_OUTLOOK, bWithMozilla ) );
- m_aAllTypes.push_back( ButtonItem( m_pOE, AST_OE, bWithMozilla ) );
m_aAllTypes.push_back( ButtonItem( m_pOther, AST_OTHER, true ) );
Link<Button*,void> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
@@ -168,9 +154,6 @@ namespace abp
m_pThunderbird.clear();
m_pKab.clear();
m_pMacab.clear();
- m_pLDAP.clear();
- m_pOutlook.clear();
- m_pOE.clear();
m_pOther.clear();
AddressBookSourcePage::dispose();
}