[Libreoffice-commits] .: 2 commits - animations/source basctl/Module_basctl.mk basctl/Package_uiconfig.mk basctl/Package_xml.mk basctl/util connectivity/Module_connectivity.mk connectivity/Package_xml.mk connectivity/source dtrans/Package_xml.mk dtrans/source fpicker/Module_fpicker.mk fpicker/Package_xml.mk fpicker/source i18npool/Module_i18npool.mk i18npool/Package_xml.mk i18npool/xml sc/xml sd/xml store/Package_inc.mk store/util sw/xml ucb/source xmlhelp/Module_xmlhelp.mk xmlhelp/Package_xml.mk xmlhelp/Package_xsl.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Aug 22 14:29:33 PDT 2012


 animations/source/animcore/animcore.xml                        |   45 
 basctl/Module_basctl.mk                                        |    2 
 basctl/Package_uiconfig.mk                                     |   42 
 basctl/Package_xml.mk                                          |   42 
 basctl/util/basctl.xml                                         |   40 
 connectivity/Module_connectivity.mk                            |    1 
 connectivity/Package_xml.mk                                    |   44 
 connectivity/source/cpool/dbpool.xml                           |   43 
 connectivity/source/dbtools/dbt.xml                            |   31 
 connectivity/source/drivers/ado/ado.xml                        |   44 
 connectivity/source/drivers/calc/CalcDriver.xml                |   47 
 connectivity/source/drivers/dbase/dbase.xml                    |   48 
 connectivity/source/drivers/evoab2/evoab.xml                   |   45 
 connectivity/source/drivers/file/file.xml                      |   47 
 connectivity/source/drivers/flat/flat.xml                      |   48 
 connectivity/source/drivers/hsqldb/hsqldb.xml                  |   43 
 connectivity/source/drivers/jdbc/jdbc.xml                      |   45 
 connectivity/source/drivers/kab/kab.xml                        |   94 
 connectivity/source/drivers/kab/tdeab.xml                      |   85 
 connectivity/source/drivers/macab/macab.xml                    |   94 
 connectivity/source/drivers/mozab/mozab.xml                    |   97 
 connectivity/source/drivers/mysql/mysql.xml                    |   44 
 connectivity/source/drivers/odbc/odbc.xml                      |   43 
 dtrans/Package_xml.mk                                          |   37 
 dtrans/source/cnttype/mcnttype.xml                             |   52 
 dtrans/source/generic/dtrans.xml                               |   60 
 dtrans/source/win32/clipb/sysdtrans.xml                        |   60 
 dtrans/source/win32/dnd/dnd.xml                                |   63 
 dtrans/source/win32/ftransl/ftransl.xml                        |   50 
 fpicker/Module_fpicker.mk                                      |    1 
 fpicker/Package_xml.mk                                         |   33 
 fpicker/source/aqua/fps_aqua.xml                               |   95 
 fpicker/source/win32/filepicker/fps.xml                        |   68 
 fpicker/source/win32/folderpicker/fop.xml                      |   57 
 i18npool/Module_i18npool.mk                                    |    1 
 i18npool/Package_xml.mk                                        |   44 
 i18npool/xml/BreakIterator.xml                                 |   99 
 i18npool/xml/Calendar.xml                                      |   71 
 i18npool/xml/ChapterCollator.xml                               |   50 
 i18npool/xml/CharacterClassification.xml                       |   69 
 i18npool/xml/Collator.xml                                      |   50 
 i18npool/xml/DefaultNumberingProvider.xml                      |   69 
 i18npool/xml/IndexEntrySupplier.xml                            |   70 
 i18npool/xml/LocaleData.xml                                    |   77 
 i18npool/xml/NumberFormatCodeMapper.xml                        |   81 
 i18npool/xml/OrdinalSuffix.xml                                 |   51 
 i18npool/xml/TextSearch.xml                                    |   69 
 i18npool/xml/Transliteration.xml                               |   90 
 sc/xml/AccessibleEditableTextPara_HeaderFooter.xml             |   29 
 sc/xml/AccessibleEditableTextPara_PreviewCell.xml              |   28 
 sc/xml/AccessibleEditableTextPara_PreviewNote.xml              |   28 
 sc/xml/ScAccessibleCell.xml                                    |   29 
 sc/xml/ScAccessibleCsvCell.xml                                 |   27 
 sc/xml/ScAccessibleCsvGrid.xml                                 |   28 
 sc/xml/ScAccessibleCsvRuler.xml                                |   27 
 sc/xml/ScAccessibleDocument.xml                                |   27 
 sc/xml/ScAccessibleDocumentPagePreview.xml                     |   26 
 sc/xml/ScAccessiblePageHeader.xml                              |   26 
 sc/xml/ScAccessiblePageHeaderArea.xml                          |   26 
 sc/xml/ScAccessiblePreviewCell.xml                             |   27 
 sc/xml/ScAccessiblePreviewHeaderCell.xml                       |   27 
 sc/xml/ScAccessiblePreviewTable.xml                            |   26 
 sc/xml/ScAccessibleSpreadsheet.xml                             |   27 
 sc/xml/ScAnnotationObj.xml                                     |  202 -
 sc/xml/ScAnnotationShapeObj.xml                                |  202 -
 sc/xml/ScAnnotationsObj.xml                                    |  294 --
 sc/xml/ScAreaLinkObj.xml                                       |  107 
 sc/xml/ScAreaLinksObj.xml                                      |  107 
 sc/xml/ScAutoFormatFieldObj.xml                                |  134 -
 sc/xml/ScAutoFormatObj.xml                                     |  134 -
 sc/xml/ScAutoFormatsObj.xml                                    |  134 -
 sc/xml/ScCellCursorObj.xml                                     |  199 -
 sc/xml/ScCellFieldObj.xml                                      |  204 -
 sc/xml/ScCellFieldsObj.xml                                     |  204 -
 sc/xml/ScCellFormatsEnumeration.xml                            |  316 --
 sc/xml/ScCellFormatsObj.xml                                    |  316 --
 sc/xml/ScCellObj.xml                                           |  316 --
 sc/xml/ScCellRangeObj.xml                                      |  316 --
 sc/xml/ScCellRangesObj.xml                                     |  316 --
 sc/xml/ScCellSearchObj.xml                                     |  102 
 sc/xml/ScCellTextCursor.xml                                    |  120 
 sc/xml/ScCellsEnumeration.xml                                  |  316 --
 sc/xml/ScCellsObj.xml                                          |  316 --
 sc/xml/ScChartObj.xml                                          |  110 
 sc/xml/ScChartsObj.xml                                         |  110 
 sc/xml/ScConsolidationDescriptor.xml                           |  218 -
 sc/xml/ScDDELinkObj.xml                                        |  107 
 sc/xml/ScDDELinksObj.xml                                       |  107 
 sc/xml/ScDataPilotFieldGroupItemObj.xml                        |  122 
 sc/xml/ScDataPilotFieldGroupObj.xml                            |  122 
 sc/xml/ScDataPilotFieldGroupsObj.xml                           |  122 
 sc/xml/ScDataPilotFieldObj.xml                                 |  122 
 sc/xml/ScDataPilotFieldsObj.xml                                |  122 
 sc/xml/ScDataPilotItemObj.xml                                  |  122 
 sc/xml/ScDataPilotItemsObj.xml                                 |  122 
 sc/xml/ScDataPilotTableObj.xml                                 |  123 
 sc/xml/ScDataPilotTablesObj.xml                                |  122 
 sc/xml/ScDatabaseRangeObj.xml                                  |  218 -
 sc/xml/ScDatabaseRangesObj.xml                                 |  218 -
 sc/xml/ScDocumentConfiguration.xml                             |  294 --
 sc/xml/ScDrawPageObj.xml                                       |  294 --
 sc/xml/ScDrawPagesObj.xml                                      |  294 --
 sc/xml/ScFilterDescriptorBase.xml                              |  218 -
 sc/xml/ScFunctionListObj.xml                                   |  113 
 sc/xml/ScHeaderFieldObj.xml                                    |  204 -
 sc/xml/ScHeaderFieldsObj.xml                                   |  204 -
 sc/xml/ScHeaderFooterContentObj.xml                            |  120 
 sc/xml/ScHeaderFooterTextCursor.xml                            |  120 
 sc/xml/ScHeaderFooterTextObj.xml                               |  120 
 sc/xml/ScIndexEnumeration_CellAnnotationsEnumeration.xml       |   60 
 sc/xml/ScIndexEnumeration_CellAreaLinksEnumeration.xml         |   60 
 sc/xml/ScIndexEnumeration_DDELinksEnumeration.xml              |   60 
 sc/xml/ScIndexEnumeration_DataPilotFieldsEnumeration.xml       |   60 
 sc/xml/ScIndexEnumeration_DataPilotItemsEnumeration.xml        |   60 
 sc/xml/ScIndexEnumeration_DataPilotTablesEnumeration.xml       |   60 
 sc/xml/ScIndexEnumeration_DatabaseRangesEnumeration.xml        |   60 
 sc/xml/ScIndexEnumeration_FunctionDescriptionEnumeration.xml   |   60 
 sc/xml/ScIndexEnumeration_LabelRangesEnumeration.xml           |   60 
 sc/xml/ScIndexEnumeration_NamedRangesEnumeration.xml           |   60 
 sc/xml/ScIndexEnumeration_ScenariosEnumeration.xml             |   60 
 sc/xml/ScIndexEnumeration_SheetCellRangesEnumeration.xml       |   60 
 sc/xml/ScIndexEnumeration_SheetLinksEnumeration.xml            |   60 
 sc/xml/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.xml  |   60 
 sc/xml/ScIndexEnumeration_SpreadsheetsEnumeration.xml          |   60 
 sc/xml/ScIndexEnumeration_SubTotalFieldsEnumeration.xml        |   60 
 sc/xml/ScIndexEnumeration_TableAutoFormatEnumeration.xml       |   60 
 sc/xml/ScIndexEnumeration_TableChartsEnumeration.xml           |   60 
 sc/xml/ScIndexEnumeration_TableColumnsEnumeration.xml          |   60 
 sc/xml/ScIndexEnumeration_TableConditionalEntryEnumeration.xml |   60 
 sc/xml/ScIndexEnumeration_TableRowsEnumeration.xml             |   60 
 sc/xml/ScIndexEnumeration_TextFieldEnumeration.xml             |   60 
 sc/xml/ScLabelRangeObj.xml                                     |  216 -
 sc/xml/ScLabelRangesObj.xml                                    |  216 -
 sc/xml/ScModelObj.xml                                          |  294 --
 sc/xml/ScNamedRangeObj.xml                                     |  216 -
 sc/xml/ScNamedRangesObj.xml                                    |  216 -
 sc/xml/ScPageObj.xml                                           |  294 --
 sc/xml/ScRecentFunctionsObj.xml                                |  113 
 sc/xml/ScScenariosObj.xml                                      |  294 --
 sc/xml/ScShapeObj.xml                                          |   33 
 sc/xml/ScSheetLinkObj.xml                                      |  107 
 sc/xml/ScSheetLinksObj.xml                                     |  107 
 sc/xml/ScSpreadsheetSettings.xml                               |  113 
 sc/xml/ScSpreadsheetSettingsObj.xml                            |  295 --
 sc/xml/ScStyleFamiliesObj.xml                                  |  134 -
 sc/xml/ScStyleFamilyObj.xml                                    |  133 -
 sc/xml/ScStyleObj.xml                                          |  133 -
 sc/xml/ScSubTotalDescriptorBase.xml                            |  218 -
 sc/xml/ScSubTotalFieldObj.xml                                  |  218 -
 sc/xml/ScTabViewObj.xml                                        |  249 --
 sc/xml/ScTableColumnObj.xml                                    |  316 --
 sc/xml/ScTableColumnsObj.xml                                   |  294 --
 sc/xml/ScTableConditionalEntry.xml                             |   72 
 sc/xml/ScTableConditionalFormat.xml                            |   72 
 sc/xml/ScTableRowObj.xml                                       |  316 --
 sc/xml/ScTableRowsObj.xml                                      |  294 --
 sc/xml/ScTableSheetObj.xml                                     |  316 --
 sc/xml/ScTableSheetsObj.xml                                    |  295 --
 sc/xml/ScTableValidationObj.xml                                |   72 
 sc/xml/ScUniqueCellFormatsEnumeration.xml                      |  316 --
 sc/xml/ScUniqueCellFormatsObj.xml                              |  316 --
 sc/xml/ScViewPaneObj.xml                                       |  249 --
 sc/xml/ScXMLExport.xml                                         |  115 
 sc/xml/ScXMLImport.xml                                         |  115 
 sd/xml/AccessibleDrawDocumentView.xml                          |   41 
 sd/xml/AccessibleOutlineView.xml                               |   39 
 sd/xml/AccessiblePageShape.xml                                 |   39 
 sd/xml/AccessiblePresentationGraphicShape.xml                  |   40 
 sd/xml/AccessiblePresentationOLEShape.xml                      |   40 
 sd/xml/AccessiblePresentationShape.xml                         |   38 
 sd/xml/AccessibleSlideView.xml                                 |   35 
 sd/xml/AccessibleSlideViewObject.xml                           |   34 
 sd/xml/DrawingView.xml                                         |   17 
 sd/xml/HandoutView.xml                                         |   17 
 sd/xml/NotesView.xml                                           |   17 
 sd/xml/OutlineView.xml                                         |   17 
 sd/xml/PresentationView.xml                                    |   17 
 sd/xml/SdDocLinkTargets.xml                                    |   16 
 sd/xml/SdDrawPage.xml                                          |   16 
 sd/xml/SdDrawPagesAccess.xml                                   |   16 
 sd/xml/SdGenericDrawPage.xml                                   |   16 
 sd/xml/SdLayer.xml                                             |   16 
 sd/xml/SdLayerManager.xml                                      |   16 
 sd/xml/SdMasterPage.xml                                        |   16 
 sd/xml/SdMasterPagesAccess.xml                                 |   16 
 sd/xml/SdPageLinkTargets.xml                                   |   16 
 sd/xml/SdXCustomPresentation.xml                               |   16 
 sd/xml/SdXCustomPresentationAccess.xml                         |   16 
 sd/xml/SdXImpressDocument.xml                                  |   16 
 sd/xml/SdXPresentation.xml                                     |   16 
 sd/xml/SdXShape.xml                                            |   16 
 sd/xml/SlidesView.xml                                          |   17 
 store/Package_inc.mk                                           |    1 
 store/util/store.xml                                           |   24 
 sw/xml/writer.xml                                              | 1244 ----------
 ucb/source/cacher/cached.xml                                   |  146 -
 ucb/source/core/ucb.xml                                        |  172 -
 ucb/source/sorter/srtrs.xml                                    |   66 
 ucb/source/ucp/cmis/ucpcmis.xml                                |  126 -
 ucb/source/ucp/file/ucpfile.xml                                |  113 
 ucb/source/ucp/ftp/ucpftp.xml                                  |   89 
 ucb/source/ucp/gio/ucpgio.xml                                  |  100 
 ucb/source/ucp/gvfs/ucpgvfs.xml                                |  113 
 ucb/source/ucp/hierarchy/ucphier.xml                           |  121 
 ucb/source/ucp/odma/ucpodma.xml                                |  100 
 ucb/source/ucp/package/ucppkg.xml                              |   92 
 ucb/source/ucp/tdoc/ucptdoc.xml                                |  129 -
 ucb/source/ucp/webdav/ucpdav.xml                               |  109 
 xmlhelp/Module_xmlhelp.mk                                      |    2 
 xmlhelp/Package_xml.mk                                         |   35 
 xmlhelp/Package_xsl.mk                                         |   35 
 211 files changed, 79 insertions(+), 22959 deletions(-)

