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>

12 files changed, 11 insertions, 137 deletions

diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index 543042cb90ca..559b8d821c8b 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -19,16 +19,6 @@ $(eval $(call gb_Library_set_include,abp,\
 	-I$(SRCDIR)/extensions/source/inc \
 ))
 
-ifeq ($(OS),WNT)
-ifneq ($(WITH_MOZILLA),NO)
-ifneq ($(SYSTEM_MOZILLA),YES)
-$(eval $(call gb_Library_add_defs,abp,\
-	-DWITH_MOZILLA \
-))
-endif
-endif
-endif
-
 $(eval $(call gb_Library_add_defs,abp,\
 	-DCOMPMOD_NAMESPACE=abp \
 	-DCOMPMOD_RESPREFIX=abp \
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 7254eb8f8505..9ba67da5e3b1 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -300,7 +300,6 @@ namespace abp
         {
             case AST_MORK               :
             case AST_THUNDERBIRD        : pGuess = "Personal Address book"; break;
-            case AST_LDAP               : pGuess = "LDAP Directory"; break;
             case AST_EVOLUTION          :
             case AST_EVOLUTION_GROUPWISE:
             case AST_EVOLUTION_LDAP     : pGuess = "Personal"; break;
@@ -367,18 +366,6 @@ namespace abp
                 m_aNewDataSource = aContext.createNewMacab( m_aSettings.sDataSourceName );
                 break;
 
-            case AST_LDAP:
-                m_aNewDataSource = aContext.createNewLDAP( m_aSettings.sDataSourceName );
-                break;
-
-            case AST_OUTLOOK:
-                m_aNewDataSource = aContext.createNewOutlook( m_aSettings.sDataSourceName );
-                break;
-
-            case AST_OE:
-                m_aNewDataSource = aContext.createNewOE( m_aSettings.sDataSourceName );
-                break;
-
             case AST_OTHER:
                 m_aNewDataSource = aContext.createNewDBase( m_aSettings.sDataSourceName );
                 break;
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 552890f4889c..8f2eccf64d2e 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -89,9 +89,7 @@ namespace abp
 
         static inline bool needAdminInvokationPage( AddressSourceType _eType )
         {
-            return  (   ( AST_LDAP == _eType )
-                    ||  ( AST_OTHER == _eType )
-                    );
+            return  ( AST_OTHER == _eType );
         }
         /// check if with the current settings, we would need to invoke he administration dialog for more details about the data source
         inline bool needAdminInvokationPage() const
@@ -114,7 +112,7 @@ namespace abp
         /// determines whether the given address book type does provide one table only
         static inline bool needTableSelection( AddressSourceType _eType )
         {
-            return  ( AST_LDAP != _eType ) && ( AST_KAB != _eType );
+            return  ( AST_KAB != _eType );
         }
 
         void implCleanup();
diff --git a/extensions/source/abpilot/addresssettings.hxx b/extensions/source/abpilot/addresssettings.hxx
index 16d508a5fcb7..adec884eea8f 100644
--- a/extensions/source/abpilot/addresssettings.hxx
+++ b/extensions/source/abpilot/addresssettings.hxx
@@ -36,10 +36,6 @@ namespace abp
         AST_EVOLUTION_LDAP,
         AST_KAB,
         AST_MACAB,
-        AST_LDAP,
-        AST_OUTLOOK,
-        AST_OE,
-
         AST_OTHER,
 
         AST_INVALID
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 33cdc098a9b5..0dd778269de4 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -55,7 +55,7 @@ namespace abp
     }
 
 
-    bool OAdminDialogInvokation::invokeAdministration( bool _bFixedType )
+    bool OAdminDialogInvokation::invokeAdministration()
     {
         if (!m_xContext.is())
             return false;
@@ -87,7 +87,7 @@ namespace abp
                 // creating the dialog service is potentially expensive (if all the libraries invoked need to be loaded)
                 // so we display a wait cursor
                 WaitObject aWaitCursor(m_pMessageParent);
-                Reference<XInterface> x = m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(_bFixedType ? OUString(s_sAdministrationServiceName) : OUString(s_sDataSourceTypeChangeDialog), aArguments, m_xContext);
+                Reference<XInterface> x = m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(OUString(s_sDataSourceTypeChangeDialog), aArguments, m_xContext);
                 xDialog = Reference< XExecutableDialog >( x, UNO_QUERY );
 
                 // just for a smoother UI: What the dialog does upon execution, is (amongst other things) creating
diff --git a/extensions/source/abpilot/admininvokationimpl.hxx b/extensions/source/abpilot/admininvokationimpl.hxx
index 5e1e38a4ea38..e0124a6ba4df 100644
--- a/extensions/source/abpilot/admininvokationimpl.hxx
+++ b/extensions/source/abpilot/admininvokationimpl.hxx
@@ -46,7 +46,7 @@ namespace abp
             vcl::Window* _pMessageParent
         );
 
-        bool invokeAdministration( bool _bFixedType );
+        bool invokeAdministration();
     };
 }
 
diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx
index b89c33123574..f8af951516b6 100644
--- a/extensions/source/abpilot/admininvokationpage.cxx
+++ b/extensions/source/abpilot/admininvokationpage.cxx
@@ -82,10 +82,11 @@ namespace abp
         return AddressBookSourcePage::canAdvance() && getDialog()->getDataSource().isConnected();
     }
 
+    // davido: Do we need it?
     IMPL_LINK_NOARG_TYPED( AdminDialogInvokationPage, OnInvokeAdminDialog, Button*, void )
     {
         OAdminDialogInvokation aInvokation( getORB(), getDialog()->getDataSource().getDataSource(), getDialog() );
-        if ( aInvokation.invokeAdministration( AST_LDAP == getSettings().eType ) )
+        if ( aInvokation.invokeAdministration() )
         {
             // try to connect to this data source
             implTryConnect();
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index b8df4f31ba8f..344c7cda331f 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -250,12 +250,6 @@ namespace abp
     }
 
 
-    ODataSource ODataSourceContext::createNewLDAP( const OUString& _rName)
-    {
-        return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:ldap:" );
-    }
-
-
     ODataSource ODataSourceContext::createNewMORK( const OUString& _rName)
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:mozilla" );
@@ -296,18 +290,6 @@ namespace abp
     }
 
 
-    ODataSource ODataSourceContext::createNewOutlook( const OUString& _rName)
-    {
-        return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:outlook" );
-    }
-
-
-    ODataSource ODataSourceContext::createNewOE( const OUString& _rName)
-    {
-        return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:outlookexp" );
-    }
-
-
     ODataSource ODataSourceContext::createNewDBase( const OUString& _rName)
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:dbase:" );
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index c2b83ae6b2a8..87d3588134ff 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -80,15 +80,6 @@ namespace abp
         /// creates a new Mac OS X address book data source
         ODataSource createNewMacab( const OUString& _rName );
 
-        /// creates a new LDAP data source
-        ODataSource createNewLDAP( const OUString& _rName );
-
-        /// creates a new Outlook data source
-        ODataSource createNewOutlook( const OUString& _rName );
-
-        /// creates a new Outlook express data source
-        ODataSource createNewOE( const OUString& _rName );
-
         /// creates a new dBase data source
         ODataSource createNewDBase( const OUString& _rName );
     };
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();
     }
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index 1abdd620d906..5a8995ad894e 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -39,9 +39,6 @@ namespace abp
         VclPtr<RadioButton> m_pThunderbird;
         VclPtr<RadioButton> m_pKab;
         VclPtr<RadioButton> m_pMacab;
-        VclPtr<RadioButton> m_pLDAP;
-        VclPtr<RadioButton> m_pOutlook;
-        VclPtr<RadioButton> m_pOE;
         VclPtr<RadioButton> m_pOther;
 
         struct ButtonItem {
diff --git a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui
index 0e2a12ee7e64..8d0b77c95b8f 100644
--- a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui
+++ b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui
@@ -147,57 +147,6 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkRadioButton" id="ldap">
-                    <property name="label" translatable="yes">LDAP address data</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
-                    <property name="group">outlook</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">7</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkRadioButton" id="outlook">
-                    <property name="label" translatable="yes">Outlook address book</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
-                    <property name="group">windows</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">8</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkRadioButton" id="windows">
-                    <property name="label" translatable="yes">Windows system address book</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
-                    <property name="group">other</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">9</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkRadioButton" id="other">
                     <property name="label" translatable="yes">Other external data source</property>
                     <property name="visible">True</property>