changed dtd

19 files changed, 267 insertions, 578 deletions

diff --git a/svx/xml/SvxDrawPage.xml b/svx/xml/SvxDrawPage.xml
index 345ca70d8435..29ea110a0094 100644
--- a/svx/xml/SvxDrawPage.xml
+++ b/svx/xml/SvxDrawPage.xml
@@ -1,35 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxDrawPage</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxDrawPage</name>
+        <description>
     This component implements the basic functionality for a drawing page
-</Description>
-
-<SupportedService>com::sun::star::drawing::DrawPage</SupportedService>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-
-<Status StatusValue="final"/>
-
-<!--
-<ModuleName>...</ModuleName>
-
-<LoaderName>com.sun.star.loader...</LoaderName>
-
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com::sun::star::drawing::DrawPage</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxGraphicObject.xml b/svx/xml/SvxGraphicObject.xml
index 5757fa75738c..7c756ad3e06e 100644
--- a/svx/xml/SvxGraphicObject.xml
+++ b/svx/xml/SvxGraphicObject.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxGraphicObject</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxGraphicObject</name>
+        <description>
     This component provides access to a graphic object.
-</Description>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.GraphicObjectShape</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.GraphicObjectShape</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxShape.xml b/svx/xml/SvxShape.xml
index b2fdd6eaa19f..6cf5e00a1ac1 100644
--- a/svx/xml/SvxShape.xml
+++ b/svx/xml/SvxShape.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxShape</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxShape</name>
+        <description>
     This component provides access to a basic shape.
-</Description>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.TextShape</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.TextShape</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxShapeCircle.xml b/svx/xml/SvxShapeCircle.xml
index 514057a5813d..fc37a09e93e3 100644
--- a/svx/xml/SvxShapeCircle.xml
+++ b/svx/xml/SvxShapeCircle.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxShapeCircle</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxShapeCircle</name>
+        <description>
     This component provides access to a circle shape.
-</Description>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.EllipseShape</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.EllipseShape</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxShapeCollection.xml b/svx/xml/SvxShapeCollection.xml
index 7e7c4f196cad..ad9781dfd367 100644
--- a/svx/xml/SvxShapeCollection.xml
+++ b/svx/xml/SvxShapeCollection.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxShapeCollection</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxShapeCollection</name>
+        <description>
     This component provides to a collection of shapes.
-</Description>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.Shapes</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.Shapes</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxShapeConnector.xml b/svx/xml/SvxShapeConnector.xml
index 1c9efe1c6f31..e80596b91d60 100644
--- a/svx/xml/SvxShapeConnector.xml
+++ b/svx/xml/SvxShapeConnector.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxShapeConnector</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxShapeConnector</name>
+        <description>
     This component provides to a connector shape.
-</Description>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.ConnectorShape</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.ConnectorShape</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxShapeControl.xml b/svx/xml/SvxShapeControl.xml
index 6ffff6c67846..c2c95e1abed7 100644
--- a/svx/xml/SvxShapeControl.xml
+++ b/svx/xml/SvxShapeControl.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxShapeControl</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxShapeControl</name>
+        <description>
     This component provides access to a control shape.
-</Description>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.ControlShape</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.ControlShape</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxShapeDimensioning.xml b/svx/xml/SvxShapeDimensioning.xml
index 08dc899878ee..29a8a0120f14 100644
--- a/svx/xml/SvxShapeDimensioning.xml
+++ b/svx/xml/SvxShapeDimensioning.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxShapeDimensioning</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxShapeDimensioning</name>
+        <description>
     This component provides access to a dimensioning shape.
-</Description>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.DimensioningShape</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.DimensioningShape</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxShapeGroup.xml b/svx/xml/SvxShapeGroup.xml
index bb8fd51d1d59..2b869fc77d36 100644
--- a/svx/xml/SvxShapeGroup.xml
+++ b/svx/xml/SvxShapeGroup.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxShapeGroup</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxShapeGroup</name>
+        <description>
     This component provides a group shape.
-</Description>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.ShapeGroup</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.ShapeGroup</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxShapePolyPolygon.xml b/svx/xml/SvxShapePolyPolygon.xml
index 5f3bb112031d..203bc1df98f5 100644
--- a/svx/xml/SvxShapePolyPolygon.xml
+++ b/svx/xml/SvxShapePolyPolygon.xml
@@ -1,30 +1,16 @@
-R<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxShapePolyPolygon</Name>
-<Description>
+<?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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxShapePolyPolygon</name>
+        <description>
     This component provides a poly polygon shape.
-</Description>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.drawing.PolyPolygonShape</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.drawing.PolyPolygonShape</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxShapePolyPolygonBezier.xml b/svx/xml/SvxShapePolyPolygonBezier.xml
index 0313b75f1e6e..aadabb6df6f7 100644
--- a/svx/xml/SvxShapePolyPolygonBezier.xml
+++ b/svx/xml/SvxShapePolyPolygonBezier.xml
@@ -1,35 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxShapePolyPolygonBezier</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxShapePolyPolygonBezier</name>
+        <description>
     This component provides access to a poly polygon bezier shape.
-</Description>
-
-<SupportedService>com::sun::star::drawing::PolyPolygonBezierShape</SupportedService>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-
-<Status StatusValue="final"/>
-
-<!--
-<ModuleName>...</ModuleName>
-
-<LoaderName>com.sun.star.loader...</LoaderName>
-
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com::sun::star::drawing::PolyPolygonBezierShape</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxUnoNumberingRules.xml b/svx/xml/SvxUnoNumberingRules.xml
index e7d00bbcbada..fe5b13ed490e 100644
--- a/svx/xml/SvxUnoNumberingRules.xml
+++ b/svx/xml/SvxUnoNumberingRules.xml
@@ -1,35 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxUnoNumberingRules</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxUnoNumberingRules</name>
+        <description>
     This component provides access to a anumbering rule
-</Description>
-
-<SupportedService>com::sun::star::text::NumberingRules</SupportedService>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-
-<Status StatusValue="final"/>
-
-<!--
-<ModuleName>...</ModuleName>
-
-<LoaderName>com.sun.star.loader...</LoaderName>
-
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com::sun::star::text::NumberingRules</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxUnoText.xml b/svx/xml/SvxUnoText.xml
index fc732d0fe8ea..c3b26aa74321 100644
--- a/svx/xml/SvxUnoText.xml
+++ b/svx/xml/SvxUnoText.xml
@@ -1,35 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxUnoText</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxUnoText</name>
+        <description>
     This component provides access to the text based on the edit engine or the outliner.
-</Description>
-
-<SupportedService>com::sun::star::text::Text</SupportedService>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-
-<Status StatusValue="final"/>
-
-<!--
-<ModuleName>...</ModuleName>
-
-<LoaderName>com.sun.star.loader...</LoaderName>
-
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com::sun::star::text::Text</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxUnoTextContent.xml b/svx/xml/SvxUnoTextContent.xml
index 3a6770696bd2..2732d480b5ec 100644
--- a/svx/xml/SvxUnoTextContent.xml
+++ b/svx/xml/SvxUnoTextContent.xml
@@ -1,35 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxUnoTextContent</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxUnoTextContent</name>
+        <description>
     This component provides access to the paragraph contend inside the text of an edit engine or outliner.
-</Description>
-
-<SupportedService>com::sun::star::text::Paragraph</SupportedService>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-
-<Status StatusValue="final"/>
-
-<!--
-<ModuleName>...</ModuleName>
-
-<LoaderName>com.sun.star.loader...</LoaderName>
-
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com::sun::star::text::Paragraph</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxUnoTextContentEnum.xml b/svx/xml/SvxUnoTextContentEnum.xml
index d1bba6d37d79..ecbc78b5d3d3 100644
--- a/svx/xml/SvxUnoTextContentEnum.xml
+++ b/svx/xml/SvxUnoTextContentEnum.xml
@@ -1,35 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxUnoTextContentEnum</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxUnoTextContentEnum</name>
+        <description>
     This component provides access to the paragraph insides an edit engine or outliner