New commits:
commit 091c1b6fc5cb6b3c87c8e3c0fdec1f6974da10cf
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Aug 22 17:33:39 2012 +0200

    more old module-description xml files
    
    Change-Id: I9ac503b073ee3f9b8e7958264ffcc26d9446c220

diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index bda9d32..11cabbb 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Module_add_targets,basctl,\
 endif
 
 $(eval $(call gb_Module_add_targets,basctl,\
-	Package_xml \
+	Package_uiconfig \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/basctl/Package_uiconfig.mk b/basctl/Package_uiconfig.mk
new file mode 100644
index 0000000..229a465
--- /dev/null
+++ b/basctl/Package_uiconfig.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,basctl_uiconfig,$(SRCDIR)/basctl))
+
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/menubar/menubar.xml,uiconfig/basicide/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/statusbar/statusbar.xml,uiconfig/basicide/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/dialogbar.xml,uiconfig/basicide/toolbar/dialogbar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/findbar.xml,uiconfig/basicide/toolbar/findbar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/fullscreenbar.xml,uiconfig/basicide/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/insertcontrolsbar.xml,uiconfig/basicide/toolbar/insertcontrolsbar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/formcontrolsbar.xml,uiconfig/basicide/toolbar/formcontrolsbar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/macrobar.xml,uiconfig/basicide/toolbar/macrobar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/standardbar.xml,uiconfig/basicide/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/translationbar.xml,uiconfig/basicide/toolbar/translationbar.xml))
+
+# vim: set noet sw=4 ts=4:
diff --git a/basctl/Package_xml.mk b/basctl/Package_xml.mk
deleted file mode 100644
index 2acd529..0000000
--- a/basctl/Package_xml.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,basctl_xml,$(SRCDIR)/basctl))
-
-$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/menubar/menubar.xml,uiconfig/basicide/menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/statusbar/statusbar.xml,uiconfig/basicide/statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/dialogbar.xml,uiconfig/basicide/toolbar/dialogbar.xml))
-$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/findbar.xml,uiconfig/basicide/toolbar/findbar.xml))
-$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/fullscreenbar.xml,uiconfig/basicide/toolbar/fullscreenbar.xml))
-$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/insertcontrolsbar.xml,uiconfig/basicide/toolbar/insertcontrolsbar.xml))
-$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/formcontrolsbar.xml,uiconfig/basicide/toolbar/formcontrolsbar.xml))
-$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/macrobar.xml,uiconfig/basicide/toolbar/macrobar.xml))
-$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/standardbar.xml,uiconfig/basicide/toolbar/standardbar.xml))
-$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/translationbar.xml,uiconfig/basicide/toolbar/translationbar.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index b0dcdf8..2c6649a 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 	Library_sdbc2 \
 	Package_generated \
 	Package_inc \
