From 4e3086da3e9873f53b5b9e1d5e511f9f77aaf62f Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 23 Oct 2015 18:39:07 +0200 Subject: 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 Reviewed-by: Stephan Bergmann --- .../drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 68 +++------------------- 1 file changed, 8 insertions(+), 60 deletions(-) (limited to 'connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx') diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index a7586fbc47a0..8505d48cb8cf 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -18,20 +18,21 @@ */ #include +#include #include #include "MMozillaBootstrap.hxx" +#include "MNSFolders.hxx" +#include "MNSProfileDiscover.hxx" using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::mozilla; using namespace connectivity::mozab; -#include "MNSFolders.hxx" -#include "MNSProfileDiscover.hxx" -#ifndef MINIMAL_PROFILEDISCOVER -# include "MNSProfileManager.hxx" -# include "MNSRunnable.hxx" -#endif -#include "MNSInit.hxx" + +using ::com::sun::star::uno::Reference; +using ::com::sun::star::uno::Sequence; +using ::com::sun::star::lang::XSingleServiceFactory; +using ::com::sun::star::lang::XMultiServiceFactory; static MozillaBootstrap *pMozillaBootstrap=NULL; static Reference xMozillaBootstrap; @@ -61,14 +62,7 @@ void MozillaBootstrap::Init() { bool aProfileExists=false; -#ifndef MINIMAL_PROFILEDISCOVER - //This must be call before any mozilla code - MNS_Init(aProfileExists); - - m_ProfileManager = new ProfileManager(); -#else (void)aProfileExists; /* avoid warning about unused parameter */ -#endif m_ProfileAccess = new ProfileAccess(); bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,OUString()); } @@ -143,85 +137,40 @@ sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( ::com::sun::star::mozilla: // XProfileManager ::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) { -#ifndef MINIMAL_PROFILEDISCOVER - return m_ProfileManager->bootupProfile(product,profileName); -#else (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ return -1; -#endif } ::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { -#ifndef MINIMAL_PROFILEDISCOVER - return m_ProfileManager->shutdownProfile(); -#else return -1; -#endif } ::com::sun::star::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { -#ifndef MINIMAL_PROFILEDISCOVER - return m_ProfileManager->getCurrentProduct(); -#else return ::com::sun::star::mozilla::MozillaProductType_Default; -#endif } OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { -#ifndef MINIMAL_PROFILEDISCOVER - return m_ProfileManager->getCurrentProfile(); -#else return OUString(); -#endif } sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { -#ifndef MINIMAL_PROFILEDISCOVER - return isProfileLocked(getCurrentProduct(),m_ProfileManager->getCurrentProfile()); -#else return true; -#endif } OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) { -#ifndef MINIMAL_PROFILEDISCOVER - return m_ProfileManager->setCurrentProfile(product,profileName); -#else (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ return OUString(); -#endif } // XProxyRunner ::sal_Int32 SAL_CALL MozillaBootstrap::Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException, std::exception) { -#ifndef MINIMAL_PROFILEDISCOVER - OUString profileName = aCode->getProfileName(); - OUString currProfileName = getCurrentProfile(); - ::com::sun::star::mozilla::MozillaProductType currProduct = getCurrentProduct(); - - //if client provides a profileName, we will use it - if (!profileName.isEmpty() - && ( aCode->getProductType() != currProduct || !profileName.equals(currProfileName)) ) - setCurrentProfile(aCode->getProductType(),profileName); - MNSRunnable xRunnable; - - return xRunnable.StartProxy(aCode); -#else (void)aCode; /* avoid warning about unused parameter */ return -1; -#endif } -#ifdef MINIMAL_PROFILEDISCOVER -#include -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::lang::XSingleServiceFactory; -using ::com::sun::star::lang::XMultiServiceFactory; - static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) { MozillaBootstrap * pBootstrap = static_cast(OMozillaBootstrap_CreateInstance(rServiceManager)); @@ -258,6 +207,5 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozbootstrap_component_getFactory return pRet; }; -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit