diff options
author | David Ostrovsky <david@ostrovsky.org> | 2013-02-04 19:46:32 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-07 08:59:11 +0000 |
commit | d68310c185886c6755849640d568c4597456282e (patch) | |
tree | 71c6e6b7654cc9dc3670626644a8150044638eba /extensions | |
parent | f26d3e43e8ead5c978a7efd1c7a84c8cd0a2758b (diff) |
fdo#57417: remove LDAP choice from non windows platform
Change-Id: I0557a7c9cf0d18fbe5620ef8869bb83d0a6a7904
Reviewed-on: https://gerrit.libreoffice.org/1983
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/2022
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/abpilot/typeselectionpage.cxx | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index 6ce6280753f7..e5295e13e14e 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -67,13 +67,12 @@ namespace abp // On Linux: // - EVOLUTION, EVOLUTION_GROUPWISE, EVOLUTION_LDAP (if applicable) // - MORK (via mork driver, which is built unconditionally) - // - THUNDERBIRD (via mork driver?, which is built unconditionally) // - KAB (if applicable) - // - LDAP (via mork driver?, which is built unconditionally) // - OTHER // // On Mac OS X: // - MACAB (if applicable) + // - MORK (via mork driver, which is built unconditionally) // - OTHER // // On Windows: @@ -81,22 +80,18 @@ namespace abp // if WITH_MOZILLA) // - OTHER - bool bWithMozilla = false, bWindows = false; - bool bHaveEvolution = false, bHaveKab = false; + 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 - bWindows = true; - #else - -#if !defined MACOSX - bWithMozilla = true; -#endif + bWithMork = true; Reference< XDriverAccess> xManager(_pParent->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager"))), UNO_QUERY); @@ -139,13 +134,13 @@ namespace abp m_aAllTypes.push_back( ButtonItem( &m_aEvolution, AST_EVOLUTION, bHaveEvolution ) ); m_aAllTypes.push_back( ButtonItem( &m_aEvolutionGroupwise, AST_EVOLUTION_GROUPWISE, bHaveEvolution ) ); m_aAllTypes.push_back( ButtonItem( &m_aEvolutionLdap, AST_EVOLUTION_LDAP, bHaveEvolution ) ); - m_aAllTypes.push_back( ButtonItem( &m_aMORK, AST_MORK, bWithMozilla ) ); - m_aAllTypes.push_back( ButtonItem( &m_aThunderbird, AST_THUNDERBIRD, bWithMozilla ) ); + m_aAllTypes.push_back( ButtonItem( &m_aMORK, AST_MORK, bWithMozilla || bWithMork) ); + m_aAllTypes.push_back( ButtonItem( &m_aThunderbird, AST_THUNDERBIRD, bWithMozilla || bWithMork) ); m_aAllTypes.push_back( ButtonItem( &m_aKab, AST_KAB, bHaveKab ) ); m_aAllTypes.push_back( ButtonItem( &m_aMacab, AST_MACAB, bHaveMacab ) ); m_aAllTypes.push_back( ButtonItem( &m_aLDAP, AST_LDAP, bWithMozilla ) ); - m_aAllTypes.push_back( ButtonItem( &m_aOutlook, AST_OUTLOOK, bWithMozilla && bWindows ) ); - m_aAllTypes.push_back( ButtonItem( &m_aOE, AST_OE, bWithMozilla && bWindows ) ); + m_aAllTypes.push_back( ButtonItem( &m_aOutlook, AST_OUTLOOK, bWithMozilla ) ); + m_aAllTypes.push_back( ButtonItem( &m_aOE, AST_OE, bWithMozilla ) ); m_aAllTypes.push_back( ButtonItem( &m_aOther, AST_OTHER, true ) ); Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected ); |