-	Package_xml \
 ))
 
 ifneq ($(SOLAR_JAVA),)
diff --git a/connectivity/Package_xml.mk b/connectivity/Package_xml.mk
deleted file mode 100644
index 5d6c0e9..0000000
--- a/connectivity/Package_xml.mk
+++ /dev/null
@@ -1,44 +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) 2011 Peter Foley <pefoley2 at verizon.net> (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_Package_Package,connectivity_xml,$(SRCDIR)/connectivity/source))
-
-$(eval $(call gb_Package_add_file,connectivity_xml,xml/evoab.xml,drivers/evoab2/evoab.xml))
-$(eval $(call gb_Package_add_file,connectivity_xml,xml/odbc.xml,drivers/odbc/odbc.xml))
-$(eval $(call gb_Package_add_file,connectivity_xml,xml/dbase.xml,drivers/dbase/dbase.xml))
-$(eval $(call gb_Package_add_file,connectivity_xml,xml/kab.xml,drivers/kab/kab.xml))
-$(eval $(call gb_Package_add_file,connectivity_xml,xml/mozab.xml,drivers/mozab/mozab.xml))
-$(eval $(call gb_Package_add_file,connectivity_xml,xml/mysql.xml,drivers/mysql/mysql.xml))
-$(eval $(call gb_Package_add_file,connectivity_xml,xml/flat.xml,drivers/flat/flat.xml))
-$(eval $(call gb_Package_add_file,connectivity_xml,xml/file.xml,drivers/file/file.xml))
-$(eval $(call gb_Package_add_file,connectivity_xml,xml/CalcDriver.xml,drivers/calc/CalcDriver.xml))
-$(eval $(call gb_Package_add_file,connectivity_xml,xml/jdbc.xml,drivers/jdbc/jdbc.xml))
-$(eval $(call gb_Package_add_file,connectivity_xml,xml/macab.xml,drivers/macab/macab.xml))
-$(eval $(call gb_Package_add_file,connectivity_xml,xml/ado.xml,drivers/ado/ado.xml))
-$(eval $(call gb_Package_add_file,connectivity_xml,xml/dbpool.xml,cpool/dbpool.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/connectivity/source/cpool/dbpool.xml b/connectivity/source/cpool/dbpool.xml
deleted file mode 100644
index f2c6edf..0000000
--- a/connectivity/source/cpool/dbpool.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>dbpool</module-name>
-    <component-description>
-        <author>Ocke Janssen</author>
-        <name>com.sun.star.comp.sdbc.OConnectionPool</name>
-        <description>
-            This is the implementation of the connection pool.
-        </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.sdbc.ConnectionPool</supported-service>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper</runtime-module-dependency>
-    <runtime-module-dependency>cppu</runtime-module-dependency>
-    <runtime-module-dependency>sal</runtime-module-dependency>
-    <runtime-module-dependency>dbtools</runtime-module-dependency>
-    <runtime-module-dependency>comphelper</runtime-module-dependency>
-</module-description>
-
-
diff --git a/connectivity/source/dbtools/dbt.xml b/connectivity/source/dbtools/dbt.xml
deleted file mode 100644
index 0913a6c..0000000
--- a/connectivity/source/dbtools/dbt.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>dbt</module-name>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper</runtime-module-dependency>
-    <runtime-module-dependency>cppu</runtime-module-dependency>
-    <runtime-module-dependency>sal</runtime-module-dependency>
-    <runtime-module-dependency>comphelper</runtime-module-dependency>
-</module-description>
-
-
diff --git a/connectivity/source/drivers/ado/ado.xml b/connectivity/source/drivers/ado/ado.xml
deleted file mode 100644
index aafa51f..0000000
--- a/connectivity/source/drivers/ado/ado.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   ado </module-name>
-    <component-description>
-        <author>Ocke Janssen</author>
-        <name>com.sun.star.comp.sdbc.ado.ODriver</name>
-        <description>
-            This is the implementation of the ado-sdbc bridge.
-        </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service> com.sun.star.sdbc.Driver</supported-service>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper</runtime-module-dependency>
-    <runtime-module-dependency>cppu</runtime-module-dependency>
-    <runtime-module-dependency>sal</runtime-module-dependency>
-    <runtime-module-dependency>osl</runtime-module-dependency>
-    <runtime-module-dependency>dbtools</runtime-module-dependency>
-    <runtime-module-dependency>comphelper</runtime-module-dependency>
-</module-description>
-
-
diff --git a/connectivity/source/drivers/calc/CalcDriver.xml b/connectivity/source/drivers/calc/CalcDriver.xml
deleted file mode 100644
index 65c4d75..0000000
--- a/connectivity/source/drivers/calc/CalcDriver.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description>
-    <module-name>file</module-name>
-    <component-description>
-        <author>Niklas Nebel</author>
-        <name>com.sun.star.sdbc.driver.calc.ODriver</name>
-        <description>This library implements the database driver for spreadsheet (Calc) file formats.
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.sdbc.Driver</supported-service>
-        <supported-service>com.sun.star.sdbcx.Driver</supported-service>
-        <service-dependency>    ... </service-dependency>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper</runtime-module-dependency>
-    <runtime-module-dependency>cppu</runtime-module-dependency>
-    <runtime-module-dependency>sal</runtime-module-dependency>
-    <runtime-module-dependency>osl</runtime-module-dependency>
-    <runtime-module-dependency>svtools-light1</runtime-module-dependency>
-    <runtime-module-dependency>svtools</runtime-module-dependency>
-    <runtime-module-dependency>ucbhelper</runtime-module-dependency>
-    <runtime-module-dependency>dbtools</runtime-module-dependency>
-    <runtime-module-dependency>unotools</runtime-module-dependency>
-    <runtime-module-dependency>comphelper</runtime-module-dependency>
-</module-description>
diff --git a/connectivity/source/drivers/dbase/dbase.xml b/connectivity/source/drivers/dbase/dbase.xml
deleted file mode 100644
index 756af85..0000000
--- a/connectivity/source/drivers/dbase/dbase.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description>
-    <module-name>file</module-name>
-    <component-description>
-        <author>Ocke Jannsen</author>
-        <name>com.sun.star.comp.sdbc.dbase.ODriver</name>
-        <description>This library implements the database driver for dBase file format.
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.sdbc.Driver</supported-service>
-        <supported-service>com.sun.star.sdbcx.Driver</supported-service>
-        <service-dependency>    ... </service-dependency>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>file</runtime-module-dependency>
-    <runtime-module-dependency>cppuhelper</runtime-module-dependency>
-    <runtime-module-dependency>cppu</runtime-module-dependency>
-    <runtime-module-dependency>sal</runtime-module-dependency>
-    <runtime-module-dependency>osl</runtime-module-dependency>
-    <runtime-module-dependency>svtools-light1</runtime-module-dependency>
-    <runtime-module-dependency>svtools</runtime-module-dependency>
-    <runtime-module-dependency>ucbhelper</runtime-module-dependency>
-    <runtime-module-dependency>dbtools</runtime-module-dependency>
-    <runtime-module-dependency>unotools</runtime-module-dependency>
-    <runtime-module-dependency>comphelper</runtime-module-dependency>
-</module-description>
diff --git a/connectivity/source/drivers/evoab2/evoab.xml b/connectivity/source/drivers/evoab2/evoab.xml
deleted file mode 100644
index 5f0906e..0000000
--- a/connectivity/source/drivers/evoab2/evoab.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description>
-    <module-name>evoab</module-name>
-    <component-description>
-        <author>Jayant Madavi</author>
-        <name>com.sun.star.comp.sdbc.evoab.OEvoabDriver</name>
-        <description>This library implements the database driver for evolution address book formats.
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.sdbc.Driver</supported-service>
-        <service-dependency>    ... </service-dependency>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper</runtime-module-dependency>
-    <runtime-module-dependency>cppu</runtime-module-dependency>
-    <runtime-module-dependency>sal</runtime-module-dependency>
-    <runtime-module-dependency>osl</runtime-module-dependency>
-    <runtime-module-dependency>svtools-light1</runtime-module-dependency>
-    <runtime-module-dependency>svtools</runtime-module-dependency>
-    <runtime-module-dependency>ucbhelper</runtime-module-dependency>
-    <runtime-module-dependency>unotools</runtime-module-dependency>
-    <runtime-module-dependency>comphelper</runtime-module-dependency>
-</module-description>
diff --git a/connectivity/source/drivers/file/file.xml b/connectivity/source/drivers/file/file.xml
deleted file mode 100644
index 3c9d783..0000000
--- a/connectivity/source/drivers/file/file.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description>
-    <module-name>file</module-name>
-    <component-description>
-        <author>Ocke Jannsen</author>
-        <name>com.sun.star.sdbc.driver.file.Driver</name>
-        <description>This library implements basic functionallity for file-base drivers.
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.sdbc.Driver</supported-service>
-        <supported-service>com.sun.star.sdbcx.Driver</supported-service>
-        <service-dependency>    ... </service-dependency>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper</runtime-module-dependency>
-    <runtime-module-dependency>cppu</runtime-module-dependency>
-    <runtime-module-dependency>sal</runtime-module-dependency>
-    <runtime-module-dependency>osl</runtime-module-dependency>
-    <runtime-module-dependency>svtools-light1</runtime-module-dependency>
-    <runtime-module-dependency>svtools</runtime-module-dependency>
-    <runtime-module-dependency>ucbhelper</runtime-module-dependency>
-    <runtime-module-dependency>dbtools</runtime-module-dependency>
-    <runtime-module-dependency>unotools</runtime-module-dependency>
-    <runtime-module-dependency>comphelper</runtime-module-dependency>
-</module-description>
diff --git a/connectivity/source/drivers/flat/flat.xml b/connectivity/source/drivers/flat/flat.xml
deleted file mode 100644
index 952da92..0000000
--- a/connectivity/source/drivers/flat/flat.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description>
-    <module-name>file</module-name>
-    <component-description>
-        <author>Ocke Jannsen</author>
-        <name>com.sun.star.comp.sdbc.flat.ODriver</name>
-        <description>This library implements the database driver for flat file formats.
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.sdbc.Driver</supported-service>
-        <supported-service>com.sun.star.sdbcx.Driver</supported-service>
-        <service-dependency>    ... </service-dependency>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>file</runtime-module-dependency>
-    <runtime-module-dependency>cppuhelper</runtime-module-dependency>
-    <runtime-module-dependency>cppu</runtime-module-dependency>
-    <runtime-module-dependency>sal</runtime-module-dependency>
-    <runtime-module-dependency>osl</runtime-module-dependency>
-    <runtime-module-dependency>svtools-light1</runtime-module-dependency>
-    <runtime-module-dependency>svtools</runtime-module-dependency>
-    <runtime-module-dependency>ucbhelper</runtime-module-dependency>
-    <runtime-module-dependency>dbtools</runtime-module-dependency>
-    <runtime-module-dependency>unotools</runtime-module-dependency>
-    <runtime-module-dependency>comphelper</runtime-module-dependency>
-</module-description>
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.xml b/connectivity/source/drivers/hsqldb/hsqldb.xml
deleted file mode 100644
index a57fe69..0000000
--- a/connectivity/source/drivers/hsqldb/hsqldb.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>hsqldb</module-name>
-    <component-description>
-        <author>Ocke Janssen</author>
-        <name>com.sun.star.sdbcx.comp.hsqldb.Driver</name>
-        <description>
-            This is the implementation of the HSQLDB driver.
-        </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.sdbcx.Driver</supported-service>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper</runtime-module-dependency>
-    <runtime-module-dependency>cppu</runtime-module-dependency>
-    <runtime-module-dependency>sal</runtime-module-dependency>
-    <runtime-module-dependency>dbtools</runtime-module-dependency>
-    <runtime-module-dependency>comphelper</runtime-module-dependency>
-</module-description>
-
-
diff --git a/connectivity/source/drivers/jdbc/jdbc.xml b/connectivity/source/drivers/jdbc/jdbc.xml
deleted file mode 100644
index 0b48c0c..0000000
--- a/connectivity/source/drivers/jdbc/jdbc.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   jdbc    </module-name>
-    <component-description>
-        <author>Ocke Janssen</author>
-        <name>com.sun.star.comp.sdbc.JDBCDriver</name>
-        <description>
-            This is the implementation of the sdbc-jdbc bridge.
-        </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service> com.sun.star.sdbc.Driver    </supported-service>
-        <service-dependency>    ... </service-dependency>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper</runtime-module-dependency>
-    <runtime-module-dependency>cppu</runtime-module-dependency>
-    <runtime-module-dependency>sal</runtime-module-dependency>
-    <runtime-module-dependency>osl</runtime-module-dependency>
-    <runtime-module-dependency>dbtools</runtime-module-dependency>
-    <runtime-module-dependency>comphelper</runtime-module-dependency>
-</module-description>
-
-
diff --git a/connectivity/source/drivers/kab/kab.xml b/connectivity/source/drivers/kab/kab.xml
deleted file mode 100644
index ae5bdcf..0000000
--- a/connectivity/source/drivers/kab/kab.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   kab1    </module-name>
-    <component-description>
-        <Author>Eric Bischoff</Author>
-        <Name>com.sun.star.comp.sdbc.kab.Driver</Name>
-        <description>This library implements the database driver for KDE address book formats.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.sdbc.Driver</supported-service>
-        <service-dependency>    ... </service-dependency>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu1       </runtime-module-dependency>
-    <runtime-module-dependency> sal1        </runtime-module-dependency>
-
-    <type>  com.sun.star.registry.XRegistryKey          </type>
-    <type>  com.sun.star.util.XCancellable              </type>
-    <type>  com.sun.star.util.XNumberFormatter          </type>
-    <type>  com.sun.star.uno.TypeClass                  </type>
-    <type>  com.sun.star.uno.XWeak                      </type>
-    <type>  com.sun.star.uno.XAggregation               </type>
-    <type>  com.sun.star.uno.XComponentContext          </type>
-    <type>  com.sun.star.beans.PropertyAttribute        </type>
-    <type>  com.sun.star.beans.XPropertyState           </type>
-    <type>  com.sun.star.beans.XPropertySet             </type>
-    <type>  com.sun.star.beans.PropertyValue            </type>
-    <type>  com.sun.star.beans.XMultiPropertySet        </type>
-    <type>  com.sun.star.beans.XFastPropertySet         </type>
-    <type>  com.sun.star.lang.XSingleServiceFactory     </type>
-    <type>  com.sun.star.lang.XTypeProvider             </type>
-    <type>  com.sun.star.lang.XSingleComponentFactory   </type>
-    <type>  com.sun.star.lang.EventObject               </type>
-    <type>  com.sun.star.lang.XComponent                </type>
-    <type>  com.sun.star.lang.IllegalArgumentException  </type>
-    <type>  com.sun.star.lang.DisposedException         </type>
-    <type>  com.sun.star.lang.XMultiServiceFactory      </type>
-    <type>  com.sun.star.lang.XServiceInfo              </type>
-    <type>  com.sun.star.lang.XUnoTunnel                </type>
-    <type>  com.sun.star.java.XJavaThreadRegister_11    </type>
-    <type>  com.sun.star.java.XJavaVM                   </type>
-    <type>  com.sun.star.sdbc.FetchDirection            </type>
-    <type>  com.sun.star.sdbc.XConnection               </type>
-    <type>  com.sun.star.sdbc.XStatement                </type>
-    <type>  com.sun.star.sdbc.XResultSet                </type>
-    <type>  com.sun.star.sdbc.XResultSetMetaDataSupplier</type>
-    <type>  com.sun.star.sdbc.XColumnLocate             </type>
-    <type>  com.sun.star.sdbc.XResultSetUpdate          </type>
-    <type>  com.sun.star.sdbc.XWarningsSupplier         </type>
-    <type>  com.sun.star.sdbc.XRowUpdate                </type>
-    <type>  com.sun.star.sdbc.XMultipleResults          </type>
-    <type>  com.sun.star.sdbc.XBatchExecution           </type>
-    <type>  com.sun.star.sdbc.XPreparedBatchExecution   </type>
-    <type>  com.sun.star.sdbc.XParameters               </type>
-    <type>  com.sun.star.sdbc.XOutParameters            </type>
-    <type>  com.sun.star.sdbc.DriverPropertyInfo        </type>
-    <type>  com.sun.star.sdbc.SQLWarning                </type>
-    <type>  com.sun.star.sdbc.XRow                      </type>
-    <type>  com.sun.star.sdbc.ColumnSearch              </type>
-    <type>  com.sun.star.sdbc.ColumnValue               </type>
-    <type>  com.sun.star.sdbc.DataType                  </type>
-    <type>  com.sun.star.sdbc.XDriver                   </type>
-    <type>  com.sun.star.sdbc.TransactionIsolation      </type>
-    <type>  com.sun.star.sdbc.ResultSetType             </type>
-    <type>  com.sun.star.sdbc.ResultSetConcurrency      </type>
-    <type>  com.sun.star.sdbcx.XRowLocate               </type>
-    <type>  com.sun.star.sdbcx.XDeleteRows              </type>
-    <type>  com.sun.star.sdbcx.CompareBookmark          </type>
-    <type>  com.sun.star.sdb.XColumnUpdate              </type>
-    <type>  com.sun.star.sdb.XColumn                    </type>
-</module-description>
diff --git a/connectivity/source/drivers/kab/tdeab.xml b/connectivity/source/drivers/kab/tdeab.xml
deleted file mode 100644
index ef5b0dd..0000000
--- a/connectivity/source/drivers/kab/tdeab.xml
+++ /dev/null
@@ -1,85 +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/.
- *
--->
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   tdeab1    </module-name>
-    <component-description>
-        <Author>Eric Bischoff</Author>
-        <Name>com.sun.star.comp.sdbc.tdeab.Driver</Name>
-        <description>This library implements the database driver for TDE address book formats.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.sdbc.Driver</supported-service>
-        <service-dependency>    ... </service-dependency>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu1       </runtime-module-dependency>
-    <runtime-module-dependency> sal1        </runtime-module-dependency>
-
-    <type>  com.sun.star.registry.XRegistryKey          </type>
-    <type>  com.sun.star.util.XCancellable              </type>
-    <type>  com.sun.star.util.XNumberFormatter          </type>
-    <type>  com.sun.star.uno.TypeClass                  </type>
-    <type>  com.sun.star.uno.XWeak                      </type>
-    <type>  com.sun.star.uno.XAggregation               </type>
-    <type>  com.sun.star.uno.XComponentContext          </type>
-    <type>  com.sun.star.beans.PropertyAttribute        </type>
-    <type>  com.sun.star.beans.XPropertyState           </type>
-    <type>  com.sun.star.beans.XPropertySet             </type>
-    <type>  com.sun.star.beans.PropertyValue            </type>
-    <type>  com.sun.star.beans.XMultiPropertySet        </type>
-    <type>  com.sun.star.beans.XFastPropertySet         </type>
-    <type>  com.sun.star.lang.XSingleServiceFactory     </type>
-    <type>  com.sun.star.lang.XTypeProvider             </type>
-    <type>  com.sun.star.lang.XSingleComponentFactory   </type>
-    <type>  com.sun.star.lang.EventObject               </type>
-    <type>  com.sun.star.lang.XComponent                </type>
-    <type>  com.sun.star.lang.IllegalArgumentException  </type>
-    <type>  com.sun.star.lang.DisposedException         </type>
-    <type>  com.sun.star.lang.XMultiServiceFactory      </type>
-    <type>  com.sun.star.lang.XServiceInfo              </type>
-    <type>  com.sun.star.lang.XUnoTunnel                </type>
-    <type>  com.sun.star.java.XJavaThreadRegister_11    </type>
-    <type>  com.sun.star.java.XJavaVM                   </type>
-    <type>  com.sun.star.sdbc.FetchDirection            </type>
-    <type>  com.sun.star.sdbc.XConnection               </type>
-    <type>  com.sun.star.sdbc.XStatement                </type>
-    <type>  com.sun.star.sdbc.XResultSet                </type>
-    <type>  com.sun.star.sdbc.XResultSetMetaDataSupplier</type>
-    <type>  com.sun.star.sdbc.XColumnLocate             </type>
-    <type>  com.sun.star.sdbc.XResultSetUpdate          </type>
-    <type>  com.sun.star.sdbc.XWarningsSupplier         </type>
-    <type>  com.sun.star.sdbc.XRowUpdate                </type>
-    <type>  com.sun.star.sdbc.XMultipleResults          </type>
-    <type>  com.sun.star.sdbc.XBatchExecution           </type>
-    <type>  com.sun.star.sdbc.XPreparedBatchExecution   </type>
-    <type>  com.sun.star.sdbc.XParameters               </type>
-    <type>  com.sun.star.sdbc.XOutParameters            </type>
-    <type>  com.sun.star.sdbc.DriverPropertyInfo        </type>
-    <type>  com.sun.star.sdbc.SQLWarning                </type>
-    <type>  com.sun.star.sdbc.XRow                      </type>
-    <type>  com.sun.star.sdbc.ColumnSearch              </type>
-    <type>  com.sun.star.sdbc.ColumnValue               </type>
-    <type>  com.sun.star.sdbc.DataType                  </type>
-    <type>  com.sun.star.sdbc.XDriver                   </type>
-    <type>  com.sun.star.sdbc.TransactionIsolation      </type>
-    <type>  com.sun.star.sdbc.ResultSetType             </type>
-    <type>  com.sun.star.sdbc.ResultSetConcurrency      </type>
-    <type>  com.sun.star.sdbcx.XRowLocate               </type>
-    <type>  com.sun.star.sdbcx.XDeleteRows              </type>
-    <type>  com.sun.star.sdbcx.CompareBookmark          </type>
-    <type>  com.sun.star.sdb.XColumnUpdate              </type>
-    <type>  com.sun.star.sdb.XColumn                    </type>
-</module-description>
diff --git a/connectivity/source/drivers/macab/macab.xml b/connectivity/source/drivers/macab/macab.xml
deleted file mode 100644
index 1e38cf0..0000000
--- a/connectivity/source/drivers/macab/macab.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   macab1  </module-name>
-    <component-description>
-        <Author>Omer bar-or</Author>
-        <Name>com.sun.star.comp.sdbc.macab.Driver</Name>
-        <description>This library implements the database driver for Mac OS address book formats.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="alpha"/>
-        <supported-service>com.sun.star.sdbc.Driver</supported-service>
-        <service-dependency>    ... </service-dependency>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu1       </runtime-module-dependency>
-    <runtime-module-dependency> sal1        </runtime-module-dependency>
-
-    <type>  com.sun.star.registry.XRegistryKey          </type>
-    <type>  com.sun.star.util.XCancellable              </type>
-    <type>  com.sun.star.util.XNumberFormatter          </type>
-    <type>  com.sun.star.uno.TypeClass                  </type>
-    <type>  com.sun.star.uno.XWeak                      </type>
-    <type>  com.sun.star.uno.XAggregation               </type>
-    <type>  com.sun.star.uno.XComponentContext          </type>
-    <type>  com.sun.star.beans.PropertyAttribute        </type>
-    <type>  com.sun.star.beans.XPropertyState           </type>
-    <type>  com.sun.star.beans.XPropertySet             </type>
-    <type>  com.sun.star.beans.PropertyValue            </type>
-    <type>  com.sun.star.beans.XMultiPropertySet        </type>
-    <type>  com.sun.star.beans.XFastPropertySet         </type>
-    <type>  com.sun.star.lang.XSingleServiceFactory     </type>
-    <type>  com.sun.star.lang.XTypeProvider             </type>
-    <type>  com.sun.star.lang.XSingleComponentFactory   </type>
-    <type>  com.sun.star.lang.EventObject               </type>
-    <type>  com.sun.star.lang.XComponent                </type>
-    <type>  com.sun.star.lang.IllegalArgumentException  </type>
-    <type>  com.sun.star.lang.DisposedException         </type>
-    <type>  com.sun.star.lang.XMultiServiceFactory      </type>
-    <type>  com.sun.star.lang.XServiceInfo              </type>
-    <type>  com.sun.star.lang.XUnoTunnel                </type>
-    <type>  com.sun.star.java.XJavaThreadRegister_11    </type>
-    <type>  com.sun.star.java.XJavaVM                   </type>
-    <type>  com.sun.star.sdbc.FetchDirection            </type>
-    <type>  com.sun.star.sdbc.XConnection               </type>
-    <type>  com.sun.star.sdbc.XStatement                </type>
-    <type>  com.sun.star.sdbc.XResultSet                </type>
-    <type>  com.sun.star.sdbc.XResultSetMetaDataSupplier</type>
-    <type>  com.sun.star.sdbc.XColumnLocate             </type>
-    <type>  com.sun.star.sdbc.XResultSetUpdate          </type>
-    <type>  com.sun.star.sdbc.XWarningsSupplier         </type>
-    <type>  com.sun.star.sdbc.XRowUpdate                </type>
-    <type>  com.sun.star.sdbc.XMultipleResults          </type>
-    <type>  com.sun.star.sdbc.XBatchExecution           </type>
-    <type>  com.sun.star.sdbc.XPreparedBatchExecution   </type>
-    <type>  com.sun.star.sdbc.XParameters               </type>
-    <type>  com.sun.star.sdbc.XOutParameters            </type>
-    <type>  com.sun.star.sdbc.DriverPropertyInfo        </type>
-    <type>  com.sun.star.sdbc.SQLWarning                </type>
-    <type>  com.sun.star.sdbc.XRow                      </type>
-    <type>  com.sun.star.sdbc.ColumnSearch              </type>
-    <type>  com.sun.star.sdbc.ColumnValue               </type>
-    <type>  com.sun.star.sdbc.DataType                  </type>
-    <type>  com.sun.star.sdbc.XDriver                   </type>
-    <type>  com.sun.star.sdbc.TransactionIsolation      </type>
-    <type>  com.sun.star.sdbc.ResultSetType             </type>
-    <type>  com.sun.star.sdbc.ResultSetConcurrency      </type>
-    <type>  com.sun.star.sdbcx.XRowLocate               </type>
-    <type>  com.sun.star.sdbcx.XDeleteRows              </type>
-    <type>  com.sun.star.sdbcx.CompareBookmark          </type>
-    <type>  com.sun.star.sdb.XColumnUpdate              </type>
-    <type>  com.sun.star.sdb.XColumn                    </type>
-</module-description>
diff --git a/connectivity/source/drivers/mozab/mozab.xml b/connectivity/source/drivers/mozab/mozab.xml
deleted file mode 100644
index 5ccafdd..0000000
--- a/connectivity/source/drivers/mozab/mozab.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name> mozabdrv2 </module-name>
-    <component-description>
-        <Author>Your name</Author>
-        <Name>com.sun.star.comp.sdbc.MozabDriver</Name>
-        <Description>
-            This is the implementation of the sdbc-mozab bridge.
-        </Description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service> com.sun.star.sdbc.Driver    </supported-service>
-        <service-dependency>    ... </service-dependency>
-    </component-description>
-    <component-description>
-        <Author>Wind Li</Author>
-        <Name>com.sun.star.comp.mozilla.MozillaBootstrap</Name>
-        <Description>
-            This is the implementation of the MozillaBootstrap for sdbc-mozab bridge and xmlsec.
-        </Description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service> com.sun.star.mozilla.MozillaBootstrap</supported-service>
-        <service-dependency>    ... </service-dependency>
-    </component-description>
-        <project-build-dependency>  cppuhelper  </project-build-dependency>
-        <project-build-dependency>  cppu        </project-build-dependency>
-        <project-build-dependency>  sal         </project-build-dependency>
-
-        <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-        <runtime-module-dependency> cppu1       </runtime-module-dependency>
-        <runtime-module-dependency> sal1        </runtime-module-dependency>
-
-
-
-        <type>  com.sun.star.util.XCancellable              </type>
-        <type>  com.sun.star.util.XNumberFormatter          </type>
-        <type>  com.sun.star.uno.TypeClass                  </type>
-        <type>  com.sun.star.uno.XWeak                      </type>
-        <type>  com.sun.star.uno.XAggregation               </type>
-        <type>  com.sun.star.beans.XPropertyState           </type>
-        <type>  com.sun.star.beans.XPropertySet             </type>
-        <type>  com.sun.star.beans.PropertyValue            </type>
-        <type>  com.sun.star.beans.XMultiPropertySet        </type>
-        <type>  com.sun.star.beans.XFastPropertySet         </type>
-        <type>  com.sun.star.lang.XTypeProvider             </type>
-        <type>  com.sun.star.lang.EventObject               </type>
-        <type>  com.sun.star.lang.XComponent                </type>
-        <type>  com.sun.star.lang.IllegalArgumentException  </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory      </type>
-        <type>  com.sun.star.java.XJavaThreadRegister_11    </type>
-        <type>  com.sun.star.java.XJavaVM                   </type>
-        <type>  com.sun.star.sdbc.XConnection               </type>
-        <type>  com.sun.star.sdbc.XStatement                </type>
-        <type>  com.sun.star.sdbc.XResultSet                </type>
-        <type>  com.sun.star.sdbc.XResultSetMetaDataSupplier</type>
-        <type>  com.sun.star.sdbc.XColumnLocate             </type>
-        <type>  com.sun.star.sdbc.XResultSetUpdate          </type>
-        <type>  com.sun.star.sdbc.XWarningsSupplier         </type>
-        <type>  com.sun.star.sdbc.XRowUpdate                </type>
-        <type>  com.sun.star.sdbc.XMultipleResults          </type>
-        <type>  com.sun.star.sdbc.XBatchExecution           </type>
-        <type>  com.sun.star.sdbc.XPreparedBatchExecution   </type>
-        <type>  com.sun.star.sdbc.XParameters               </type>
-        <type>  com.sun.star.sdbc.XOutParameters            </type>
-        <type>  com.sun.star.sdbc.DriverPropertyInfo        </type>
-        <type>  com.sun.star.sdbc.XRow                      </type>
-        <type>  com.sun.star.sdb.XColumnUpdate              </type>
-        <type>  com.sun.star.sdb.XColumn                    </type>
-        <type> com.sun.star.sdbc.XResultSetUpdate   </type>
-        <type> com.sun.star.sdbc.XRowUpdate         </type>
-        <type> com.sun.star.sdbcx.XRowLocate            </type>
-        <type> com.sun.star.sdbcx.XDeleteRows       </type>
-
-</module-description>
-
-
diff --git a/connectivity/source/drivers/mysql/mysql.xml b/connectivity/source/drivers/mysql/mysql.xml
deleted file mode 100644
index 24e9f1a..0000000
--- a/connectivity/source/drivers/mysql/mysql.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>odbc</module-name>
-    <component-description>
-        <author>Ocke Janssen</author>
-        <name>org.openoffice.comp.drivers.MySQL.Driver</name>
-        <description>
-            This is the implementation of the MySQL driver.
-        </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.sdbc.Driver</supported-service>
-        <supported-service>com.sun.star.sdbcx.Driver</supported-service>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper</runtime-module-dependency>
-    <runtime-module-dependency>cppu</runtime-module-dependency>
-    <runtime-module-dependency>sal</runtime-module-dependency>
-    <runtime-module-dependency>dbtools</runtime-module-dependency>
-    <runtime-module-dependency>comphelper</runtime-module-dependency>
-</module-description>
-
-
diff --git a/connectivity/source/drivers/odbc/odbc.xml b/connectivity/source/drivers/odbc/odbc.xml
deleted file mode 100644
index d3baa54..0000000
--- a/connectivity/source/drivers/odbc/odbc.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>odbc</module-name>
-    <component-description>
-        <author>Ocke Janssen</author>
-        <name>com.sun.star.comp.sdbc.ODBCDriver</name>
-        <description>
-            This is the implementation of the sdbc-odbc bridge.
-        </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.sdbc.Driver</supported-service>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper</runtime-module-dependency>
-    <runtime-module-dependency>cppu</runtime-module-dependency>
-    <runtime-module-dependency>sal</runtime-module-dependency>
-    <runtime-module-dependency>dbtools</runtime-module-dependency>
-    <runtime-module-dependency>comphelper</runtime-module-dependency>
-</module-description>
-
-
diff --git a/dtrans/Package_xml.mk b/dtrans/Package_xml.mk
deleted file mode 100644
index 571967a..0000000
--- a/dtrans/Package_xml.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,dtrans_xml,$(SRCDIR)/dtrans/source))
-
-$(eval $(call gb_Package_add_file,dtrans_xml,xml/dnd.xml,win32/dnd/dnd.xml))
-$(eval $(call gb_Package_add_file,dtrans_xml,xml/dtrans.xml,generic/dtrans.xml))
-$(eval $(call gb_Package_add_file,dtrans_xml,xml/ftransl.xml,win32/ftransl/ftransl.xml))
-$(eval $(call gb_Package_add_file,dtrans_xml,xml/mcnttype.xml,cnttype/mcnttype.xml))
-$(eval $(call gb_Package_add_file,dtrans_xml,xml/sysdtrans.xml,win32/clipb/sysdtrans.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dtrans/source/cnttype/mcnttype.xml b/dtrans/source/cnttype/mcnttype.xml
deleted file mode 100644
index 081d56d..0000000
--- a/dtrans/source/cnttype/mcnttype.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   mcnttype    </module-name>
-    <component-description>
-        <author> Tino Rachui </author>
-        <name>  com.sun.star.comp.datatransfer.MimeContentTypeFactory </name>
-        <description>
-    The win32 implementation of the datatransfer service.
-</description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
-        <status value="beta"/>
-        <supported-service> com.sun.star.datatransfer.MimeContentTypeFactory </supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.datatransfer.XMimeContentTypeFactory  </type>
-        <type>   com.sun.star.datatransfer.XMimeContentType         </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.lang.IllegalArgumentException         </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.container.XSet                        </type>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-</module-description>
diff --git a/dtrans/source/generic/dtrans.xml b/dtrans/source/generic/dtrans.xml
deleted file mode 100644
index a08613d..0000000
--- a/dtrans/source/generic/dtrans.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name> dtrans </module-name>
-    <component-description>
-        <author> Oliver Braun </author>
-        <name> com.sun.star.comp.datatransfer.generic </name>
-        <description> This module includes a generic clipboard implementation </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="beta"/>
-        <supported-service> com.sun.star.datatransfer.clipboard.GenericClipboard </supported-service>
-        <supported-service> com.sun.star.datatransfer.clipboard.ClipboardManager </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type> com.sun.star.datatransfer.clipboard.RenderingCapabilities </type>
-        <type> com.sun.star.datatransfer.clipboard.XClipboardEx </type>
-        <type> com.sun.star.datatransfer.clipboard.XClipboardManager </type>
-        <type> com.sun.star.datatransfer.clipboard.XClipboardNotifier </type>
-        <type> com.sun.star.datatransfer.XTransferableEx </type>
-        <type> com.sun.star.datatransfer.XTransferableSource </type>
-        <type> com.sun.star.io.XOutputStream </type>
-        <type> com.sun.star.lang.DisposedException </type>
-        <type> com.sun.star.lang.IllegalArgumentException </type>
-        <type> com.sun.star.lang.XComponent </type>
-        <type> com.sun.star.lang.XInitialization </type>
-        <type> com.sun.star.lang.XMultiServiceFactory </type>
-        <type> com.sun.star.lang.XSingleComponentFactory </type>
-        <type> com.sun.star.lang.XSingleServiceFactory </type>
-        <type> com.sun.star.lang.XServiceInfo </type>
-        <type> com.sun.star.lang.XTypeProvider </type>
-        <type> com.sun.star.registry.XRegistryKey </type>
-        <type> com.sun.star.uno.TypeClass </type>
-        <type> com.sun.star.uno.XComponentContext </type>
-        <type> com.sun.star.uno.XWeak </type>
-        <type> com.sun.star.uno.XAggregation </type>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-</module-description>
diff --git a/dtrans/source/win32/clipb/sysdtrans.xml b/dtrans/source/win32/clipb/sysdtrans.xml
deleted file mode 100644
index 3ef3b92..0000000
--- a/dtrans/source/win32/clipb/sysdtrans.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   sysdtrans   </module-name>
-    <component-description>
-        <author> Tino Rachui </author>
-        <name>  com.sun.star.comp.datatransfer.SystemClipboard </name>
-        <description>
-    The win32 implementation of the datatransfer service.
-</description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
-        <status value="beta"/>
-        <supported-service> com.sun.star.datatransfer.clipboard.SystemClipboard </supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.datatransfer.clipboard.XClipboardEx   </type>
-        <type>   com.sun.star.datatransfer.XTransferable            </type>
-        <type>   com.sun.star.datatransfer.XTransferableEx          </type>
-        <type>   com.sun.star.datatransfer.clipboard.XClipboardOwner</type>
-        <type>   com.sun.star.datatransfer.clipboard.XClipboardListener</type>
-        <type>   com.sun.star.datatransfer.clipboard.XClipboardNotifier</type>
-        <type>   com.sun.star.datatransfer.clipboard.XFlushableClipboard</type>
-        <type>   com.sun.star.datatransfer.clipboard.RenderingCapabilities</type>
-        <type>   com.sun.star.datatransfer.XTransferDataAccess      </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.lang.IllegalArgumentException         </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.container.XSet                        </type>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-</module-description>
diff --git a/dtrans/source/win32/dnd/dnd.xml b/dtrans/source/win32/dnd/dnd.xml
deleted file mode 100644
index ca6e27d..0000000
--- a/dtrans/source/win32/dnd/dnd.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   dnd </module-name>
-    <component-description>
-        <author> Joachim Lingner </author>
-        <name>  com.sun.star.comp.datatransfer.dnd.OleDragAndDrop </name>
-        <description>
-    The win32 implementation of the drop target service.
-</description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
-        <status value="beta"/>
-        <supported-service> com.sun.star.datatransfer.dnd.OleDragSource</supported-service>
-        <supported-service> com.sun.star.datatransfer.dnd.OleDropTarget</supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.datatransfer.dnd.DNDConstants         </type>
-        <type>   com.sun.star.datatransfer.dnd.XDropTarget          </type>
-        <type>   com.sun.star.datatransfer.dnd.XDropTargetDragContext   </type>
-        <type>   com.sun.star.datatransfer.dnd.XDropTargetListener  </type>
-        <type>   com.sun.star.datatransfer.dnd.XDropTargetDropContext   </type>
-        <type>   com.sun.star.datatransfer.dnd.XDragSourceContext   </type>
-        <type>   com.sun.star.datatransfer.dnd.XDragSource              </type>
-        <type>   com.sun.star.datatransfer.XTransferable                </type>
-        <type>   com.sun.star.lang.XComponent                       </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.lang.IllegalArgumentException         </type>
-        <type>   com.sun.star.lang.XInitialization                  </type>
-        <type>   com.sun.star.lang.XUnoTunnel                       </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.awt.MouseButton                       </type>
-        <type>   com.sun.star.awt.MouseEvent                        </type>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-</module-description>
diff --git a/dtrans/source/win32/ftransl/ftransl.xml b/dtrans/source/win32/ftransl/ftransl.xml
deleted file mode 100644
index e558a77..0000000
--- a/dtrans/source/win32/ftransl/ftransl.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   ftransl </module-name>
-    <component-description>
-        <author> Tino Rachui </author>
-        <name>  com.sun.star.comp.datatransfer.DataFormatTranslator </name>
-        <description>
-    The win32 implementation of the datatransfer service.
-</description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
-        <status value="beta"/>
-        <supported-service> com.sun.star.datatransfer.DataFormatTranslator </supported-service>
-        <service-dependency>    ... </service-dependency>
-        <type>   com.sun.star.datatransfer.XDataFormatTranslator    </type>
-        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
-        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
-        <type>   com.sun.star.lang.XServiceInfo                     </type>
-        <type>   com.sun.star.lang.XTypeProvider                    </type>
-        <type>   com.sun.star.uno.TypeClass                         </type>
-        <type>   com.sun.star.uno.XWeak                             </type>
-        <type>   com.sun.star.uno.XAggregation                      </type>
-        <type>   com.sun.star.registry.XRegistryKey                 </type>
-        <type>   com.sun.star.container.XSet                        </type>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-</module-description>
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index a2c0085..8a4ac0a 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -43,7 +43,6 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,fpicker,\
 	Library_fps_odma \
 	Library_fps \
-	Package_xml \
 	WinResTarget_fps \
 ))
 endif
diff --git a/fpicker/Package_xml.mk b/fpicker/Package_xml.mk
deleted file mode 100644
index 75a710c..0000000
--- a/fpicker/Package_xml.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Mode: makefile; 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) 2011 Matúš Kukan <matus.kukan at gmail.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_Package_Package,fpicker_xml,$(SRCDIR)/fpicker/source/win32))
-
-$(eval $(call gb_Package_add_file,fpicker_xml,xml/fps.xml,filepicker/fps.xml))
-$(eval $(call gb_Package_add_file,fpicker_xml,xml/fop.xml,folderpicker/fop.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/fpicker/source/aqua/fps_aqua.xml b/fpicker/source/aqua/fps_aqua.xml
deleted file mode 100644
index fcabc97..0000000
--- a/fpicker/source/aqua/fps_aqua.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>fps</module-name>
-    <component-description>
-        <author>Florian Heckl, Pavel Janík</author>
-        <name>com.sun.star.comp.ui.dialogs.FilePicker</name>
-        <description>
-            The native Mac OS X (Aqua) implementation of the FilePicker service.
-        </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.ui.dialogs.FilePicker</supported-service>
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.ui.dialogs.XExecutableDialog</type>
-        <type>com.sun.star.ui.dialogs.XFilePicker</type>
-        <type>com.sun.star.ui.dialogs.XFilterManager</type>
-        <type>com.sun.star.ui.dialogs.XFilterGroupManager</type>
-        <type>com.sun.star.ui.dialogs.XFilePickerListener</type>
-        <type>com.sun.star.ui.dialogs.ExecutableDialogException</type>
-        <type>com.sun.star.ui.dialogs.XFilePickerNotifier</type>
-        <type>com.sun.star.ui.dialogs.XFilePickerControlAccess</type>
-        <type>com.sun.star.ui.dialogs.ExtendedFilePickerElementIds</type>
-        <type>com.sun.star.ui.dialogs.ExecutableDialogResults</type>
-        <type>com.sun.star.ui.dialogs.FilePickerEvent</type>
-        <type>com.sun.star.ui.dialogs.CommonFilePickerElementIds</type>
-        <type>com.sun.star.ui.dialogs.ListboxControlActions</type>
-        <type>com.sun.star.ui.dialogs.TemplateDescription</type>
-        <type>com.sun.star.ui.dialogs.FilePreviewImageFormats</type>
-        <type>com.sun.star.util.XCancellable</type>
-        <type>com.sun.star.lang.XComponent</type>
-        <type>com.sun.star.lang.XMultiServiceFactory</type>
-        <type>com.sun.star.lang.XSingleServiceFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.lang.IllegalArgumentException</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-        <type>com.sun.star.container.XSet</type>
-    </component-description>
-    <component-description>
-        <author>Florian Heckl, Pavel Janík</author>
-        <name>com.sun.star.comp.ui.dialogs.FolderPicker</name>
-        <description>
-            The native Mac OS X (Aqua) implementation of the FolderPicker service.
-        </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.ui.dialogs.FolderPicker</supported-service>
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.ui.dialogs.XExecutableDialog</type>
-        <type>com.sun.star.ui.dialogs.XFolderPicker</type>
-        <type>com.sun.star.ui.dialogs.ExecutableDialogException</type>
-        <type>com.sun.star.ui.dialogs.ExecutableDialogResults</type>
-        <type>com.sun.star.util.XCancellable</type>
-        <type>com.sun.star.lang.XComponent</type>
-        <type>com.sun.star.lang.XMultiServiceFactory</type>
-        <type>com.sun.star.lang.XSingleServiceFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.lang.IllegalArgumentException</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-        <type>com.sun.star.container.XSet</type>
-    </component-description>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>sal</project-build-dependency>
-    <runtime-module-dependency>cppuhelper</runtime-module-dependency>
-    <runtime-module-dependency>cppu2</runtime-module-dependency>
-    <runtime-module-dependency>sal2</runtime-module-dependency>
-</module-description>
diff --git a/fpicker/source/win32/filepicker/fps.xml b/fpicker/source/win32/filepicker/fps.xml
deleted file mode 100644
index 21e02b3..0000000
--- a/fpicker/source/win32/filepicker/fps.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>fps</module-name>
-    <component-description>
-        <author> Tino Rachui </author>
-        <name>  com.sun.star.comp.ui.dialogs.FilePicker </name>
-        <description>
-    The win32 implementation of the FilePicker service.
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>  c++ </language>
-        <status value="beta"/>
-        <supported-service> com.sun.star.ui.dialogs.FilePicker </supported-service>
-        <service-dependency>...</service-dependency>
-        <type>  com.sun.star.ui.dialogs.XExecutableDialog           </type>
-        <type>  com.sun.star.ui.dialogs.XFilePicker                 </type>
-        <type>  com.sun.star.ui.dialogs.XFilterManager              </type>
-        <type>  com.sun.star.ui.dialogs.XFilterGroupManager         </type>
-        <type>  com.sun.star.ui.dialogs.XFilePickerListener         </type>
-        <type>  com.sun.star.ui.dialogs.ExecutableDialogException   </type>
-        <type>  com.sun.star.ui.dialogs.XFilePickerNotifier         </type>
-        <type>  com.sun.star.ui.dialogs.XFilePickerControlAccess    </type>
-        <type>  com.sun.star.ui.dialogs.XFilePreview </type>
-        <type>  com.sun.star.ui.dialogs.ExtendedFilePickerElementIds </type>
-        <type>  com.sun.star.ui.dialogs.ExecutableDialogResults     </type>
-        <type>  com.sun.star.ui.dialogs.FilePickerEvent             </type>
-        <type>  com.sun.star.ui.dialogs.CommonFilePickerElementIds </type>
-        <type>  com.sun.star.ui.dialogs.ListboxControlActions </type>
-        <type>  com.sun.star.ui.dialogs.TemplateDescription </type>
-        <type>  com.sun.star.ui.dialogs.FilePreviewImageFormats </type>
-        <type>  com.sun.star.util.XCancellable              </type>
-        <type>  com.sun.star.lang.XComponent                </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory      </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory     </type>
-        <type>  com.sun.star.lang.XServiceInfo              </type>
-        <type>  com.sun.star.lang.XTypeProvider             </type>
-        <type>  com.sun.star.lang.IllegalArgumentException  </type>
-        <type>  com.sun.star.uno.TypeClass                  </type>
-        <type>  com.sun.star.uno.XWeak                      </type>
-        <type>  com.sun.star.uno.XAggregation               </type>
-        <type>  com.sun.star.registry.XRegistryKey          </type>
-        <type>  com.sun.star.container.XSet                 </type>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-</module-description>
diff --git a/fpicker/source/win32/folderpicker/fop.xml b/fpicker/source/win32/folderpicker/fop.xml
deleted file mode 100644
index 63a21aa..0000000
--- a/fpicker/source/win32/folderpicker/fop.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * 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 .
- -->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>fop</module-name>
-    <component-description>
-        <author> Tino Rachui </author>
-        <name>com.sun.star.comp.ui.dialogs.FolderPicker</name>
-        <description>
-    The win32 implementation of the FolderPicker service.
-</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>  c++ </language>
-        <status value="beta"/>
-        <supported-service> com.sun.star.ui.dialogs.FolderPicker </supported-service>
-        <service-dependency>...</service-dependency>
-        <type>  com.sun.star.ui.dialogs.XExecutableDialog           </type>
-        <type>  com.sun.star.ui.dialogs.XFolderPicker               </type>
-        <type>  com.sun.star.ui.dialogs.ExecutableDialogException   </type>
-        <type>  com.sun.star.ui.dialogs.ExecutableDialogResults         </type>
-        <type>  com.sun.star.ui.dialogs.ExtendedFilePickerElementIds </type>
-        <type>  com.sun.star.ui.dialogs.CommonFilePickerElementIds </type>
-        <type>  com.sun.star.util.XCancellable              </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory      </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory     </type>
-        <type>  com.sun.star.lang.XServiceInfo              </type>
-        <type>  com.sun.star.lang.XTypeProvider             </type>
-        <type>  com.sun.star.lang.IllegalArgumentException  </type>
-        <type>  com.sun.star.uno.TypeClass                  </type>
-        <type>  com.sun.star.uno.XWeak                      </type>
-        <type>  com.sun.star.uno.XAggregation               </type>
-        <type>  com.sun.star.registry.XRegistryKey          </type>
-        <type>  com.sun.star.container.XSet                 </type>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-</module-description>
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index 9214d00..18bd128 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Module_add_targets,i18npool,\
 	Library_localedata_others \
 	Library_textconv_dict \
 	Package_inc \
-	Package_xml \
 ))
 
 ifneq ($(CROSS_COMPILING),YES)
