Some clean-up of mork-related changs

And reverted for now the configure error when --enable-mozilla on non-Windows;
it is still used for other features, too.

Change-Id: I1ce5ff1a7a3d140a1ab7ba1e905166d91229c926

9 files changed, 15 insertions, 208 deletions

diff --git a/configure.in b/configure.in
index 7f9ec0119261..061bd2e6b926 100644
--- a/configure.in
+++ b/configure.in
@@ -701,7 +701,7 @@ AC_ARG_ENABLE(pch,
 
 AC_ARG_ENABLE(mozilla,
     AS_HELP_STRING([--enable-mozilla],
-        [LibreOffice can include a strangely hacked up Mozilla binary on Windows
+        [LibreOffice can include a strangely hacked up Mozilla binary for your
          platform, to build with this version, use this option.])
 )
 
@@ -4519,18 +4519,6 @@ if test $_os = Darwin -a "$enable_mozilla" = no; then
 fi
 
 dnl ===================================================================
-dnl --enable-mozilla is supported only on Windows
-dnl ===================================================================
-
-if test "$_os" != "WINNT" ; then
-    if test "$enable_mozilla" = "yes"; then
-        AC_MSG_ERROR([--enable-mozilla is only available on Windows])
-    fi
-
-fi
-
-
-dnl ===================================================================
 dnl  .NET needs special treatment
 dnl (does the above comment really mean .NET, or is it misusing
 dnl that to mean Visual Studio .NET 2003 ? And does this also
@@ -7900,13 +7888,13 @@ if test "$_os" = "WINNT"; then
    elif test "$with_system_mozilla" = "yes"; then
       AC_MSG_RESULT([no, not possible with system-mozilla])
    else
-      AC_MSG_RESULT([yes])
+      AC_MSG_RESULT([yes (old mozab driver)])
    fi
 else
 # on all other platforms Mozilla addressbook connectivity
 # is unconditionally built
 # new and shiny mork driver
-   AC_MSG_RESULT([yes])
+   AC_MSG_RESULT([yes (new mork driver)])
 fi
 
 dnl ===================================================================
diff --git a/connectivity/Configuration_mozab2.mk b/connectivity/Configuration_mozab2.mk
deleted file mode 100644
index 2c8b0dad6af6..000000000000
--- a/connectivity/Configuration_mozab2.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Configuration_Configuration,driver_mozab2))
-
-$(eval $(call gb_Configuration_add_spool_modules,driver_mozab2,connectivity/registry/mozab2,\
-	org/openoffice/Office/DataAccess/Drivers-mozab2.xcu \
-))
-
-$(eval $(call gb_Configuration_add_localized_datas,driver_mozab2,connectivity/registry/mozab2,\
-	org/openoffice/Office/DataAccess/Drivers.xcu \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 50727ee45329..beb34bdc3c5b 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -115,29 +115,25 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 ))
 endif
 
-# mozab only on windows
 ifeq ($(OS),WNT)
 
-ifeq ($(if $(or $(filter-out YES,$(WITH_MOZILLA)),$(filter YES,$(SYSTEM_MOZILLA)),$(filter MACOSX,$(OS))),YES),YES)
+ifeq ($(if $(or $(filter-out YES,$(WITH_MOZILLA)),$(filter YES,$(SYSTEM_MOZILLA))),YES),YES)
 $(eval $(call gb_Module_add_targets,connectivity,\
 	Library_mozbootstrap \
 ))
 else
 $(eval $(call gb_Module_add_targets,connectivity,\
+	Configuration_mozab \
 	Library_mozab \
 	Library_mozabdrv \
 ))
-
-$(eval $(call gb_Module_add_targets,connectivity,\
-	Configuration_mozab \
-))
 endif
 
-else # the new and shiny mork driver ;-)
+else ifneq ($(filter-out ANDROID IOS,$(OS)),)
 
 $(eval $(call gb_Module_add_targets,connectivity,\
-	Executable_mork_helper \
 	Configuration_mork \
+	Executable_mork_helper \
 	Library_mork \
 ))
 
diff --git a/connectivity/registry/mozab2/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/mozab2/org/openoffice/Office/DataAccess/Drivers.xcu
deleted file mode 100644
index d0dcb90676ea..000000000000
--- a/connectivity/registry/mozab2/org/openoffice/Office/DataAccess/Drivers.xcu
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <node oor:name="Installed" install:module="mozab2">
-    <node oor:name="sdbc:address:mozilla:" oor:op="replace">
-      <prop oor:name="Driver">
-        <value>com.sun.star.comp.sdbc.MozabDriver</value>
-      </prop>
-      <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
-        <value xml:lang="en-US">SeaMonkey Address Book</value>
-      </prop>
-      <node oor:name="MetaData">
-        <node oor:name="SupportsBrowsing" oor:op="replace">
-          <prop oor:name="Value" oor:type="xs:boolean">
-            <value>true</value>
-          </prop>
-        </node>
-        <node oor:name="EscapeDateTime" oor:op="replace">
-          <prop oor:name="Value" oor:type="xs:boolean">
-            <value>true</value>
-          </prop>
-        </node>
-      </node>
-    </node>
-    <node oor:name="sdbc:address:thunderbird:" oor:op="replace">
-      <prop oor:name="Driver">
-        <value>com.sun.star.comp.sdbc.MozabDriver</value>
-      </prop>
-      <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
-        <value xml:lang="en-US">Thunderbird/Icedove Address Book</value>
-      </prop>
-      <node oor:name="MetaData">
-        <node oor:name="SupportsBrowsing" oor:op="replace">
-          <prop oor:name="Value" oor:type="xs:boolean">
-            <value>true</value>
-          </prop>
-        </node>
-        <node oor:name="EscapeDateTime" oor:op="replace">
-          <prop oor:name="Value" oor:type="xs:boolean">
-            <value>true</value>
-          </prop>
-        </node>
-      </node>
-    </node>
-    <node oor:name="sdbc:address:ldap:*" oor:op="replace">
-      <prop oor:name="Driver">
-        <value>com.sun.star.comp.sdbc.MozabDriver</value>
-      </prop>
-      <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
-        <value xml:lang="en-US">LDAP Address Book</value>
-      </prop>
-      <node oor:name="Properties">
-        <node oor:name="BaseDN" oor:op="replace">
-          <prop oor:name="Value" oor:type="xs:string">
-            <value></value>
-          </prop>
-        </node>
-        <node oor:name="MaxRowCount" oor:op="replace">
-          <prop oor:name="Value" oor:type="xs:int">
-            <value>100</value>
-          </prop>
-        </node>
-        <node oor:name="PortNumber" oor:op="replace">
-          <prop oor:name="Value" oor:type="xs:int">
-            <value>389</value>
-          </prop>
-        </node>
-        <node oor:name="UseSSL" oor:op="replace">
-          <prop oor:name="Value" oor:type="xs:boolean">
-            <value>false</value>
-          </prop>
-        </node>
-      </node>
-      <node oor:name="MetaData">
-        <node oor:name="SupportsTableCreation" oor:op="replace">
-          <prop oor:name="Value" oor:type="xs:boolean">
-            <value>true</value>
-          </prop>
-        </node>
-        <node oor:name="Authentication" oor:op="replace">
-          <prop oor:name="Value" oor:type="xs:string">
-            <value>UserPassword</value>
-          </prop>
-        </node>
-        <node oor:name="EscapeDateTime" oor:op="replace">
-          <prop oor:name="Value" oor:type="xs:boolean">
-            <value>true</value>
-          </prop>
-        </node>
-      </node>
-    </node>
-  </node>
-</oor:component-data>
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index c62d058e6060..8111a10f457a 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -375,25 +375,15 @@ my_components += \
     component/canvas/source/directx/gdipluscanvas
 .END
 
-.IF "$(OS)" != "IOS" && "$(OS)" != "ANDROID"
-
 .IF "$(OS)" == "WNT"
-
-.IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \
-    "$(WITH_MOZILLA)" != "NO"
+.IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO"
 my_components += component/connectivity/source/drivers/mozab/mozab
 .ELSE
 my_components += component/connectivity/source/drivers/mozab/bootstrap/mozbootstrap
 .END
-
-.ELSE
-
-# new and shiny mork driver
+.ELIF "$(OS)" != "ANDROID" && "$(OS)" != "IOS"
 my_components += component/connectivity/source/drivers/mork/mork
-
-.ENDIF
-
-.ENDIF
+.END
 
 .IF "$(OS)" != "WNT" && "$(OS)" != "ANDROID" && "$(OS)" != "IOS" && "$(OS)" != "headless"
 my_components += component/shell/source/cmdmail/cmdmail
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index bbbc2c32ae9f..9a8b33067fd8 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -352,26 +352,14 @@ MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-kab.xcu
 MY_DRIVERS += kab
 .END
 
-
-# somebody would simplify that? ;-)
-.IF "$(OS)" == "WNT"
-.IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO" && \
-        "$(OS)" != "MACOSX"
 .IF "$(OS)" == "WNT"
+.IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO"
 MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
 MY_DRIVERS += mozab
-.ELSE
-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab2.xcu
-MY_DRIVERS += mozab2
-.END
 .END
-
-.ELSE
-
-# new and shiny mork driver
+.ELIF "$(OS)" != "ANDROID" && "$(OS)" != "IOS"
 MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
 MY_DRIVERS += mork
-
 .END
 
 .IF "$(SYSTEM_LIBEXTTEXTCAT_DATA)" != ""
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index c5c0449ca1c9..f0c42526eb37 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc,\
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
     JunitTest_sc_complex \
-    JunitTest_sc_unoapi \
     CppunitTest_sc_annotationshapeobj \
     CppunitTest_sc_cellrangeobj \
     $(if $(filter-out $(OS),IOS), \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 2ee2f0bcc490..13579efbe147 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -892,8 +892,8 @@ End
 
 #if defined(WNT)
 
-#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
-                                                                // #i91209#
+#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA)
+
 STD_LIB_FILE(gid_File_Lib_Mozab,mozab2)
 STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
 
@@ -903,11 +903,7 @@ File gid_File_Lib_Mozbootstrap
     LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
-  #else
     Name = "mozbootstrap.dll";
-  #endif
 End
 
 #endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index c265fd9693e8..beedb3b11bd4 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -379,13 +379,10 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Hsqldb_2,
 	gid_File_Lib_Jdbc,
 	gid_File_Lib_Mcnttype,
-#if defined(WNT)
+	gid_File_Lib_Mork,
 	gid_File_Lib_Mozab_2,
 	gid_File_Lib_Mozabdrv,
 	gid_File_Lib_Mozbootstrap,
-#else
-	gid_File_Lib_Mork,
-#endif
 	gid_File_Lib_Mysql,
 	gid_File_Lib_Odbc,
 	gid_File_Lib_Officebean,