Replace use_internal_api with use_udk_api etc. where appropriate

Change-Id: I5e216ca01830a6568159ee8e9265938667f201a1

28 files changed, 9 insertions, 1003 deletions

diff --git a/stoc/InternalUnoApi_corefl.mk b/stoc/InternalUnoApi_corefl.mk
deleted file mode 100644
index aee2d2807fcc..000000000000
--- a/stoc/InternalUnoApi_corefl.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,corefl))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,corefl,stoc/source/corereflection/corefl.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_insp.mk b/stoc/InternalUnoApi_insp.mk
deleted file mode 100644
index c22eb1dd3507..000000000000
--- a/stoc/InternalUnoApi_insp.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,insp))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,insp,stoc/source/inspect/insp.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_inv.mk b/stoc/InternalUnoApi_inv.mk
deleted file mode 100644
index 169bac64fff5..000000000000
--- a/stoc/InternalUnoApi_inv.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,inv))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,inv,stoc/source/invocation/inv.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_invadp.mk b/stoc/InternalUnoApi_invadp.mk
deleted file mode 100644
index ddc3fdddeb9c..000000000000
--- a/stoc/InternalUnoApi_invadp.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,invadp))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,invadp,stoc/source/invocation_adapterfactory/invadp.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_javaloader.mk b/stoc/InternalUnoApi_javaloader.mk
deleted file mode 100644
index 41e1bb21a59c..000000000000
--- a/stoc/InternalUnoApi_javaloader.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,javaloader))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,javaloader,stoc/source/javaloader/javaloader.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_jen.mk b/stoc/InternalUnoApi_jen.mk
deleted file mode 100644
index 13767de69494..000000000000
--- a/stoc/InternalUnoApi_jen.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,jen))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,jen,stoc/source/javavm/jen.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_namingservice.mk b/stoc/InternalUnoApi_namingservice.mk
deleted file mode 100644
index 16e18c13a296..000000000000
--- a/stoc/InternalUnoApi_namingservice.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,namingservice))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,namingservice,stoc/source/namingservice/namingservice.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_proxyfac.mk b/stoc/InternalUnoApi_proxyfac.mk
deleted file mode 100644
index c5b5d744051d..000000000000
--- a/stoc/InternalUnoApi_proxyfac.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,proxyfac))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,proxyfac,stoc/source/proxy_factory/proxyfac.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_stocserv.mk b/stoc/InternalUnoApi_stocserv.mk
deleted file mode 100644
index 00dbbe986978..000000000000
--- a/stoc/InternalUnoApi_stocserv.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,stocserv))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,stocserv,stoc/source/stocservices/stocserv.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk
index a6e9a9bd47c5..d94330dec5b9 100644
--- a/stoc/Library_introspection.mk
+++ b/stoc/Library_introspection.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,introspection))
 
-$(eval $(call gb_Library_use_internal_api,introspection,\
-    insp \
-))
+$(eval $(call gb_Library_use_udk_api,introspection))
 
 $(eval $(call gb_Library_use_libraries,introspection,\
     cppu \
diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk
index ff6e3ec09ab3..fc9cb7238964 100644
--- a/stoc/Library_invocadapt.mk
+++ b/stoc/Library_invocadapt.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,invocadapt))
 
-$(eval $(call gb_Library_use_internal_api,invocadapt,\
-    invadp \
-))
+$(eval $(call gb_Library_use_udk_api,invocadapt))
 
 $(eval $(call gb_Library_use_libraries,invocadapt,\
     cppu \
diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk
index 040463d290f8..00288ebd3074 100644
--- a/stoc/Library_invocation.mk
+++ b/stoc/Library_invocation.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,invocation))
 
-$(eval $(call gb_Library_use_internal_api,invocation,\
-    inv \
-))
+$(eval $(call gb_Library_use_udk_api,invocation))
 
 $(eval $(call gb_Library_use_libraries,invocation,\
     cppu \
diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk
index 0822e4a45736..816bb621674b 100644
--- a/stoc/Library_javaloader.mk
+++ b/stoc/Library_javaloader.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,javaloader))
 