diff --git a/i18npool/Package_xml.mk b/i18npool/Package_xml.mk
deleted file mode 100644
index 44524f7..0000000
--- a/i18npool/Package_xml.mk
+++ /dev/null
@@ -1,44 +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.
-#
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan at gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# 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_Package_Package,i18npool_xml,$(SRCDIR)/i18npool/xml))
-
-$(eval $(call gb_Package_add_file,i18npool_xml,xml/BreakIterator.xml,BreakIterator.xml))
-$(eval $(call gb_Package_add_file,i18npool_xml,xml/Calendar.xml,Calendar.xml))
-$(eval $(call gb_Package_add_file,i18npool_xml,xml/ChapterCollator.xml,ChapterCollator.xml))
-$(eval $(call gb_Package_add_file,i18npool_xml,xml/CharacterClassification.xml,CharacterClassification.xml))
-$(eval $(call gb_Package_add_file,i18npool_xml,xml/Collator.xml,Collator.xml))
-$(eval $(call gb_Package_add_file,i18npool_xml,xml/DefaultNumberingProvider.xml,DefaultNumberingProvider.xml))
-$(eval $(call gb_Package_add_file,i18npool_xml,xml/IndexEntrySupplier.xml,IndexEntrySupplier.xml))
-$(eval $(call gb_Package_add_file,i18npool_xml,xml/LocaleData.xml,LocaleData.xml))
-$(eval $(call gb_Package_add_file,i18npool_xml,xml/NumberFormatCodeMapper.xml,NumberFormatCodeMapper.xml))
-$(eval $(call gb_Package_add_file,i18npool_xml,xml/OrdinalSuffix.xml,OrdinalSuffix.xml))

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list