[Libreoffice-commits] .: 3 commits - extensions/Module_extensions.mk extensions/Package_bib.mk extensions/Package_pcr.mk extensions/Package_uiconfig.mk extensions/source forms/Module_forms.mk forms/Package_unotypes.mk forms/util framework/Module_framework.mk framework/Package_unotypes.mk framework/source framework/util i18npool/Library_i18npool.mk Repository.mk sax/inc sax/Library_expwrap.mk sax/Library_fastsax.mk sax/Library_sax.mk sax/Module_sax.mk sax/source sax/StaticLibrary_sax_shared.mk sw/Module_sw.mk sw/Package_misc.mk sw/util toolkit/Module_toolkit.mk toolkit/Package_util.mk toolkit/util

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Aug 24 14:26:26 PDT 2012


 Repository.mk                                |    1 
 extensions/Module_extensions.mk              |    3 
 extensions/Package_bib.mk                    |   35 -
 extensions/Package_pcr.mk                    |   35 -
 extensions/Package_uiconfig.mk               |   35 +
 extensions/source/propctrlr/pcr.xml          |  146 -----
 extensions/source/update/check/updchk.xml    |   49 -
 extensions/source/update/feed/updatefeed.xml |   49 -
 extensions/source/update/ui/updchkui.xml     |   34 -
 forms/Module_forms.mk                        |    1 
 forms/Package_unotypes.mk                    |   32 -
 forms/util/frm.xml                           |  569 --------------------
 framework/Module_framework.mk                |    1 
 framework/Package_unotypes.mk                |   24 
 framework/source/unotypes/fwk.xml            |  457 ----------------
 framework/source/unotypes/fwl.xml            |   95 ---
 framework/source/unotypes/lgd.xml            |   32 -
 framework/util/hidother.src                  |   23 
 framework/util/lgd.xml                       |   32 -
 i18npool/Library_i18npool.mk                 |   10 
 sax/Library_expwrap.mk                       |   17 
 sax/Library_fastsax.mk                       |   18 
 sax/Library_sax.mk                           |   13 
 sax/Module_sax.mk                            |    1 
 sax/StaticLibrary_sax_shared.mk              |   23 
 sax/inc/fastserializer.hxx                   |  202 +++++++
 sax/inc/sax/tools/attributemap.hxx           |   62 --
 sax/inc/sax/tools/saxobject.hxx              |   44 -
 sax/inc/sax/tools/tokenmap.hxx               |   58 --
 sax/inc/xml2utf.hxx                          |   14 
 sax/source/expatwrap/attrlistimpl.hxx        |    2 
 sax/source/fastparser/facreg.cxx             |    2 
 sax/source/tools/fastserializer.cxx          |    2 
 sax/source/tools/fastserializer.hxx          |  202 -------
 sax/source/tools/fshelper.cxx                |    2 
 sw/Module_sw.mk                              |    1 
 sw/Package_misc.mk                           |   24 
 sw/util/hidother.src                         |  365 -------------
 toolkit/Module_toolkit.mk                    |    1 
 toolkit/Package_util.mk                      |   23 
 toolkit/util/toolkit.xml                     |  750 ---------------------------
 41 files changed, 302 insertions(+), 3187 deletions(-)

New commits:
commit f8fd2e6a3b21ec3899a74d7400cafaba4e83ff6c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Aug 24 17:40:07 2012 +0200

    better dependency working also for libmerged
    
    Change-Id: I3c5cf65bee50ec0511031b50e1b9f5589491e6bd

diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 6d3eead..bdd0fd6 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -159,10 +159,10 @@ $(eval $(call gb_Library_add_generated_cobjects,i18npool,\
 # i18npool dlopens localedata_* libraries.
 # This is runtime dependency to prevent tests
 # to be run sooner then localedata_* exists.
-$(call gb_Library_get_target,i18npool) : | \
-	$(call gb_Library_get_target,localedata_en) \
-	$(call gb_Library_get_target,localedata_es) \
-	$(call gb_Library_get_target,localedata_euro) \
-	$(call gb_Library_get_target,localedata_others) \
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,i18npool)) :| \
+	$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,localedata_en)) \
+	$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,localedata_es)) \
+	$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,localedata_euro)) \
+	$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,localedata_others)) \
 
 # vim: set noet sw=4 ts=4:
commit 9ec8d331dc593c14beff4fc3939a71bf4825cfcc
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Aug 23 15:13:19 2012 +0200

    kill more unneeded stuff; rename uiconfig Packages
    
    Change-Id: Ib2f73d679ac4a6164142a370ce6d55c6de41117c

diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index dba2d30..0f7b6f1 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -51,8 +51,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
 	Library_bib \
 	Library_dbp \
 	Library_pcr \
-	Package_bib \
-	Package_pcr \
+	Package_uiconfig \
 ))
 endif
 
