validation work correct

40 files changed, 275 insertions, 284 deletions

diff --git a/sc/xml/ScDDELinkObj.xml b/sc/xml/ScDDELinkObj.xml
index aee3682a3d7c..a0b1c61b5f1e 100644
--- a/sc/xml/ScDDELinkObj.xml
+++ b/sc/xml/ScDDELinkObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.DDELink</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.DDELink</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScDDELinksObj.xml b/sc/xml/ScDDELinksObj.xml
index d0d018150abe..c435202835f9 100644
--- a/sc/xml/ScDDELinksObj.xml
+++ b/sc/xml/ScDDELinksObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.DDELinks</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.DDELinks</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScDataPilotFieldObj.xml b/sc/xml/ScDataPilotFieldObj.xml
index c66aa4bfabc4..a4da4d0a3a38 100644
--- a/sc/xml/ScDataPilotFieldObj.xml
+++ b/sc/xml/ScDataPilotFieldObj.xml
@@ -1,137 +1,128 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XML Spy v3.0.7 NT (http://www.xmlspy.com) by Markus Meyer (StarOffice GmbH) -->
 <!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-<Author>Niklas Nebel</Author>
-<Name>com.sun.star.comp.office.ScDataPilotFieldObj</Name>
-<Description>
+<COMPONENTDESCRIPTION xmlns:xlink="http://www.w3.org/1999/xlink/Namespace">
+    <Author>Niklas Nebel</Author>
+    <Name>com.sun.star.comp.office.ScDataPilotFieldObj</Name>
+    <Description>
     This component provides ...
 </Description>
-
-<SupportedService>com.sun.star.sheet.DataPilotField</SupportedService>
-
-<Language>c++</Language>
-
-<Status StatusValue="final"/>
-
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
-
-<!--
+    <ModuleName>sc</ModuleName>
+    <LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+    <Language>c++</Language>
+    <Status StatusValue="final"/>
+    <SupportedService>com.sun.star.sheet.DataPilotField</SupportedService>
+    <!--
 <ServiceDependency>...</ServiceDependency>
 
 <RuntimeModuleDependency>...</RuntimeModuleDependency>
 -->
-
-<ProjectBuildDependency>cppu</ProjectBuildDependency>
-<ProjectBuildDependency>cppuhelper</ProjectBuildDependency>
-<ProjectBuildDependency>osl</ProjectBuildDependency>
-<ProjectBuildDependency>rsc</ProjectBuildDependency>
-<ProjectBuildDependency>rtl</ProjectBuildDependency>
-<ProjectBuildDependency>sal</ProjectBuildDependency>
-<ProjectBuildDependency>sfx2</ProjectBuildDependency>
-<ProjectBuildDependency>so3</ProjectBuildDependency>
-<ProjectBuildDependency>sot</ProjectBuildDependency>
-<ProjectBuildDependency>stl</ProjectBuildDependency>
-<ProjectBuildDependency>svtools</ProjectBuildDependency>
-<ProjectBuildDependency>tools</ProjectBuildDependency>
-<ProjectBuildDependency>typelib</ProjectBuildDependency>
-<ProjectBuildDependency>uno</ProjectBuildDependency>
-<ProjectBuildDependency>vcl</ProjectBuildDependency>
-<ProjectBuildDependency>vos</ProjectBuildDependency>
-
-<Type>com.sun.star.awt.FocusEvent</Type>
-<Type>com.sun.star.awt.InputEvent</Type>
-<Type>com.sun.star.awt.KeyEvent</Type>
-<Type>com.sun.star.awt.MouseEvent</Type>
-<Type>com.sun.star.awt.PaintEvent</Type>
-<Type>com.sun.star.awt.Rectangle</Type>
-<Type>com.sun.star.awt.WindowEvent</Type>
-<Type>com.sun.star.awt.XFocusListener</Type>
-<Type>com.sun.star.awt.XKeyListener</Type>
-<Type>com.sun.star.awt.XMouseListener</Type>
-<Type>com.sun.star.awt.XMouseMotionListener</Type>
-<Type>com.sun.star.awt.XPaintListener</Type>
-<Type>com.sun.star.awt.XWindow</Type>
-<Type>com.sun.star.awt.XWindowListener</Type>
-<Type>com.sun.star.beans.Property</Type>
-<Type>com.sun.star.beans.PropertyChangeEvent</Type>
-<Type>com.sun.star.beans.PropertyState</Type>
-<Type>com.sun.star.beans.PropertyValue</Type>
-<Type>com.sun.star.beans.PropertyVetoException</Type>
-<Type>com.sun.star.beans.UnknownPropertyException</Type>
-<Type>com.sun.star.beans.XPropertyChangeListener</Type>
-<Type>com.sun.star.beans.XPropertySet</Type>
-<Type>com.sun.star.beans.XPropertySetInfo</Type>
-<Type>com.sun.star.beans.XVetoableChangeListener</Type>
-<Type>com.sun.star.container.NoSuchElementException</Type>
-<Type>com.sun.star.container.XElementAccess</Type>
-<Type>com.sun.star.container.XEnumeration</Type>
-<Type>com.sun.star.container.XEnumerationAccess</Type>
-<Type>com.sun.star.container.XIndexAccess</Type>
-<Type>com.sun.star.container.XNameAccess</Type>
-<Type>com.sun.star.container.XNamed</Type>
-<Type>com.sun.star.frame.FrameAction</Type>
-<Type>com.sun.star.frame.FrameActionEvent</Type>
-<Type>com.sun.star.frame.XController</Type>
-<Type>com.sun.star.frame.XFrame</Type>
-<Type>com.sun.star.frame.XFrameActionListener</Type>
-<Type>com.sun.star.frame.XFrames</Type>
-<Type>com.sun.star.frame.XFramesSupplier</Type>
-<Type>com.sun.star.frame.XModel</Type>
-<Type>com.sun.star.lang.EventObject</Type>
-<Type>com.sun.star.lang.IllegalArgumentException</Type>
-<Type>com.sun.star.lang.IndexOutOfBoundsException</Type>
-<Type>com.sun.star.lang.Locale</Type>
-<Type>com.sun.star.lang.WrappedTargetException</Type>
-<Type>com.sun.star.lang.XComponent</Type>
-<Type>com.sun.star.lang.XEventListener</Type>
-<Type>com.sun.star.lang.XMultiServiceFactory</Type>
-<Type>com.sun.star.lang.XServiceInfo</Type>
-<Type>com.sun.star.lang.XSingleServiceFactory</Type>
-<Type>com.sun.star.lang.XTypeProvider</Type>
-<Type>com.sun.star.lang.XUnoTunnel</Type>
-<Type>com.sun.star.registry.InvalidRegistryException</Type>
-<Type>com.sun.star.registry.InvalidValueException</Type>
-<Type>com.sun.star.registry.RegistryKeyType</Type>
-<Type>com.sun.star.registry.RegistryValueType</Type>
-<Type>com.sun.star.registry.XRegistryKey</Type>
-<Type>com.sun.star.sheet.DataPilotFieldOrientation</Type>
-<Type>com.sun.star.sheet.FilterConnection</Type>
-<Type>com.sun.star.sheet.FilterOperator</Type>
-<Type>com.sun.star.sheet.GeneralFunction</Type>
-<Type>com.sun.star.sheet.SubTotalColumn</Type>
-<Type>com.sun.star.sheet.TableFilterField</Type>
-<Type>com.sun.star.sheet.XCellRangeReferrer</Type>
-<Type>com.sun.star.sheet.XConsolidationDescriptor</Type>
-<Type>com.sun.star.sheet.XDataPilotDescriptor</Type>
-<Type>com.sun.star.sheet.XDataPilotTable</Type>
-<Type>com.sun.star.sheet.XDataPilotTables</Type>
-<Type>com.sun.star.sheet.XDatabaseRange</Type>
-<Type>com.sun.star.sheet.XDatabaseRanges</Type>
-<Type>com.sun.star.sheet.XDimensionsSupplier</Type>
-<Type>com.sun.star.sheet.XSheetFilterDescriptor</Type>
-<Type>com.sun.star.sheet.XSubTotalDescriptor</Type>
-<Type>com.sun.star.sheet.XSubTotalField</Type>
-<Type>com.sun.star.table.CellAddress</Type>
-<Type>com.sun.star.table.CellContentType</Type>
-<Type>com.sun.star.table.CellRangeAddress</Type>
-<Type>com.sun.star.table.XCell</Type>
-<Type>com.sun.star.table.XCellRange</Type>
-<Type>com.sun.star.uno.Any</Type>
-<Type>com.sun.star.uno.Exception</Type>
-<Type>com.sun.star.uno.Reference</Type>
-<Type>com.sun.star.uno.RuntimeException</Type>
-<Type>com.sun.star.uno.Sequence</Type>
-<Type>com.sun.star.uno.Type</Type>
-<Type>com.sun.star.uno.TypeClass</Type>
-<Type>com.sun.star.uno.XAdapter</Type>
-<Type>com.sun.star.uno.XAggregation</Type>
-<Type>com.sun.star.uno.XInterface</Type>
-<Type>com.sun.star.uno.XReference</Type>
-<Type>com.sun.star.uno.XWeak</Type>
-<Type>com.sun.star.uno.genfunc</Type>
-<Type>com.sun.star.util.URL</Type>
-
+    <ProjectBuildDependency>cppu</ProjectBuildDependency>
+    <ProjectBuildDependency>cppuhelper</ProjectBuildDependency>
+    <ProjectBuildDependency>osl</ProjectBuildDependency>
+    <ProjectBuildDependency>rsc</ProjectBuildDependency>
+    <ProjectBuildDependency>rtl</ProjectBuildDependency>
+    <ProjectBuildDependency>sal</ProjectBuildDependency>
+    <ProjectBuildDependency>sfx2</ProjectBuildDependency>
+    <ProjectBuildDependency>so3</ProjectBuildDependency>
+    <ProjectBuildDependency>sot</ProjectBuildDependency>
+    <ProjectBuildDependency>stl</ProjectBuildDependency>
+    <ProjectBuildDependency>svtools</ProjectBuildDependency>
+    <ProjectBuildDependency>tools</ProjectBuildDependency>
+    <ProjectBuildDependency>typelib</ProjectBuildDependency>
+    <ProjectBuildDependency>uno</ProjectBuildDependency>
+    <ProjectBuildDependency>vcl</ProjectBuildDependency>
+    <ProjectBuildDependency>vos</ProjectBuildDependency>
+    <Type>com.sun.star.awt.FocusEvent</Type>
+    <Type>com.sun.star.awt.InputEvent</Type>
+    <Type>com.sun.star.awt.KeyEvent</Type>
+    <Type>com.sun.star.awt.MouseEvent</Type>
+    <Type>com.sun.star.awt.PaintEvent</Type>
+    <Type>com.sun.star.awt.Rectangle</Type>
+    <Type>com.sun.star.awt.WindowEvent</Type>
+    <Type>com.sun.star.awt.XFocusListener</Type>
+    <Type>com.sun.star.awt.XKeyListener</Type>
+    <Type>com.sun.star.awt.XMouseListener</Type>
+    <Type>com.sun.star.awt.XMouseMotionListener</Type>
+    <Type>com.sun.star.awt.XPaintListener</Type>
+    <Type>com.sun.star.awt.XWindow</Type>
+    <Type>com.sun.star.awt.XWindowListener</Type>
+    <Type>com.sun.star.beans.Property</Type>
+    <Type>com.sun.star.beans.PropertyChangeEvent</Type>
+    <Type>com.sun.star.beans.PropertyState</Type>
+    <Type>com.sun.star.beans.PropertyValue</Type>
+    <Type>com.sun.star.beans.PropertyVetoException</Type>
+    <Type>com.sun.star.beans.UnknownPropertyException</Type>
+    <Type>com.sun.star.beans.XPropertyChangeListener</Type>
+    <Type>com.sun.star.beans.XPropertySet</Type>
+    <Type>com.sun.star.beans.XPropertySetInfo</Type>
+    <Type>com.sun.star.beans.XVetoableChangeListener</Type>
+    <Type>com.sun.star.container.NoSuchElementException</Type>
+    <Type>com.sun.star.container.XElementAccess</Type>
+    <Type>com.sun.star.container.XEnumeration</Type>
+    <Type>com.sun.star.container.XEnumerationAccess</Type>
+    <Type>com.sun.star.container.XIndexAccess</Type>
+    <Type>com.sun.star.container.XNameAccess</Type>
+    <Type>com.sun.star.container.XNamed</Type>
+    <Type>com.sun.star.frame.FrameAction</Type>
+    <Type>com.sun.star.frame.FrameActionEvent</Type>
+    <Type>com.sun.star.frame.XController</Type>
+    <Type>com.sun.star.frame.XFrame</Type>
+    <Type>com.sun.star.frame.XFrameActionListener</Type>
+    <Type>com.sun.star.frame.XFrames</Type>
+    <Type>com.sun.star.frame.XFramesSupplier</Type>
+    <Type>com.sun.star.frame.XModel</Type>
+    <Type>com.sun.star.lang.EventObject</Type>
+    <Type>com.sun.star.lang.IllegalArgumentException</Type>
+    <Type>com.sun.star.lang.IndexOutOfBoundsException</Type>
+    <Type>com.sun.star.lang.Locale</Type>
+    <Type>com.sun.star.lang.WrappedTargetException</Type>
+    <Type>com.sun.star.lang.XComponent</Type>
+    <Type>com.sun.star.lang.XEventListener</Type>
+    <Type>com.sun.star.lang.XMultiServiceFactory</Type>
+    <Type>com.sun.star.lang.XServiceInfo</Type>
+    <Type>com.sun.star.lang.XSingleServiceFactory</Type>
+    <Type>com.sun.star.lang.XTypeProvider</Type>
+    <Type>com.sun.star.lang.XUnoTunnel</Type>
+    <Type>com.sun.star.registry.InvalidRegistryException</Type>
+    <Type>com.sun.star.registry.InvalidValueException</Type>
+    <Type>com.sun.star.registry.RegistryKeyType</Type>
+    <Type>com.sun.star.registry.RegistryValueType</Type>
+    <Type>com.sun.star.registry.XRegistryKey</Type>
+    <Type>com.sun.star.sheet.DataPilotFieldOrientation</Type>
+    <Type>com.sun.star.sheet.FilterConnection</Type>
+    <Type>com.sun.star.sheet.FilterOperator</Type>
+    <Type>com.sun.star.sheet.GeneralFunction</Type>
+    <Type>com.sun.star.sheet.SubTotalColumn</Type>
+    <Type>com.sun.star.sheet.TableFilterField</Type>
+    <Type>com.sun.star.sheet.XCellRangeReferrer</Type>
+    <Type>com.sun.star.sheet.XConsolidationDescriptor</Type>
+    <Type>com.sun.star.sheet.XDataPilotDescriptor</Type>
+    <Type>com.sun.star.sheet.XDataPilotTable</Type>
+    <Type>com.sun.star.sheet.XDataPilotTables</Type>
+    <Type>com.sun.star.sheet.XDatabaseRange</Type>
+    <Type>com.sun.star.sheet.XDatabaseRanges</Type>
+    <Type>com.sun.star.sheet.XDimensionsSupplier</Type>
+    <Type>com.sun.star.sheet.XSheetFilterDescriptor</Type>
+    <Type>com.sun.star.sheet.XSubTotalDescriptor</Type>
+    <Type>com.sun.star.sheet.XSubTotalField</Type>
+    <Type>com.sun.star.table.CellAddress</Type>
+    <Type>com.sun.star.table.CellContentType</Type>
+    <Type>com.sun.star.table.CellRangeAddress</Type>
+    <Type>com.sun.star.table.XCell</Type>
+    <Type>com.sun.star.table.XCellRange</Type>
+    <Type>com.sun.star.uno.Any</Type>
+    <Type>com.sun.star.uno.Exception</Type>
+    <Type>com.sun.star.uno.Reference</Type>
+    <Type>com.sun.star.uno.RuntimeException</Type>
+    <Type>com.sun.star.uno.Sequence</Type>
+    <Type>com.sun.star.uno.Type</Type>
+    <Type>com.sun.star.uno.TypeClass</Type>
+    <Type>com.sun.star.uno.XAdapter</Type>
+    <Type>com.sun.star.uno.XAggregation</Type>
+    <Type>com.sun.star.uno.XInterface</Type>
+    <Type>com.sun.star.uno.XReference</Type>
+    <Type>com.sun.star.uno.XWeak</Type>
+    <Type>com.sun.star.uno.genfunc</Type>
+    <Type>com.sun.star.util.URL</Type>
 </COMPONENTDESCRIPTION>
diff --git a/sc/xml/ScDataPilotFieldsObj.xml b/sc/xml/ScDataPilotFieldsObj.xml
index f92daff00b21..70aee8f2b2d7 100644
--- a/sc/xml/ScDataPilotFieldsObj.xml
+++ b/sc/xml/ScDataPilotFieldsObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.DataPilotFields</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.DataPilotFields</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScDataPilotTableObj.xml b/sc/xml/ScDataPilotTableObj.xml
index 76e24741ef04..69ebc03ee91e 100644
--- a/sc/xml/ScDataPilotTableObj.xml
+++ b/sc/xml/ScDataPilotTableObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.DataPilotTable</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.DataPilotTable</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScDataPilotTablesObj.xml b/sc/xml/ScDataPilotTablesObj.xml
index 493ad19b5d37..adc52c74993b 100644
--- a/sc/xml/ScDataPilotTablesObj.xml
+++ b/sc/xml/ScDataPilotTablesObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.DataPilotTables</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.DataPilotTables</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScDrawPagesObj.xml b/sc/xml/ScDrawPagesObj.xml
index 4eb46c7d911d..d90bf83abf62 100644
--- a/sc/xml/ScDrawPagesObj.xml
+++ b/sc/xml/ScDrawPagesObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.drawing.DrawPages</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.drawing.DrawPages</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScFilterDescriptorBase.xml b/sc/xml/ScFilterDescriptorBase.xml
index bb77e75c263b..e2f192446e39 100644
--- a/sc/xml/ScFilterDescriptorBase.xml
+++ b/sc/xml/ScFilterDescriptorBase.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.SheetFilterDescriptor</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.SheetFilterDescriptor</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScFunctionListObj.xml b/sc/xml/ScFunctionListObj.xml
index c943f3ceec49..9ed75f8257a3 100644
--- a/sc/xml/ScFunctionListObj.xml
+++ b/sc/xml/ScFunctionListObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.FunctionDescriptions</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.FunctionDescriptions</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScHeaderFieldObj.xml b/sc/xml/ScHeaderFieldObj.xml
index e02795357a88..d48d314c4321 100644
--- a/sc/xml/ScHeaderFieldObj.xml
+++ b/sc/xml/ScHeaderFieldObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.text.TextField</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.text.TextField</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScHeaderFooterContentObj.xml b/sc/xml/ScHeaderFooterContentObj.xml
index 4e59023a3f42..120b4ae200d2 100644
--- a/sc/xml/ScHeaderFooterContentObj.xml
+++ b/sc/xml/ScHeaderFooterContentObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.HeaderFooterContent</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.HeaderFooterContent</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScHeaderFooterTextCursor.xml b/sc/xml/ScHeaderFooterTextCursor.xml
index 4b90e2657c5c..a82e17b320c6 100644
--- a/sc/xml/ScHeaderFooterTextCursor.xml
+++ b/sc/xml/ScHeaderFooterTextCursor.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.text.TextCursor</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.text.TextCursor</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScHeaderFooterTextObj.xml b/sc/xml/ScHeaderFooterTextObj.xml
index 9ea098df7ad6..5eb075e08259 100644
--- a/sc/xml/ScHeaderFooterTextObj.xml
+++ b/sc/xml/ScHeaderFooterTextObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.text.Text</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.text.Text</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScLabelRangeObj.xml b/sc/xml/ScLabelRangeObj.xml
index b6e2bdb89b39..50b08e536fcf 100644
--- a/sc/xml/ScLabelRangeObj.xml
+++ b/sc/xml/ScLabelRangeObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.LabelRange</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.LabelRange</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScLabelRangesObj.xml b/sc/xml/ScLabelRangesObj.xml
index 84c503c050ab..65d357de4973 100644
--- a/sc/xml/ScLabelRangesObj.xml
+++ b/sc/xml/ScLabelRangesObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.LabelRanges</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.LabelRanges</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScModelObj.xml b/sc/xml/ScModelObj.xml
index c1e348808108..9b9cdb8071a2 100644
--- a/sc/xml/ScModelObj.xml
+++ b/sc/xml/ScModelObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.SpreadsheetDocument</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.SpreadsheetDocument</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScNamedRangeObj.xml b/sc/xml/ScNamedRangeObj.xml
index 2bfb8c075f1c..29d98411628a 100644
--- a/sc/xml/ScNamedRangeObj.xml
+++ b/sc/xml/ScNamedRangeObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.NamedRange</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.NamedRange</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScNamedRangesObj.xml b/sc/xml/ScNamedRangesObj.xml
index 30af6524971c..a7d6e44d59c6 100644
--- a/sc/xml/ScNamedRangesObj.xml
+++ b/sc/xml/ScNamedRangesObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.NamedRanges</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.NamedRanges</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScRecentFunctionsObj.xml b/sc/xml/ScRecentFunctionsObj.xml
index dd099b2bb0ed..71b0e9c725d1 100644
--- a/sc/xml/ScRecentFunctionsObj.xml
+++ b/sc/xml/ScRecentFunctionsObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.RecentFunctions</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.RecentFunctions</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScScenariosObj.xml b/sc/xml/ScScenariosObj.xml
index f5c8e8334617..44c497c61604 100644
--- a/sc/xml/ScScenariosObj.xml
+++ b/sc/xml/ScScenariosObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.Scenarios</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.Scenarios</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScSheetLinkObj.xml b/sc/xml/ScSheetLinkObj.xml
index 7113491ecd03..7ef16914312e 100644
--- a/sc/xml/ScSheetLinkObj.xml
+++ b/sc/xml/ScSheetLinkObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.SheetLink</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.SheetLink</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScSheetLinksObj.xml b/sc/xml/ScSheetLinksObj.xml
index ff5e082e0fec..4a56f58c9af1 100644
--- a/sc/xml/ScSheetLinksObj.xml
+++ b/sc/xml/ScSheetLinksObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.SheetLinks</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.SheetLinks</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScSpreadsheetSettings.xml b/sc/xml/ScSpreadsheetSettings.xml
index 5770443dedb1..97a0c753abb0 100644
--- a/sc/xml/ScSpreadsheetSettings.xml
+++ b/sc/xml/ScSpreadsheetSettings.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.GlobalSheetSettings</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.GlobalSheetSettings</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScSpreadsheetSettingsObj.xml b/sc/xml/ScSpreadsheetSettingsObj.xml
index ed6cb3cbb724..57baf433f92c 100644
--- a/sc/xml/ScSpreadsheetSettingsObj.xml
+++ b/sc/xml/ScSpreadsheetSettingsObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.SpreadsheetDocumentSettings</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.SpreadsheetDocumentSettings</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScStyleFamiliesObj.xml b/sc/xml/ScStyleFamiliesObj.xml
index f5bba0107c6a..e970f11c78ad 100644
--- a/sc/xml/ScStyleFamiliesObj.xml
+++ b/sc/xml/ScStyleFamiliesObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.style.StyleFamilies</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.style.StyleFamilies</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScStyleFamilyObj.xml b/sc/xml/ScStyleFamilyObj.xml
index 5254105e00ad..6c8279129019 100644
--- a/sc/xml/ScStyleFamilyObj.xml
+++ b/sc/xml/ScStyleFamilyObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.style.StyleFamily</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.style.StyleFamily</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScStyleObj.xml b/sc/xml/ScStyleObj.xml
index 24c7ef979057..9fc1cf960270 100644
--- a/sc/xml/ScStyleObj.xml
+++ b/sc/xml/ScStyleObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.style.Style</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.style.Style</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScSubTotalDescriptorBase.xml b/sc/xml/ScSubTotalDescriptorBase.xml
index adec6c17d57b..30e8b46a29b6 100644
--- a/sc/xml/ScSubTotalDescriptorBase.xml
+++ b/sc/xml/ScSubTotalDescriptorBase.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.SubTotalDescriptor</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.SubTotalDescriptor</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScSubTotalFieldObj.xml b/sc/xml/ScSubTotalFieldObj.xml
index e74dfaab944d..21dbc646565d 100644
--- a/sc/xml/ScSubTotalFieldObj.xml
+++ b/sc/xml/ScSubTotalFieldObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.SubTotalField</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.SubTotalField</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScTabViewObj.xml b/sc/xml/ScTabViewObj.xml
index 10eef7063229..bb4dc11fa873 100644
--- a/sc/xml/ScTabViewObj.xml
+++ b/sc/xml/ScTabViewObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.SpreadsheetView</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.SpreadsheetView</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScTableColumnObj.xml b/sc/xml/ScTableColumnObj.xml
index f1959d8cae63..d6dd8aa0733e 100644
--- a/sc/xml/ScTableColumnObj.xml
+++ b/sc/xml/ScTableColumnObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.table.TableColumn</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.table.TableColumn</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScTableColumnsObj.xml b/sc/xml/ScTableColumnsObj.xml
index 6d79307c84d2..643eb924f3a4 100644
--- a/sc/xml/ScTableColumnsObj.xml
+++ b/sc/xml/ScTableColumnsObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.table.TableColumns</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.table.TableColumns</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScTableConditionalEntry.xml b/sc/xml/ScTableConditionalEntry.xml
index 83d187510305..ee226b1824bd 100644
--- a/sc/xml/ScTableConditionalEntry.xml
+++ b/sc/xml/ScTableConditionalEntry.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.TableConditionalEntry</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.TableConditionalEntry</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScTableConditionalFormat.xml b/sc/xml/ScTableConditionalFormat.xml
index 0a998bcf23b9..3cab745ef952 100644
--- a/sc/xml/ScTableConditionalFormat.xml
+++ b/sc/xml/ScTableConditionalFormat.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.TableConditionalFormat</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.TableConditionalFormat</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScTableRowObj.xml b/sc/xml/ScTableRowObj.xml
index eff25dc4d626..dc540c62a44a 100644
--- a/sc/xml/ScTableRowObj.xml
+++ b/sc/xml/ScTableRowObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.table.TableRow</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.table.TableRow</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScTableRowsObj.xml b/sc/xml/ScTableRowsObj.xml
index 6bca5cce74e7..dc2e78fc2553 100644
--- a/sc/xml/ScTableRowsObj.xml
+++ b/sc/xml/ScTableRowsObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.table.TableRows</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.table.TableRows</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScTableSheetObj.xml b/sc/xml/ScTableSheetObj.xml
index a7dfe9ace3b3..29db3fd9ed16 100644
--- a/sc/xml/ScTableSheetObj.xml
+++ b/sc/xml/ScTableSheetObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.Spreadsheet</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.Spreadsheet</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScTableSheetsObj.xml b/sc/xml/ScTableSheetsObj.xml
index 4f0e5a34038c..0e4b5eb9d786 100644
--- a/sc/xml/ScTableSheetsObj.xml
+++ b/sc/xml/ScTableSheetsObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.Spreadsheets</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.Spreadsheets</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScTableValidationObj.xml b/sc/xml/ScTableValidationObj.xml
index 4fea9b6e5c69..c108688bb9e4 100644
--- a/sc/xml/ScTableValidationObj.xml
+++ b/sc/xml/ScTableValidationObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.TableValidation</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.TableValidation</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>
diff --git a/sc/xml/ScViewPaneObj.xml b/sc/xml/ScViewPaneObj.xml
index 87a265ce9529..7512ecb5b767 100644
--- a/sc/xml/ScViewPaneObj.xml
+++ b/sc/xml/ScViewPaneObj.xml
@@ -8,15 +8,15 @@
     This component provides ...
 </Description>
 
-<SupportedService>com.sun.star.sheet.SpreadsheetViewPane</SupportedService>
+<ModuleName>sc</ModuleName>
+
+<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
 
 <Language>c++</Language>
 
 <Status StatusValue="final"/>
 
-<ModuleName>sc</ModuleName>
-
-<LoaderName>com.sun.star.loader.SharedLibrary</LoaderName>
+<SupportedService>com.sun.star.sheet.SpreadsheetViewPane</SupportedService>
 
 <!--
 <ServiceDependency>...</ServiceDependency>