-$(eval $(call gb_Library_use_internal_api,javaloader,\
-    javaloader \
-))
+$(eval $(call gb_Library_use_udk_api,javaloader))
 
 $(eval $(call gb_Library_use_libraries,javaloader,\
     cppu \
diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk
index 193479998dc3..edf394e16e29 100644
--- a/stoc/Library_javavm.mk
+++ b/stoc/Library_javavm.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,javavm))
 
-$(eval $(call gb_Library_use_internal_api,javavm,\
-    jen \
-))
+$(eval $(call gb_Library_use_udk_api,javavm))
 
 $(eval $(call gb_Library_use_libraries,javavm,\
     cppu \
diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk
index dcd72610e969..10debb0abdbf 100644
--- a/stoc/Library_namingservice.mk
+++ b/stoc/Library_namingservice.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,namingservice))
 
-$(eval $(call gb_Library_use_internal_api,namingservice,\
-    namingservice \
-))
+$(eval $(call gb_Library_use_udk_api,namingservice))
 
 $(eval $(call gb_Library_use_libraries,namingservice,\
     cppu \
diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk
index a2efdc2ef1c2..6e13d58b761f 100644
--- a/stoc/Library_proxyfac.mk
+++ b/stoc/Library_proxyfac.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,proxyfac))
 
-$(eval $(call gb_Library_use_internal_api,proxyfac,\
-    proxyfac \
-))
+$(eval $(call gb_Library_use_udk_api,proxyfac))
 
 $(eval $(call gb_Library_use_libraries,proxyfac,\
     cppu \
diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk
index 34a5fe6cf091..2d383e55619c 100644
--- a/stoc/Library_reflection.mk
+++ b/stoc/Library_reflection.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,reflection))
 
-$(eval $(call gb_Library_use_internal_api,reflection,\
-    corefl \
-))
+$(eval $(call gb_Library_use_udk_api,reflection))
 
 $(eval $(call gb_Library_use_libraries,reflection,\
     cppu \
diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk
index d5741e604b9d..02a9ecfb5eb2 100644
--- a/stoc/Library_stocservices.mk
+++ b/stoc/Library_stocservices.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Library_set_include,stocservices,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_use_internal_api,stocservices,\
-    stocserv \
-))
+$(eval $(call gb_Library_use_udk_api,stocservices))
 
 $(eval $(call gb_Library_use_libraries,stocservices,\
     cppu \
diff --git a/stoc/Module_stoc.mk b/stoc/Module_stoc.mk
index cce68ddf2646..a6d31813e0e3 100644
--- a/stoc/Module_stoc.mk
+++ b/stoc/Module_stoc.mk
@@ -29,15 +29,6 @@ $(eval $(call gb_Module_Module,stoc))
 
 $(eval $(call gb_Module_add_targets,stoc,\
     InternalUnoApi_bootstrap \
-    InternalUnoApi_corefl \
-    InternalUnoApi_insp \
-    InternalUnoApi_inv \
-    InternalUnoApi_invadp \
-    InternalUnoApi_javaloader \
-    InternalUnoApi_jen \
-    InternalUnoApi_namingservice \
-    InternalUnoApi_proxyfac \
-    InternalUnoApi_stocserv \
     Library_bootstrap \
     Library_introspection \
     Library_invocadapt \
diff --git a/stoc/source/corereflection/corefl.xml b/stoc/source/corereflection/corefl.xml
deleted file mode 100644
index 18b1744218ca..000000000000
--- a/stoc/source/corereflection/corefl.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>   corereflection.uno  </module-name>
-    <component-description>
-        <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.stoc.CoreReflection   </name>
-        <description>
-The service provides reflection and access to all uno types
-(interfaces, structs, enums, ...).
-</description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.reflection.CoreReflection  </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type>com.sun.star.lang.DisposedException</type>
-        <type>  com.sun.star.reflection.XTypeDescription        </type>
-        <type>  com.sun.star.reflection.XIdlReflection          </type>
-        <type>  com.sun.star.reflection.XIdlClass               </type>
-        <type>  com.sun.star.reflection.XIdlField2              </type>
-        <type>  com.sun.star.container.XHierarchicalNameAccess  </type>
-        <type>  com.sun.star.lang.XComponent                    </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory                       </type>
-        <type>  com.sun.star.lang.XMultiComponentFactory                        </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.lang.WrappedTargetRuntimeException </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.uno.XComponentContext              </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </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> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
-</module-description>
diff --git a/stoc/source/inspect/insp.xml b/stoc/source/inspect/insp.xml
deleted file mode 100644
index 91afca8d30bb..000000000000
--- a/stoc/source/inspect/insp.xml
+++ /dev/null
@@ -1,75 +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>   introspection.uno   </module-name>
-    <component-description>
-        <author> Juergen Schmidt </author>
-        <name>  com.sun.star.comp.stoc.Introspection    </name>
-        <description>
-    This component implements XIntrospection. The method XIntrospection::inspect(any object)
-    returns an XIntrospectionAccess that provides information about the methods, properties
-    and listeners supported by the inspected object. Matching pairs of getName/setName()
-    methods will also be offered as property "Name".
-</description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.beans.Introspection    </supported-service>
-        <service-dependency>    com.sun.star.reflection.CoreReflection  </service-dependency>
-        <type>com.sun.star.lang.DisposedException</type>
-        <type>  com.sun.star.beans.XIntrospection               </type>
-        <type>  com.sun.star.beans.XIntrospectionAccess         </type>
-        <type>  com.sun.star.beans.XPropertySet                 </type>
-        <type>  com.sun.star.beans.XFastPropertySet             </type>
-        <type>  com.sun.star.beans.XMaterialHolder              </type>
-        <type>  com.sun.star.beans.XExactName                   </type>
-        <type>  com.sun.star.beans.PropertyAttribute            </type>
-        <type>  com.sun.star.beans.PropertyConcept              </type>
-        <type>  com.sun.star.beans.MethodConcept                </type>
-        <type>  com.sun.star.lang.XEventListener                </type>
-        <type>  com.sun.star.lang.XInitialization               </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XComponent                </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory       </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.uno.DeploymentException                    </type>
-        <type>  com.sun.star.uno.XComponentContext          </type>
-        <type>  com.sun.star.container.XEnumerationAccess       </type>
-        <type>  com.sun.star.container.XNameContainer           </type>
-        <type>  com.sun.star.container.XIndexContainer          </type>
-        <type>  com.sun.star.reflection.XIdlReflection          </type>
-        <type>  com.sun.star.reflection.XIdlClass               </type>
-        <type>  com.sun.star.reflection.XIdlField2              </type>
-        <type>  com.sun.star.reflection.XIdlArray               </type>
-        <type>  com.sun.star.reflection.FieldAccessMode         </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> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
-</module-description>
diff --git a/stoc/source/invocation/inv.xml b/stoc/source/invocation/inv.xml
deleted file mode 100644
index 397be454ed57..000000000000
--- a/stoc/source/invocation/inv.xml
+++ /dev/null
@@ -1,93 +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>   invocation.uno  </module-name>
-    <component-description>
-        <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.stoc.Invocation   </name>
-        <description>
-You can construct Invocation objects through this factory service.
-Invoke createInstanceWithArguments() of XSingleServiceFactory
-to create an Invocation adapter for your object;
-invoking createInstance() will fail.
-Instances implement XInvocation to invoke methods and set/get properties at an object
-which corresponds with the object which implements this interface.
-
-There are two ways to get information about this object. First you
-can get the implemented method with XInvocation::getMethodNames()
-and the properties with XInvocation::getPropertyNames().
-Second you can get, if provided, all information about the methods and the
-properties with XInvocation::getIntrospection().
-Container access is available through the XIndexContainer,
-XNameContainer and XEnumerationContainer
-(use XInterface::queryInterface).
-</description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.script.Invocation </supported-service>
-        <service-dependency>com.sun.star.script.Converter</service-dependency>
-        <service-dependency>com.sun.star.beans.Introspection</service-dependency>
-        <service-dependency>com.sun.star.reflection.CoreReflection</service-dependency>
-        <type>  com.sun.star.script.XInvocation                 </type>
-        <type>  com.sun.star.script.XInvocation2                </type>
-        <type>  com.sun.star.script.InvocationInfo              </type>
-        <type>  com.sun.star.script.MemberType                  </type>
-        <type>  com.sun.star.script.XTypeConverter              </type>
-        <type>  com.sun.star.script.FailReason                  </type>
-        <type>  com.sun.star.beans.XIntrospection               </type>
-        <type>  com.sun.star.beans.XIntrospectionAccess         </type>
-        <type>  com.sun.star.beans.XPropertySet                 </type>
-        <type>  com.sun.star.beans.XFastPropertySet             </type>
-        <type>  com.sun.star.beans.XMaterialHolder              </type>
-        <type>  com.sun.star.beans.XExactName                   </type>
-        <type>  com.sun.star.beans.PropertyAttribute            </type>
-        <type>  com.sun.star.beans.PropertyConcept              </type>
-        <type>  com.sun.star.beans.MethodConcept                </type>
-        <type>  com.sun.star.lang.XEventListener                </type>
-        <type>  com.sun.star.lang.XInitialization               </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.lang.XMultiComponentFactory        </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory       </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.uno.DeploymentException                    </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.XComponentContext              </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.container.XEnumerationAccess       </type>
-        <type>  com.sun.star.container.XNameContainer           </type>
-        <type>  com.sun.star.container.XIndexContainer          </type>
-        <type>  com.sun.star.reflection.XIdlReflection          </type>
-        <type>  com.sun.star.reflection.XIdlClass               </type>
-        <type>  com.sun.star.reflection.XIdlArray               </type>
-        <type>  com.sun.star.reflection.FieldAccessMode         </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> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
-</module-description>
diff --git a/stoc/source/invocation_adapterfactory/invadp.xml b/stoc/source/invocation_adapterfactory/invadp.xml
deleted file mode 100644
index 9d1134f5d670..000000000000
--- a/stoc/source/invocation_adapterfactory/invadp.xml
+++ /dev/null
@@ -1,58 +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>   invocadapt.uno  </module-name>
-    <component-description>
-        <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.stoc.InvocationAdapterFactory </name>
-        <description>
-You can create adapter interfaces of any given type for an invocation
-interface by using an adapter factory instance.
-</description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.script.InvocationAdapterFactory    </supported-service>
-        <type>  com.sun.star.script.XTypeConverter      </type>
-        <type>  com.sun.star.script.XInvocationAdapterFactory       </type>
-        <type>  com.sun.star.script.XInvocationAdapterFactory2      </type>
-        <type>  com.sun.star.lang.XTypeProvider                     </type>
-        <type>  com.sun.star.lang.XServiceInfo                      </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory             </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory              </type>
-        <type>  com.sun.star.registry.XSimpleRegistry               </type>
-        <type>  com.sun.star.registry.XRegistryKey                  </type>
-        <type>  com.sun.star.uno.XAggregation                       </type>
-        <type>  com.sun.star.uno.XComponentContext          </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory       </type>
-        <type>  com.sun.star.uno.XWeak                              </type>
-        <type>  com.sun.star.uno.TypeClass                          </type>
-        <type>  com.sun.star.container.XEnumerationAccess           </type>
-        <type>  com.sun.star.container.XNameContainer               </type>
-        <type>  com.sun.star.container.XIndexContainer              </type>
-        <type>  com.sun.star.reflection.InvocationTargetException   </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> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
-</module-description>
diff --git a/stoc/source/javaloader/javaloader.xml b/stoc/source/javaloader/javaloader.xml
deleted file mode 100644
index c0603d3bf76f..000000000000
--- a/stoc/source/javaloader/javaloader.xml
+++ /dev/null
@@ -1,56 +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>   javaloader.uno  </module-name>
-    <component-description>
-        <author> Kay Ramme </author>
-        <name>  com.sun.star.comp.stoc.JavaComponentLoader  </name>
-        <description> ... </description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.loader.Java    </supported-service>
-        <supported-service> com.sun.star.loader.Java2   </supported-service>
-        <service-dependency> ... </service-dependency>
-
-        <type>  com.sun.star.java.XJavaVM                   </type>
-        <type>  com.sun.star.lang.IllegalArgumentException  </type>
-        <type>  com.sun.star.lang.XInitialization           </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory      </type>
-        <type>  com.sun.star.lang.XServiceInfo              </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory     </type>
-        <type>  com.sun.star.lang.XTypeProvider             </type>
-        <type>  com.sun.star.lang.XMultiComponentFactory    </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory   </type>
-        <type>  com.sun.star.loader.XImplementationLoader   </type>
-        <type>  com.sun.star.registry.XRegistryKey          </type>
-        <type>  com.sun.star.uno.TypeClass                  </type>
-        <type>  com.sun.star.uno.XAggregation               </type>
-        <type>  com.sun.star.uno.XWeak                      </type>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <project-build-dependency>  jvmaccess   </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
-    <runtime-module-dependency> jvmaccess3$(COM) </runtime-module-dependency>
-</module-description>
diff --git a/stoc/source/javavm/jen.xml b/stoc/source/javavm/jen.xml
deleted file mode 100644
index 0cb45977670f..000000000000
--- a/stoc/source/javavm/jen.xml
+++ /dev/null
@@ -1,87 +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>   javavm.uno  </module-name>
-    <component-description>
-        <author> Kay Ramme </author>
-        <name>  com.sun.star.comp.stoc.JavaVirtualMachine   </name>
-        <description>
-The Java VM service manages the creation of java vms.
-It takes a look at the UNO runtime and tries to find a java environment.
-If an java environment already exists, no new vm is created, instead
-the existing vm given back.
-</description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.java.JavaVirtualMachine    </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type>com.sun.star.beans.NamedValue</type>
-        <type>com.sun.star.java.XJavaThreadRegister_11</type>
-        <type>com.sun.star.uri/ExternalUriReferenceTranslator</type>
-        <type>com.sun.star.util.XMacroExpander</type>
-        <type>  com.sun.star.java.XJavaVM                       </type>
-        <type>  com.sun.star.java.XJavaVM                       </type>
-        <type>  com.sun.star.container.XNameAccess              </type>
-    <type>  com.sun.star.container.XContainer  </type>
-    <type>  com.sun.star.container.XContainerListener  </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-    <type>  com.sun.star.lang.XComponent  </type>
-    <type>  com.sun.star.lang.WrappedTargetRuntimeException  </type>
-    <type>  com.sun.star.lang.DisposedException  </type>
-    <type>  com.sun.star.lang.IllegalArgumentException  </type>
-    <type>  com.sun.star.lang.XInitialization  </type>
-        <type>  com.sun.star.registry.XSimpleRegistry           </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory                   </type>
-        <type>  com.sun.star.uno.XComponentContext                  </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.uno.XCurrentContext </type>
-    <type>  com.sun.star.beans.PropertyValue  </type>
-    <type>  com.sun.star.task.XInteractionHandler  </type>
-    <type>  com.sun.star.task.XInteractionRequest  </type>
-    <type>  com.sun.star.task.XInteractionContinuation  </type>
-    <type>  com.sun.star.task.XInteractionAbort  </type>
-    <type>  com.sun.star.task.XInteractionRetry  </type>
-    <type>  com.sun.star.java.JavaInitializationException  </type>
-    <type>  com.sun.star.java.JavaDisabledException  </type>
-    <type>  com.sun.star.java.JavaNotFoundException </type>
-    <type>  com.sun.star.java.InvalidJavaSettingsException </type>
-    <type>  com.sun.star.java.RestartRequiredException </type>
-    <type>  com.sun.star.java.JavaVMCreationFailureException  </type>
-    <type>  com.sun.star.container.XNameAccess </type>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  tools       </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <project-build-dependency>  jvmaccess   </project-build-dependency>
-    <project-build-dependency>  salhelper   </project-build-dependency>
-    <runtime-module-dependency> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> tl(COM)     </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
-    <runtime-module-dependency> jvmaccess3$(COM) </runtime-module-dependency>
-    <runtime-module-dependency> salhelper3$(COM) </runtime-module-dependency>
-</module-description>
diff --git a/stoc/source/namingservice/namingservice.xml b/stoc/source/namingservice/namingservice.xml
deleted file mode 100644
index 159d96f7ce09..000000000000
--- a/stoc/source/namingservice/namingservice.xml
+++ /dev/null
@@ -1,54 +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>   namingservice.uno   </module-name>
-    <component-description>
-        <author> Juergen Schmidt </author>
-        <name>  com.sun.star.comp.stoc.NamingService    </name>
-        <description>
-The naming service allows the registration and retrieval of objects.
-</description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.uno.NamingService  </supported-service>
-        <type>com.sun.star.lang.DisposedException</type>
-        <type>  com.sun.star.lang.XComponent                    </type>
-        <type>  com.sun.star.lang.IllegalArgumentException      </type>
-        <type>  com.sun.star.lang.XInitialization               </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory       </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XComponentContext          </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.uno.XNamingService                 </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> cppuhelper3$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu3       </runtime-module-dependency>
-    <runtime-module-dependency> sal3        </runtime-module-dependency>
-</module-description>
diff --git a/stoc/source/proxy_factory/proxyfac.xml b/stoc/source/proxy_factory/proxyfac.xml
deleted file mode 100644
index 09ae80f41056..000000000000
--- a/stoc/source/proxy_factory/proxyfac.xml
+++ /dev/null
@@ -1,54 +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>   proxyfac.uno    </module-name>
-    <component-description>
-        <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.stoc.ProxyFactory </name>
-        <description>
-Specifies a factory object to create proxy objects.
-These proxy object represent a given target object and can be
-be aggregated. The proxy objects act UNO conform and do NOT provide
-original target interfaces on queryInterface() calls.
-</description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.reflection.ProxyFactory    </supported-service>
-        <service-dependency> ... </service-dependency>
-        <type>  com.sun.star.lang.XTypeProvider                     </type>
-        <type>  com.sun.star.lang.XServiceInfo                      </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory             </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory              </type>
-        <type>  com.sun.star.registry.XSimpleRegistry               </type>
-        <type>  com.sun.star.registry.XRegistryKey                  </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory </type>
-        <type>  com.sun.star.uno.XComponentContext        </type>
-        <type>  com.sun.star.uno.XAggregation                       </type>
-        <type>  com.sun.star.uno.XWeak                              </type>
-        <type>  com.sun.star.reflection.XProxyFactory   </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> cppuhelper2$(COM)   </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-</module-description>
diff --git a/stoc/source/stocservices/stocserv.xml b/stoc/source/stocservices/stocserv.xml
deleted file mode 100644
index 6a651b39d330..000000000000
--- a/stoc/source/stocservices/stocserv.xml
+++ /dev/null
@@ -1,142 +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>   stocservices.uno    </module-name>
-    <component-description>
-        <author> Daniel Boelzle </author>
-        <name>  com.sun.star.comp.stoc.TypeConverter    </name>
-        <description>
-This service provide a widening converter. This means it can convert
-from one type to another if possible.
-</description>
-        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
-        <language>  C++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.script.Converter   </supported-service>
-        <type>  com.sun.star.reflection.FieldAccessMode         </type>
-        <type>  com.sun.star.lang.IllegalArgumentException      </type>
-        <type>  com.sun.star.lang.XEventListener                </type>
-        <type>  com.sun.star.lang.XTypeProvider                 </type>
-        <type>  com.sun.star.lang.XServiceInfo                  </type>
-        <type>  com.sun.star.lang.XSingleServiceFactory         </type>
-        <type>  com.sun.star.lang.XSingleComponentFactory           </type>
-        <type>  com.sun.star.lang.XMultiServiceFactory          </type>
-        <type>  com.sun.star.registry.XRegistryKey              </type>
-        <type>  com.sun.star.script.XTypeConverter              </type>
-        <type>  com.sun.star.script.FailReason                  </type>
-        <type>  com.sun.star.container.XSet                     </type>
-        <type>  com.sun.star.container.XNameContainer           </type>
-        <type>  com.sun.star.container.XIndexContainer          </type>
-        <type>  com.sun.star.uno.XAggregation                   </type>
-        <type>  com.sun.star.uno.XWeak                          </type>
-        <type>  com.sun.star.uno.TypeClass                      </type>
-        <type>  com.sun.star.uno.XComponentContext              </type>
-    </component-description>
-    <component-description>
-        <author>Stephan Bergmann</author>
-        <name>com.sun.star.comp.uri.ExternalUriReferenceTranslator</name>
-        <description>
-            Instances of this service translate between external and internal
-            URI references.
-        </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>C++</language>
-        <status value="under_construction"/>
-        <supported-service>
-            com.sun.star.uri.ExternalUriReferenceTranslator
-        </supported-service>
-        <type>com.sun.star.lang.WrappedTargetRuntimeException</type>
-        <type>com.sun.star.uri.RelativeUriExcessParentSegments</type>
-        <type>com.sun.star.uri.XExternalUriReferenceTranslator</type>
-        <type>com.sun.star.uri.XUriReference</type>
-        <type>com.sun.star.uri.XUriReferenceFactory</type>
-        <type>com.sun.star.uri.XUriSchemeParser</type>
-    </component-description>
-    <component-description>
-        <author>Stephan Bergmann</author>
-        <name>com.sun.star.comp.uri.UriReferenceFactory</name>
-        <description>
-            Instances of this service create URI references.
-        </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>C++</language>
-        <status value="under_construction"/>
-        <supported-service>
-            com.sun.star.uri.UriReferenceFactory
-        </supported-service>
-    </component-description>
-    <component-description>
-        <author>Stephan Bergmann</author>
-        <name>
-            com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript
-        </name>
-        <description>
-            Instances of this service parse textual representations of absolute
-            &#x201C;vnd.sun.star.script&#x201D; URLs.
-        </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>C++</language>
-        <status value="under_construction"/>
-        <supported-service>
-            com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript
-        </supported-service>
-        <type>com.sun.star.uri.XVndSunStarScriptUrlReference</type>
-    </component-description>
-    <component-description>
-        <author>Stephan Bergmann</author>
-        <name>
-            com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand
-        </name>
-        <description>
-            Instances of this service parse textual representations of absolute
-            &#x201C;vnd.sun.star.expand&#x201D; URLs.
-        </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>C++</language>
-        <status value="under_construction"/>
-        <supported-service>
-            com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand
-        </supported-service>
-        <type>com.sun.star.uri.XVndSunStarExpandUrlReference</type>
-    </component-description>
-    <component-description>
-        <author>Stephan Bergmann</author>
-        <name>com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory</name>
-        <description>
-            Instances of this service create &#x201C;vnd.sun.star.pkg&#x201D;
-            URL references.
-        </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>C++</language>
-        <status value="under_construction"/>
-        <supported-service>
-            com.sun.star.uri.VndSunStarPkgUrlReferenceFactory
-        </supported-service>
-        <type>com.sun.star.uno.DeploymentException</type>
-        <type>com.sun.star.uri.UriReferenceFactory</type>
-        <type>com.sun.star.uri.XVndSunStarPkgUrlReferenceFactory</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> cppuhelper2(COM)    </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-</module-description>