diff --git a/extensions/Package_bib.mk b/extensions/Package_bib.mk
deleted file mode 100644
index 5b7eb77..0000000
--- a/extensions/Package_bib.mk
+++ /dev/null
@@ -1,35 +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.
-#
-# The Initial Developer of the Original Code is
-# 	Peter Foley <pefoley2 at verizon.net>
-# 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,bib,$(SRCDIR)/extensions/source/bibliography/uiconfig/sbibliography/menubar))
-
-$(eval $(call gb_Package_add_file,bib,xml/uiconfig/modules/sbibliography/menubar/menubar.xml,menubar.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Package_pcr.mk b/extensions/Package_pcr.mk
deleted file mode 100644
index 48f4630..0000000
--- a/extensions/Package_pcr.mk
+++ /dev/null
@@ -1,35 +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.
-#
-# The Initial Developer of the Original Code is
-# 	Peter Foley <pefoley2 at verizon.net>
-# 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,pcr,$(SRCDIR)/extensions/source/propctrlr))
-
-$(eval $(call gb_Package_add_file,pcr,xml/pcr.xml,pcr.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Package_uiconfig.mk b/extensions/Package_uiconfig.mk
new file mode 100644
index 0000000..33e63b2
--- /dev/null
+++ b/extensions/Package_uiconfig.mk
@@ -0,0 +1,35 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2 at verizon.net>
+# 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,extensions_uiconfig,$(SRCDIR)/extensions/source/bibliography/uiconfig/sbibliography/menubar))
+
+$(eval $(call gb_Package_add_file,extensions_uiconfig,xml/uiconfig/modules/sbibliography/menubar/menubar.xml,menubar.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/source/propctrlr/pcr.xml b/extensions/source/propctrlr/pcr.xml
deleted file mode 100644
index abd8657..0000000
--- a/extensions/source/propctrlr/pcr.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description SYSTEM "module-description.dtd">
-<module-description>
-  <module-name>pcr</module-name>
-
-  <component-description>
-    <author>Frank Schönheit</author>
-    <name>org.openoffice.comp.form.ui.OTabOrderDialog</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="non-published"/>
-    <supported-service>com.sun.star.form.ui.TabOrderDialog</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Schönheit</author>
-    <name>org.openoffice.comp.form.ControlFontDialog</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="non-published"/>
-    <supported-service>com.sun.star.form.ui.TabOrderDialog</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Schönheit</author>
-    <name>com.sun.star.comp.extensions.FormComponentPropertyHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="non-published"/>
-    <supported-service>com.sun.star.form.inspection.FormComponentPropertyHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Schönheit</author>
-    <name>com.sun.star.comp.extensions.EFormsPropertyHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.inspection.XMLFormsPropertyHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Schönheit</author>
-    <name>com.sun.star.comp.extensions.EditPropertyHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.inspection.EditPropertyHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Schönheit</author>
-    <name>org.openoffice.comp.extensions.ObjectInspector</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.inspection.ObjectInspector</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Schönheit</author>
-    <name>org.openoffice.comp.extensions.ObjectInspectorModel</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.inspection.ObjectInspectorModel</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Schönheit</author>
-    <name>org.openoffice.comp.extensions.FormController</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.PropertyBrowserController</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Schönheit</author>
-    <name>com.sun.star.comp.extensions.GenericPropertyHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.inspection.GenericPropertyHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Schönheit</author>
-    <name>com.sun.star.comp.extensions.EventHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.inspection.EventHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Schönheit</author>
-    <name>com.sun.star.comp.extensions.XSDValidationPropertyHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.inspection.XSDValidationPropertyHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Schönheit</author>
-    <name>com.sun.star.comp.extensions.CellBindingPropertyHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.inspection.CellBindingPropertyHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Schönheit</author>
-    <name>com.sun.star.comp.extensions.ButtonNavigationHandler</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.inspection.ButtonNavigationHandler</supported-service>
-  </component-description>
-
-  <component-description>
-    <author>Frank Schönheit</author>
-    <name>com.sun.star.comp.extensions.DefaultFormComponentInspectorModel</name>
-    <description></description>
-    <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-    <language>c++</language>
-    <status value="beta"/>
-    <supported-service>com.sun.star.form.inspection.DefaultFormComponentInspectorModel</supported-service>
-  </component-description>
-
-</module-description>
diff --git a/extensions/source/update/check/updchk.xml b/extensions/source/update/check/updchk.xml
deleted file mode 100644
index 25d5d36..0000000
--- a/extensions/source/update/check/updchk.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>updchk</module-name>
-    <component-description>
-        <author> Oliver Braun </author>
-        <name>vnd.sun.UpdateCheck</name>
-        <description> The  </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.setup.UpdateCheck</supported-service>
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.beans.NamedValue</type>
-        <type>com.sun.star.beans.PropertyValue</type>
-        <type>com.sun.star.container.XNameReplace</type>
-        <type>com.sun.star.deployment.UpdateInformationProvider</type>
-        <type>com.sun.star.frame.DispatchResultEvent</type>
-        <type>com.sun.star.frame.DispatchResultState</type>
-        <type>com.sun.star.frame.XFrame</type>
-        <type>com.sun.star.io.XInputStream</type>
-        <type>com.sun.star.io.XOutputStream</type>
-        <type>com.sun.star.lang.XComponent</type>
-        <type>com.sun.star.lang.XMultiComponentFactory</type>
-        <type>com.sun.star.lang.XMultiServiceFactory</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.XTypeProvider</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-        <type>com.sun.star.system.SystemShellExecuteFlags</type>
-        <type>com.sun.star.system.XSystemShellExecute</type>
-        <type>com.sun.star.task.XInteractionHandler</type>
-        <type>com.sun.star.task.XJob</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.uno.XCurrentContext</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.util.XChangesBatch</type>
-        <type>com.sun.star.xml.xpath.XXPathAPI</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/extensions/source/update/feed/updatefeed.xml b/extensions/source/update/feed/updatefeed.xml
deleted file mode 100644
index 1b0557d..0000000
--- a/extensions/source/update/feed/updatefeed.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>updatefeed</module-name>
-    <component-description>
-        <author> Oliver Braun </author>
-        <name>vnd.sun.UpdateCheck</name>
-        <description> The  </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.deployment.UpdateInformationProvider</supported-service>
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.beans.NamedValue</type>
-        <type>com.sun.star.beans.PropertyValue</type>
-        <type>com.sun.star.container.XNameReplace</type>
-        <type>com.sun.star.deployment.UpdateInformationProvider</type>
-        <type>com.sun.star.io.XInputStream</type>
-        <type>com.sun.star.io.XOutputStream</type>
-        <type>com.sun.star.lang.XComponent</type>
-        <type>com.sun.star.lang.XInitialization</type>
-        <type>com.sun.star.lang.XMultiComponentFactory</type>
-        <type>com.sun.star.lang.XMultiServiceFactory</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.XTypeProvider</type>
-        <type>com.sun.star.registry.XRegistryKey</type>
-        <type>com.sun.star.task.XInteractionHandler</type>
-        <type>com.sun.star.ucb.PostCommandArgument2</type>
-        <type>com.sun.star.ucb.XCommandEnvironment</type>
-        <type>com.sun.star.ucb.XCommandProcessor2</type>
-        <type>com.sun.star.ucb.XContentIdentifierFactory</type>
-        <type>com.sun.star.ucb.XContentProvider</type>
-        <type>com.sun.star.ucb.XProgressHandler</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.uno.XCurrentContext</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.util.XChangesBatch</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/extensions/source/update/ui/updchkui.xml b/extensions/source/update/ui/updchkui.xml
deleted file mode 100644
index a9005d8..0000000
--- a/extensions/source/update/ui/updchkui.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>updchkui</module-name>
-    <component-description>
-        <author> Oliver Braun </author>
-        <name>vnd.sun.UpdateCheck</name>
-        <description> The  </description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="beta"/>
-        <supported-service>com.sun.star.setup.UpdateCheckUI</supported-service>
-        <service-dependency>...</service-dependency>
-        <type>com.sun.star.document.XEventBroadcaster</type>
-        <type>com.sun.star.document.XEventListener</type>
-        <type>com.sun.star.lang.XEventListener</type>
-        <type>com.sun.star.lang.XMultiComponentFactory</type>
-        <type>com.sun.star.lang.XServiceInfo</type>
-        <type>com.sun.star.lang.XSingleComponentFactory</type>
-        <type>com.sun.star.lang.XTypeProvider</type>
-        <type>com.sun.star.uno.TypeClass</type>
-        <type>com.sun.star.uno.XAggregation</type>
-        <type>com.sun.star.uno.XComponentContext</type>
-        <type>com.sun.star.uno.XCurrentContext</type>
-        <type>com.sun.star.uno.XWeak</type>
-        <type>com.sun.star.registry.XRegistryKey</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/forms/Module_forms.mk b/forms/Module_forms.mk
index 4f5e99e..7480767 100644
--- a/forms/Module_forms.mk
+++ b/forms/Module_forms.mk
@@ -32,7 +32,6 @@ ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,forms,\
     AllLangResTarget_frm \
     Library_frm \
-    Package_unotypes \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\
diff --git a/forms/Package_unotypes.mk b/forms/Package_unotypes.mk
deleted file mode 100644
index 6c4ff89..0000000
--- a/forms/Package_unotypes.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) 2010 Red Hat, Inc., David Tardon <dtardon at 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_Package_Package,forms_unotypes,$(SRCDIR)/forms/util))
-
-$(eval $(call gb_Package_add_file,forms_unotypes,xml/frm.xml,frm.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/forms/util/frm.xml b/forms/util/frm.xml
deleted file mode 100644
index e44e4fa..0000000
--- a/forms/util/frm.xml
+++ /dev/null
@@ -1,569 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description SYSTEM "module-description.dtd">
-<module-description>
-    <module-name>forms</module-name>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OFormsCollection</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.Forms</supported-service>
-        <supported-service>com.sun.star.form.FormComponents</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.ODatabaseForm</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormComponents</supported-service>
-        <supported-service>com.sun.star.form.component.Form</supported-service>
-        <supported-service>com.sun.star.form.component.HTMLForm</supported-service>
-        <supported-service>com.sun.star.form.component.DataForm</supported-service>
-        <supported-service>com.sun.star.sdb.RowSet</supported-service>
-        <supported-service>com.sun.star.sdbc.RowSet</supported-service>
-        <supported-service>com.sun.star.sdb.ResultSet</supported-service>
-        <supported-service>com.sun.star.sdbcx.ResultSet</supported-service>
-        <supported-service>com.sun.star.sdbc.ResultSet</supported-service>
-        <service-dependency>com.sun.star.util.URLTransformer</service-dependency>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OFixedTextModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.component.FixedText</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlFixedTextModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OHiddenModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.component.HiddenControl</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OFileControlModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.component.FileControl</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlFileControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OGroupBoxModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.component.GroupBox</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlGroupBoxModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OImageButtonModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.component.ImageButton</supported-service>
-        <supported-service>com.sun.star.form.component.SubmitButton</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlImageControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OButtonModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.component.CommandButton</supported-service>
-        <supported-service>com.sun.star.form.component.SubmitButton</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlButtonModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OGridControlModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.component.GridControl</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.ORadioButtonModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.binding.BindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableBindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDatabaseRadioButton</supported-service>
-        <supported-service>com.sun.star.form.component.DatabaseRadioButton</supported-service>
-        <supported-service>com.sun.star.form.component.RadioButton</supported-service>
-        <supported-service>com.sun.star.form.DataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlRadioButtonModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OCheckBoxModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.binding.BindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableBindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDatabaseCheckBox</supported-service>
-        <supported-service>com.sun.star.form.component.DatabaseCheckBox</supported-service>
-        <supported-service>com.sun.star.form.component.CheckBox</supported-service>
-        <supported-service>com.sun.star.form.DataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlCheckBoxModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OComboBoxModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.binding.BindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableBindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDatabaseComboBox</supported-service>
-        <supported-service>com.sun.star.form.component.DatabaseComboBox</supported-service>
-        <supported-service>com.sun.star.form.component.ComboBox</supported-service>
-        <supported-service>com.sun.star.form.DataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlComboBoxModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-        <service-dependency>com.sun.star.util.NumberFormatter</service-dependency>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OListBoxModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.binding.BindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableBindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDatabaseListBox</supported-service>
-        <supported-service>com.sun.star.form.component.DatabaseListBox</supported-service>
-        <supported-service>com.sun.star.form.component.ListBox</supported-service>
-        <supported-service>com.sun.star.form.DataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlListBoxModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-        <service-dependency>com.sun.star.util.NumberFormatter</service-dependency>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OEditModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.binding.BindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableBindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDatabaseTextField</supported-service>
-        <supported-service>com.sun.star.form.component.DatabaseTextField</supported-service>
-        <supported-service>com.sun.star.form.component.TextField</supported-service>
-        <supported-service>com.sun.star.form.DataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlEditModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-        <service-dependency>com.sun.star.util.NumberFormatter</service-dependency>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.ODateModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.binding.BindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableBindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDatabaseDateField</supported-service>
-        <supported-service>com.sun.star.form.component.DatabaseDateField</supported-service>
-        <supported-service>com.sun.star.form.component.DateField</supported-service>
-        <supported-service>com.sun.star.form.DataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlDateFieldModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OTimeModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.binding.BindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableBindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDatabaseTimeField</supported-service>
-        <supported-service>com.sun.star.form.component.DatabaseTimeField</supported-service>
-        <supported-service>com.sun.star.form.component.TimeField</supported-service>
-        <supported-service>com.sun.star.form.DataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlTimeFieldModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.ONumericModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.binding.BindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableBindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDatabaseNumericField</supported-service>
-        <supported-service>com.sun.star.form.component.DatabaseNumericField</supported-service>
-        <supported-service>com.sun.star.form.component.NumericField</supported-service>
-        <supported-service>com.sun.star.form.DataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlNumericFieldModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OCurrencyModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.validation.ValidatableControlModel</supported-service>
-        <supported-service>com.sun.star.form.component.DatabaseCurrencyField</supported-service>
-        <supported-service>com.sun.star.form.component.CurrencyField</supported-service>
-        <supported-service>com.sun.star.form.DataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlCurrencyFieldModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OPatternModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.component.DatabasePatternField</supported-service>
-        <supported-service>com.sun.star.form.component.PatternField</supported-service>
-        <supported-service>com.sun.star.form.DataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlPatternFieldModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OImageControlModel</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.component.DatabaseImageControl</supported-service>
-        <supported-service>com.sun.star.form.DataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlImageControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author>Frank Schoenheit</author>
-        <name>com.sun.star.comp.forms.OFormattedFieldWrapper</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.binding.BindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableControlModel</supported-service>
-        <supported-service>com.sun.star.form.validation.ValidatableBindableControlModel</supported-service>
-        <supported-service>com.sun.star.form.binding.BindableDatabaseFormattedField</supported-service>
-        <supported-service>com.sun.star.form.component.DatabaseFormattedField</supported-service>
-        <supported-service>com.sun.star.form.component.FormattedField</supported-service>
-        <supported-service>com.sun.star.form.DataAwareControlModel</supported-service>
-        <supported-service>com.sun.star.form.FormComponent</supported-service>
-        <supported-service>com.sun.star.form.FormControlModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlFormattedFieldModel</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.ORadioButtonControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.RadioButton</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlRadioButton</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OCheckBoxControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.CheckBox</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlCheckBox</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OGroupBoxControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.GroupBox</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlGroupBox</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OListBoxControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.ListBox</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlListBox</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OComboBoxControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.ComboBox</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlComboBox</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OEditControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.TextField</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlEdit</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.ODateControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.DateField</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlDateField</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OTimeControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.TimeField</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlTimeField</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.ONumericControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.NumericField</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlNumericField</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OCurrencyControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.CurrencyField</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlCurrencyField</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OPatternControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.PatternField</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlPatternField</supported-service>
-    </component-description>
-    <component-description>
-        <author>Frank Schoenheit</author>
-        <name>com.sun.star.comp.forms.OFormattedControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.FormattedField</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlFormattedField</supported-service>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OButtonControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.CommandButton</supported-service>
-        <supported-service>com.sun.star.form.control.SubmitButton</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlButton</supported-service>
-        <service-dependency>com.sun.star.util.URLTransformer</service-dependency>
-        <service-dependency>com.sun.star.awt.Pointer</service-dependency>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OImageButtonControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.ImageButton</supported-service>
-        <supported-service>com.sun.star.form.control.SubmitButton</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlImageControl</supported-service>
-        <service-dependency>com.sun.star.util.URLTransformer</service-dependency>
-        <service-dependency>com.sun.star.awt.Pointer</service-dependency>
-    </component-description>
-    <component-description>
-        <author></author>
-        <name>com.sun.star.comp.forms.OImageControlControl</name>
-        <description></description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.ImageControl</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlImageControl</supported-service>
-    </component-description>
-    <component-description>
-        <author>Frank Schönheit</author>
-        <name>com.sun.star.comp.forms.OScrollBarModel</name>
-        <description>specifies the model of a scroll bar control which can exist in a form layer.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.component.ScrollBar</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlScrollBarModel</supported-service>
-    </component-description>
-    <component-description>
-        <author>Frank Schönheit</author>
-        <name>com.sun.star.comp.forms.OSpinButtonModel</name>
-        <description>specifies the model of a spin button control which can exist in a form layer.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.component.SpinButton</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlSpinButtonModel</supported-service>
-    </component-description>
-    <component-description>
-        <author>Frank Schönheit</author>
-        <name>com.sun.star.comp.form.ONavigationBarModel</name>
-        <description>specifies the model of a control which provides navigation and other form controller related functionality.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.component.NavigationToolBar</supported-service>
-        <supported-service>com.sun.star.awt.UnoControlModel</supported-service>
-    </component-description>
-    <component-description>
-        <author>Frank Schönheit</author>
-        <name>com.sun.star.comp.form.ONavigationBarControl</name>
-        <description>specifies a control which provides navigation and other form controller related functionality.</description>
-        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
-        <language>c++</language>
-        <status value="final"/>
-        <supported-service>com.sun.star.form.control.NavigationToolBar</supported-service>
-        <supported-service>com.sun.star.awt.UnoControl</supported-service>
-    </component-description>
-    <project-build-dependency>sal</project-build-dependency>
-    <project-build-dependency>osl</project-build-dependency>
-    <project-build-dependency>one</project-build-dependency>
-    <project-build-dependency>cppu</project-build-dependency>
-    <project-build-dependency>cppuhelper</project-build-dependency>
-    <project-build-dependency>tools</project-build-dependency>
-    <project-build-dependency>vcl</project-build-dependency>
-    <project-build-dependency>svtool</project-build-dependency>
-    <project-build-dependency>sfx2</project-build-dependency>
-    <project-build-dependency>unotools</project-build-dependency>
-    <project-build-dependency>toolkit</project-build-dependency>
-    <runtime-module-dependency>sal</runtime-module-dependency>
-    <runtime-module-dependency>osl</runtime-module-dependency>
-    <runtime-module-dependency>one</runtime-module-dependency>
-    <runtime-module-dependency>cppu</runtime-module-dependency>
-    <runtime-module-dependency>cppuhelper</runtime-module-dependency>
-    <runtime-module-dependency>tools</runtime-module-dependency>
-    <runtime-module-dependency>vcl</runtime-module-dependency>
-    <runtime-module-dependency>svtool</runtime-module-dependency>
-    <runtime-module-dependency>sfx2</runtime-module-dependency>
-    <runtime-module-dependency>unotools</runtime-module-dependency>
-    <runtime-module-dependency>toolkit</runtime-module-dependency>
-</module-description>
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
index 52f7ae7..1e885da 100644
--- a/framework/Module_framework.mk
+++ b/framework/Module_framework.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Module_add_targets,framework,\
     Package_dtd \
     Package_inc \
     Package_uiconfig \
-    Package_unotypes \
 ))
 
 ifeq ($(ENABLE_LOMENUBAR),TRUE)
diff --git a/framework/Package_unotypes.mk b/framework/Package_unotypes.mk
deleted file mode 100644
index 5d82d78..0000000
--- a/framework/Package_unotypes.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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 .
-#
-
-$(eval $(call gb_Package_Package,framework_unotypes,$(SRCDIR)/framework/source/unotypes))
-$(eval $(call gb_Package_add_file,framework_unotypes,xml/fwk.xml,fwk.xml))
-$(eval $(call gb_Package_add_file,framework_unotypes,xml/fwl.xml,fwl.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/framework/source/unotypes/fwk.xml b/framework/source/unotypes/fwk.xml
deleted file mode 100644
index 069979e..0000000
--- a/framework/source/unotypes/fwk.xml
+++ /dev/null
@@ -1,457 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-
-     <module-name> fwk </module-name>
-
-     <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.Frame </name>
-        <description>
-            A frame support influencing of his subtree, find of subframes, activate- and deactivate-mechanism as well as
-            set/get of a frame window, component or controller.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.Frame </supported-service>
-     </component-description>
-
-     <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.Desktop </name>
-        <description>
-            A desktop environment contains tasks with one or more frames in which components can be loaded.
-            The desktop himself is the root of the frame hierarchy.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.Desktop </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.URLTransformer </name>
-     <description>
-        Helps to split up a string containing a URL into its
-        structural parts and assembles the parts into a single string.
-        </description>
-     <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-     <language> c++ </language>
-     <status value="final"/>
-     <supported-service> com.sun.star.util.URLTransformer </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.JobExecutor </name>
-        <description>
-            It implements a generic job execution service, which can start
-            registered uno services on triggered events, control her lifetime
-            and handle there own configuration.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.task.JobExecutor </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.DispatchRecorderSupplier </name>
-        <description>
-            This supplier is available on the servcice Frame as property "DispatchRecorderSupplier".
-            It provides access on the currently set DispatchRecorder of this Frame
-            and some additional functionality to make macro recording easy.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.DispatchRecorderSupplier </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.DispatchRecorder </name>
-        <description>
-            Implements a recorder object which can record XDIspatch::dispatch() calls
-            and generate basic script code from that.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.DispatchRecorder </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.MailToDispatcher </name>
-        <description>
-            It's a dispatch object which can handle "mailto:" URLs.
-            This service is registered in configuration for this protocol
-            and wil be used automaticly by the generic dispatch implementation
-            of a Frame. It should start an external mail application and forward
-            this request to it.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.ProtocolHandler </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.ServiceHandler </name>
-        <description>
-            It's a special dispatch object which is registered for "service:*" URL pattern
-            and will be automaticly used by the framework dispatch mechanism if such URL occurred.
-            His job is to create any registered uno components which must be coded inside
-            dispatched URL (may with some optional given parameters). After that such created
-            service must be hold his self alive. Such mechanism can be usefull for UI components
-            (e.g. Dialogs, Wizards) only.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.ProtocolHandler </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.JobHandler </name>
-        <description>
-            It's a special dispatch object which is registered for "vnd.sun.star.job:*" URL pattern
-            and will be automaticly used by the framework dispatch mechanism if such URL occurred.
-            It binds the dispatch mechanism to the generic job execution of this framework module.
-            That can be used for e.g. addon purposes.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.ProtocolHandler </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.LayoutManager </name>
-        <description>
-            Controls the layout of user interface elements which are part of a frame.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.LayoutManager </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.PopupMenuControllerFactory </name>
-        <description>
-            A factory manager that creates instances of registered popup menu controller.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.PopupMenuControllerFactory </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.FontMenuController </name>
-        <description>
-            A popup menu controller which controls the font popup menu.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.PopupMenuController </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.FontSizeMenuController </name>
-        <description>
-            A popup menu controller which controls the font size popup menu.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.PopupMenuController </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.ObjectMenuController </name>
-        <description>
-            A popup menu controller which controls the object popup menu.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.PopupMenuController </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.HeaderMenuController </name>
-        <description>
-            A popup menu controller which controls the header popup menu.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.PopupMenuController </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.FooterMenuController </name>
-        <description>
-            A popup menu controller which controls the footer popup menu.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.PopupMenuController </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.ControlMenuController </name>
-        <description>
-            A popup menu controller which controls the control popup menu.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.PopupMenuController </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.ToolBarsMenuController </name>
-        <description>
-            A popup menu controller which makes certain toolbars available to
-        the user. It supports to show/hide toolbars.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.PopupMenuController </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Duncan Foster </author>
-        <name> com.sun.star.comp.framework.MacrosMenuController </name>
-        <description>
-            A popup menu controller which controls the scripts/macros popup menu.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.PopupMenuController </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.UICommandDescription </name>
-        <description>
-            A manager that holds all user interface commands and their description, the menu label
-            of every registered OpenOffice.org module.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.ui.UICommandDescription </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.UIElementFactoryManager </name>
-        <description>
-            A user interface factory manager that controls all registered user interface element factories.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.ui.UIElementFactoryManager </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.ModuleManager </name>
-        <description>
-            Manages the access to OpenOffice.org module specific informations.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.ModuleManager </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.UIConfigurationManager </name>
-        <description>
-            Manages the user interface element settings of a single storage element, like documents or
-            a single user interface configuration file.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.ui.UIConfigurationManager </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier </name>
-        <description>
-            Central manager that provides access to the OpenOffice.org module user interface
-            configuration managers.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.ui.ModuleUIConfigurationManagerSupplier </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.ModuleUIConfigurationManager </name>
-        <description>
-            A single OpenOffice.org module user interface configuration manager. It is responsible to provide
-            access to the user interface element settings of an OpenOffice.org module. Must be obtained from
-            the ModuleUIConfigurationManagerSupplier otherwise it is not correctly initialized.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.ui.ModuleUIConfigurationManager </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.MenuBarFactory </name>
-        <description>
-            Creates menu bars that can be used the user interface configuration API.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.ui.UIElementFactory </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.UIConfigurationManager </name>
-        <description>
-            Manages the user interface element settings of a single storage element, like documents or
-            a single user interface configuration file.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.ui.UIConfigurationManager </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.BackingComp </name>
-        <description>
-            The start module component.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.StartModule </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.UICategoryDescription </name>
-        <description>
-            Description about categories of user interface commands.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.ui.UICategoryDescription </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.ToolBarFactory </name>
-        <description>
-            A factory to create toolbar instances.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.ui.ToolBarFactory </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.ToolBarControllerFactory </name>
-        <description>
-            A factory to create registered toolbar bar controller.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.ToolBarControllerFactory </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.StatusbarFactory </name>
-        <description>
-            A factory to create registered status bar controller.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.ui.StatusbarFactory </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.StatusbarControllerFactory </name>
-        <description>
-            A factory to create registered status bar controller.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.StatusbarControllerFactory </supported-service>
-    </component-description>
-
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <project-build-dependency>  tools       </project-build-dependency>
-    <project-build-dependency>  svtools     </project-build-dependency>
-    <project-build-dependency>  toolkit     </project-build-dependency>
-    <project-build-dependency>  sv          </project-build-dependency>
-    <project-build-dependency>  comphelper  </project-build-dependency>
-    <project-build-dependency>  unotools    </project-build-dependency>
-    <project-build-dependency>  ucbhelper   </project-build-dependency>
-    <project-build-dependency>  svl         </project-build-dependency>
-    <project-build-dependency>  sot         </project-build-dependency>
-
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-    <runtime-module-dependency> tl          </runtime-module-dependency>
-    <runtime-module-dependency> svt         </runtime-module-dependency>
-    <runtime-module-dependency> svl         </runtime-module-dependency>
-    <runtime-module-dependency> tk          </runtime-module-dependency>
-    <runtime-module-dependency> sv          </runtime-module-dependency>
-    <runtime-module-dependency> comphelp2   </runtime-module-dependency>
-    <runtime-module-dependency> utl         </runtime-module-dependency>
-    <runtime-module-dependency> ucb         </runtime-module-dependency>
-    <runtime-module-dependency> sot         </runtime-module-dependency>
-
-</module-description>
diff --git a/framework/source/unotypes/fwl.xml b/framework/source/unotypes/fwl.xml
deleted file mode 100644
index 823d520..0000000
--- a/framework/source/unotypes/fwl.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">
-
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-
-    <module-name> fwl </module-name>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.TypeDetection </name>
-        <description>
-            Supports a type detection of a specified resource (document).
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.document.TypeDetection </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.FilterFactory </name>
-        <description>
-            Supports creation and getting informations about registered filter services.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.document.FilterFactory </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.FrameLoaderFactory </name>
-        <description>
-            Supports creation and getting informations about registered frame loader services.
-            These services could load a component into a frame.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.FrameLoaderFactory </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.ContentHandlerFactory </name>
-        <description>
-            Supports creation and getting informations about registered content handler services.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.frame.ContentHandlerFactory </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.SubstituteVariables </name>
-        <description>
-            Supports the substitution and resubstitution of path and language variables.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.util.PathSubstitution </supported-service>
-    </component-description>
-
-    <component-description>
-        <author> Carsten Driesner </author>
-        <name> com.sun.star.comp.framework.PathSettings </name>
-        <description>
-            Supports the access to the Office internal path settings.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.util.PathSettings </supported-service>
-    </component-description>
-
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  comphelper  </project-build-dependency>
-    <project-build-dependency>  tools       </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <project-build-dependency>  svl         </project-build-dependency>
-
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> comphelp2   </runtime-module-dependency>
-    <runtime-module-dependency> tl          </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-    <runtime-module-dependency> svl         </runtime-module-dependency>
-
-</module-description>
diff --git a/framework/source/unotypes/lgd.xml b/framework/source/unotypes/lgd.xml
deleted file mode 100644
index 3a7e697..0000000
--- a/framework/source/unotypes/lgd.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-
-    <module-name> lgd </module-name>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.LoginDialog </name>
-        <description>
-            Implement a dialog for login to a sun one webtop server.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.comp.framework.LoginDialog </supported-service>
-    </component-description>
-
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <project-build-dependency>  sv          </project-build-dependency>
-    <project-build-dependency>  tools       </project-build-dependency>
-
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-    <runtime-module-dependency> tl          </runtime-module-dependency>
-    <runtime-module-dependency> sv          </runtime-module-dependency>
-
-</module-description>
diff --git a/framework/util/hidother.src b/framework/util/hidother.src
deleted file mode 100644
index 268892e..0000000
--- a/framework/util/hidother.src
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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 .
- */
-
-#include "../inc/helpid.hrc"         // HID_XXX
-
-hidspecial HID_BACKINGWINDOW    { HelpID = HID_BACKINGWINDOW; };
-hidspecial HID_LICENSEDIALOG    { HelpID = HID_LICENSEDIALOG; };
-hidspecial HID_STATUSBAR        { HelpID = HID_STATUSBAR; };
diff --git a/framework/util/lgd.xml b/framework/util/lgd.xml
deleted file mode 100644
index 3a7e697..0000000
--- a/framework/util/lgd.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-
-    <module-name> lgd </module-name>
-
-    <component-description>
-        <author> Andreas Schluens </author>
-        <name> com.sun.star.comp.framework.LoginDialog </name>
-        <description>
-            Implement a dialog for login to a sun one webtop server.
-        </description>
-        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
-        <language> c++ </language>
-        <status value="final"/>
-        <supported-service> com.sun.star.comp.framework.LoginDialog </supported-service>
-    </component-description>
-
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
-    <project-build-dependency>  sv          </project-build-dependency>
-    <project-build-dependency>  tools       </project-build-dependency>
-
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-    <runtime-module-dependency> tl          </runtime-module-dependency>
-    <runtime-module-dependency> sv          </runtime-module-dependency>
-
-</module-description>
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 2e9fd2d..2e3ffbf 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_targets,sw,\
     Library_sw \
     Library_swd \
     Library_swui \
-    Package_misc \
     Package_uiconfig \
 ))
 
diff --git a/sw/Package_misc.mk b/sw/Package_misc.mk
deleted file mode 100644
index cee4bd1..0000000
--- a/sw/Package_misc.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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 .
-#
-
-$(eval $(call gb_Package_Package,sw_misc,$(SRCDIR)/sw/misc))
-# TODO: 
-#COPY sw/unxlngx6.pro/misc/swslots_sid.hid unxlngx6.pro/bin/hid/swslots_sid.hid
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/util/hidother.src b/sw/util/hidother.src
deleted file mode 100644
index c17077b..0000000
--- a/sw/util/hidother.src
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * 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 .
- */
-#include "../inc/helpid.h"          // HID_FUNC_XXX
-
-//  Help-IDs fuer Dokument-Fenster
-hidspecial HID_EDIT_WIN         { HelpID = HID_EDIT_WIN; };
-
-// drei fuer den Formedtdialog
-hidspecial HID_FORMEDT_CONTENT  { HelpID = HID_FORMEDT_CONTENT; };
-hidspecial HID_FORMEDT_USER     { HelpID = HID_FORMEDT_USER; };
-hidspecial HID_FORMEDT_INDEX    { HelpID = HID_FORMEDT_INDEX; };
-
-// Wizards
-hidspecial HID_FAX_PAGE1        { HelpId = HID_FAX_PAGE1; };
-hidspecial HID_FAX_PAGE2        { HelpId = HID_FAX_PAGE2; };
-hidspecial HID_FAX_PAGE3        { HelpId = HID_FAX_PAGE3; };
-hidspecial HID_FAX_PAGE4        { HelpId = HID_FAX_PAGE4; };
-hidspecial HID_FAX_PAGE5        { HelpId = HID_FAX_PAGE5; };
-hidspecial HID_FAX_PAGE6        { HelpId = HID_FAX_PAGE6; };
-hidspecial HID_FAX_PAGE7        { HelpId = HID_FAX_PAGE7; };
-hidspecial HID_FAX_PAGE8        { HelpId = HID_FAX_PAGE8; };
-hidspecial HID_LETTER_PAGE1     { HelpId = HID_LETTER_PAGE1; };
-hidspecial HID_LETTER_PAGE2     { HelpId = HID_LETTER_PAGE2; };
-hidspecial HID_LETTER_PAGE3     { HelpId = HID_LETTER_PAGE3; };
-hidspecial HID_LETTER_PAGE4     { HelpId = HID_LETTER_PAGE4; };
-hidspecial HID_LETTER_PAGE5     { HelpId = HID_LETTER_PAGE5; };
-hidspecial HID_LETTER_PAGE6     { HelpId = HID_LETTER_PAGE6; };
-hidspecial HID_LETTER_PAGE7     { HelpId = HID_LETTER_PAGE7; };
-hidspecial HID_LETTER_PAGE8     { HelpId = HID_LETTER_PAGE8; };
-hidspecial HID_LETTER_PAGE9     { HelpId = HID_LETTER_PAGE9; };
-hidspecial HID_AGENDA_PAGE1     { HelpId = HID_AGENDA_PAGE1; };
-hidspecial HID_AGENDA_PAGE2     { HelpId = HID_AGENDA_PAGE2; };
-hidspecial HID_AGENDA_PAGE3     { HelpId = HID_AGENDA_PAGE3; };
-hidspecial HID_AGENDA_PAGE4     { HelpId = HID_AGENDA_PAGE4; };
-hidspecial HID_AGENDA_PAGE5     { HelpId = HID_AGENDA_PAGE5; };
-hidspecial HID_AGENDA_PAGE6     { HelpId = HID_AGENDA_PAGE6; };
-hidspecial HID_MEMO_PAGE1       { HelpId = HID_MEMO_PAGE1; };
-hidspecial HID_MEMO_PAGE2       { HelpId = HID_MEMO_PAGE2; };
-hidspecial HID_MEMO_PAGE3       { HelpId = HID_MEMO_PAGE3; };
-hidspecial HID_MEMO_PAGE4       { HelpId = HID_MEMO_PAGE4; };
-hidspecial HID_MEMO_PAGE5       { HelpId = HID_MEMO_PAGE5; };
-
-// Numerierungsdialog
-hidspecial HID_VS_SINGLENUM   { HelpId = HID_VS_SINGLENUM;};
-hidspecial HID_VS_NUM         { HelpId = HID_VS_NUM      ;};
-hidspecial HID_VS_BULLET      { HelpId = HID_VS_BULLET   ;};
-hidspecial HID_VS_NUMBMP      { HelpId = HID_VS_NUMBMP   ;};
-
-// Navigator
-hidspecial  HID_NAVIGATOR_TOOLBOX   { HelpId = HID_NAVIGATOR_TOOLBOX;};
-hidspecial  HID_NAVI_TBX16          { HelpId = HID_NAVI_TBX16;};
-hidspecial HID_NAVIGATOR_GLOBAL_TOOLBOX { HelpId = HID_NAVIGATOR_GLOBAL_TOOLBOX;};
-hidspecial HID_NAVIGATOR_LISTBOX    { HelpId = HID_NAVIGATOR_LISTBOX;};
-hidspecial HID_NAVIGATOR_GLOB_TREELIST  { HelpId = HID_NAVIGATOR_GLOB_TREELIST;};
-hidspecial HID_NAVIGATOR_TREELIST   { HelpId = HID_NAVIGATOR_TREELIST;};
-hidspecial HID_NAVI_DRAG_HYP        { HelpId = HID_NAVI_DRAG_HYP   ;};
-hidspecial HID_NAVI_DRAG_LINK       { HelpId = HID_NAVI_DRAG_LINK  ;};
-hidspecial HID_NAVI_DRAG_COPY       { HelpId = HID_NAVI_DRAG_COPY  ;};
-hidspecial HID_NAVI_OUTLINES        { HelpId = HID_NAVI_OUTLINES   ;};
-hidspecial HID_NAVI_TBX1            { HelpId = HID_NAVI_TBX1   ;};
-hidspecial HID_NAVI_TBX2            { HelpId = HID_NAVI_TBX2   ;};
-hidspecial HID_NAVI_TBX3            { HelpId = HID_NAVI_TBX3   ;};
-hidspecial HID_NAVI_TBX4            { HelpId = HID_NAVI_TBX4   ;};
-hidspecial HID_NAVI_TBX5            { HelpId = HID_NAVI_TBX5   ;};
-hidspecial HID_NAVI_TBX6            { HelpId = HID_NAVI_TBX6   ;};
-hidspecial HID_NAVI_TBX7            { HelpId = HID_NAVI_TBX7   ;};
-hidspecial HID_NAVI_TBX8            { HelpId = HID_NAVI_TBX8   ;};
-hidspecial HID_NAVI_TBX9            { HelpId = HID_NAVI_TBX9   ;};
-hidspecial HID_NAVI_TBX10           { HelpId = HID_NAVI_TBX10   ;};
-hidspecial HID_NAVI_TBX11           { HelpId = HID_NAVI_TBX11   ;};
-hidspecial HID_NAVI_TBX12           { HelpId = HID_NAVI_TBX12   ;};
-hidspecial HID_NAVI_TBX13           { HelpId = HID_NAVI_TBX13   ;};
-hidspecial HID_NAVI_TBX14           { HelpId = HID_NAVI_TBX14   ;};
-hidspecial HID_NAVI_TBX15           { HelpId = HID_NAVI_TBX15   ;};
-hidspecial HID_GLBLTREE_UPDATE      { HelpId = HID_GLBLTREE_UPDATE          ;};
-hidspecial HID_GLBLTREE_INSERT      { HelpId = HID_GLBLTREE_INSERT        ;};
-hidspecial HID_GLBLTREE_EDIT        { HelpId = HID_GLBLTREE_EDIT            ;};
-hidspecial HID_GLBLTREE_DEL         { HelpId = HID_GLBLTREE_DEL             ;};
-hidspecial HID_GLBLTREE_INS_IDX     { HelpId = HID_GLBLTREE_INS_IDX         ;};
-hidspecial HID_GLBLTREE_INS_CNTIDX    { HelpId = HID_GLBLTREE_INS_CNTIDX    ;};
-hidspecial HID_GLBLTREE_INS_USRIDX    { HelpId = HID_GLBLTREE_INS_USRIDX    ;};
-hidspecial HID_GLBLTREE_INS_FILE      { HelpId = HID_GLBLTREE_INS_FILE      ;};
-hidspecial HID_GLBLTREE_INS_NEW_FILE  { HelpId = HID_GLBLTREE_INS_NEW_FILE  ;};
-hidspecial HID_GLBLTREE_INS_TEXT      { HelpId = HID_GLBLTREE_INS_TEXT      ;};
-hidspecial HID_GLBLTREE_UPD_SEL       { HelpId = HID_GLBLTREE_UPD_SEL       ;};
-hidspecial HID_GLBLTREE_UPD_IDX       { HelpId = HID_GLBLTREE_UPD_IDX       ;};
-hidspecial HID_GLBLTREE_UPD_LINK      { HelpId = HID_GLBLTREE_UPD_LINK      ;};
-hidspecial HID_GLBLTREEUPD_ALL          { HelpId = HID_GLBLTREEUPD_ALL          ;};
-hidspecial HID_GLBLTREE_EDIT_LINK    { HelpId = HID_GLBLTREE_EDIT_LINK      ;};
-
-// Ruler einfuegen
-hidspecial  HID_VS_RULER            { HelpId = HID_VS_RULER;};
-
-// Briefumschlaege/Etiketten
-hidspecial  HID_ENVELOP_PRINT       { HelpId = HID_ENVELOP_PRINT;};
-hidspecial  HID_ENVELOP_INSERT      { HelpId = HID_ENVELOP_INSERT;};
-hidspecial  HID_LABEL_INSERT        { HelpId = HID_LABEL_INSERT;};
-
-// Vorlage laden
-hidspecial HID_LTEMPL_TEXT      { HelpId = HID_LTEMPL_TEXT     ; };
-hidspecial HID_LTEMPL_FRAME     { HelpId = HID_LTEMPL_FRAME    ; };
-hidspecial HID_LTEMPL_PAGE      { HelpId = HID_LTEMPL_PAGE     ; };
-hidspecial HID_LTEMPL_OVERRIDE  { HelpId = HID_LTEMPL_OVERRIDE ; };
-hidspecial HID_LTEMPL_NUMBERING  { HelpId = HID_LTEMPL_NUMBERING ;};
-
-// Numerierung/Optionen-Button
-hidspecial HID_NUM_FORMAT_BTN       { HelpId = HID_NUM_FORMAT_BTN;  };
-
-// AutoText Bereiche
-hidspecial HID_GLOS_GROUP_TREE  { HelpId = HID_GLOS_GROUP_TREE; };
-hidspecial HID_MD_GLOS_CATEGORY { HelpId = HID_MD_GLOS_CATEGORY;    };
-

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list