-</Description>
-
-<SupportedService>com::sun::star::container::XEnumeration</SupportedService>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-
-<Status StatusValue="final"/>
-
-<!--
-<ModuleName>...</ModuleName>
-
-<LoaderName>com.sun.star.loader...</LoaderName>
-
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com::sun::star::container::XEnumeration</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxUnoTextCursor.xml b/svx/xml/SvxUnoTextCursor.xml
index 87d9d3f0dd52..fbebd7cf17a5 100644
--- a/svx/xml/SvxUnoTextCursor.xml
+++ b/svx/xml/SvxUnoTextCursor.xml
@@ -1,35 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxUnoTextCursor</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxUnoTextCursor</name>
+        <description>
     This component provides an implementation of a text cursor for the edit engine or outliner.
-</Description>
-
-<SupportedService>com::sun::star::text::TextCursor</SupportedService>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-
-<Status StatusValue="final"/>
-
-<!--
-<ModuleName>...</ModuleName>
-
-<LoaderName>com.sun.star.loader...</LoaderName>
-
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com::sun::star::text::TextCursor</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxUnoTextField.xml b/svx/xml/SvxUnoTextField.xml
index f8cc23b58220..fa64d6b1230c 100644
--- a/svx/xml/SvxUnoTextField.xml
+++ b/svx/xml/SvxUnoTextField.xml
@@ -1,35 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxUnoTextField</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxUnoTextField</name>
+        <description>
     This component provides access to a text field text content for edit engine and outliner
-</Description>
-
-<SupportedService>com::sun::star::text::TextField</SupportedService>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-
-<Status StatusValue="final"/>
-
-<!--
-<ModuleName>...</ModuleName>
-
-<LoaderName>com.sun.star.loader...</LoaderName>
-
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com::sun::star::text::TextField</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxUnoTextRange.xml b/svx/xml/SvxUnoTextRange.xml
index 10ab455575c1..04b4610fb5d5 100644
--- a/svx/xml/SvxUnoTextRange.xml
+++ b/svx/xml/SvxUnoTextRange.xml
@@ -1,35 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxUnoTextRange</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxUnoTextRange</name>
+        <description>
     This component provides access to a simple text range in an edit engine or outliner.
-</Description>
-
-<SupportedService>com::sun::star::text::TextRange</SupportedService>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-
-<Status StatusValue="final"/>
-
-<!--
-<ModuleName>...</ModuleName>
-
-<LoaderName>com.sun.star.loader...</LoaderName>
-
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com::sun::star::text::TextRange</supported-service>
+    </component-description>
+</module-description>
diff --git a/svx/xml/SvxUnoTextRangeEnumeration.xml b/svx/xml/SvxUnoTextRangeEnumeration.xml
index 257b30f5e90f..c8fc25adf539 100644
--- a/svx/xml/SvxUnoTextRangeEnumeration.xml
+++ b/svx/xml/SvxUnoTextRangeEnumeration.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Christian Lippka</Author>
-<Name>com.sun.star.comp.office.SvxUnoTextRangeEnumeration</Name>
-<Description>
+<!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>svx</module-name>
+    <component-description>
+        <author>Christian Lippka</author>
+        <name>com.sun.star.comp.office.SvxUnoTextRangeEnumeration</name>
+        <description>
     This component provides access to an enumeration of text ranges.
-</Description>
-
-<ModuleName>svx</ModuleName>
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-<Language>c++</Language>
-<Status StatusValue="final"/>
-
-<SupportedService>com.sun.star.text.TextPortionEnumeration</SupportedService>
-
-<!--
-<ServiceDependency>...</ServiceDependency>
-
-<ProjectBuildDependency>...</ProjectBuildDependency>
-...
-
-<RuntimeModuleDependency>...</RuntimeModuleDependency>
-...
-
-<Type>com.sun.star....</Type>
-...
--->
-</COMPONENTDESCRIPTION>
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.text.TextPortionEnumeration</supported-service>
+    </component-description>
+</module-description>