sb129: #i113189# change UNO components to use passive registration

6 files changed, 307 insertions, 120 deletions

diff --git a/toolkit/prj/d.lst b/toolkit/prj/d.lst
index 375485c96e4d..01eb5026e401 100644
--- a/toolkit/prj/d.lst
+++ b/toolkit/prj/d.lst
@@ -63,3 +63,4 @@ mkdir: %_DEST%\inc%_EXT%\layout\vcl
 ..\source\layout\vcl\*.hxx  %_DEST%\inc%_EXT%\layout\vcl\*.hxx
 
 ..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
+..\%__SRC%\misc\tk.component %_DEST%\xml%_EXT%\tk.component
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index 593feb582274..9e5334b2d28c 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -191,9 +191,3 @@ void * SAL_CALL comp_AsyncCallback_component_getFactory(
     return ::cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
-
-sal_Bool SAL_CALL comp_AsyncCallback_component_writeInfo(
-    void * serviceManager, void * registryKey)
-{
-    return ::cppu::component_writeInfoHelper(serviceManager, registryKey, entries);
-}
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index aedf4024f2b9..477032538af8 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/registerservices.cxx
@@ -205,10 +205,8 @@ extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL
 extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL DefaultGridColumnModel_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
 extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GridColumn_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& );
 
-extern sal_Bool SAL_CALL comp_AsyncCallback_component_writeInfo( void * serviceManager, void * registryKey );
 extern void * SAL_CALL comp_AsyncCallback_component_getFactory( const char * implName, void * serviceManager, void * registryKey );
 
-extern sal_Bool SAL_CALL comp_Layout_component_writeInfo( void * serviceManager, void * registryKey );
 extern void * SAL_CALL comp_Layout_component_getFactory( const char * implName, void * serviceManager, void * registryKey );
 
 extern "C"
@@ -219,91 +217,6 @@ TOOLKIT_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sa
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-TOOLKIT_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( void* _pServiceManager, void* _pRegistryKey )
-{
-    if (_pRegistryKey)
-    {
-        ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xRegistryKey =
-            static_cast< ::com::sun::star::registry::XRegistryKey* >( _pRegistryKey );
-
-        registerServices( xRegistryKey, "VCLXToolkit", szServiceName_Toolkit, szServiceName2_Toolkit );
-        registerServices( xRegistryKey, "VCLXPopupMenu", szServiceName_PopupMenu, szServiceName2_PopupMenu );
-        registerServices( xRegistryKey, "VCLXMenuBar", szServiceName_MenuBar, szServiceName2_MenuBar );
-        registerServices( xRegistryKey, "VCLXPointer", szServiceName_Pointer, szServiceName2_Pointer );
-        registerServices( xRegistryKey, "UnoControlContainer", szServiceName_UnoControlContainer, szServiceName2_UnoControlContainer );
-        registerServices( xRegistryKey, "UnoControlContainerModel", szServiceName_UnoControlContainerModel, szServiceName2_UnoControlContainerModel );
-        registerServices( xRegistryKey, "StdTabController", szServiceName_TabController, szServiceName2_TabController );
-        registerServices( xRegistryKey, "StdTabControllerModel", szServiceName_TabControllerModel, szServiceName2_TabControllerModel );
-        registerServices( xRegistryKey, "UnoDialogControl", szServiceName_UnoControlDialog, szServiceName2_UnoControlDialog );
-        registerServices( xRegistryKey, "UnoControlDialogModel", szServiceName_UnoControlDialogModel, szServiceName2_UnoControlDialogModel );
-        registerServices( xRegistryKey, "UnoEditControl", szServiceName_UnoControlEdit, szServiceName2_UnoControlEdit );
-        registerServices( xRegistryKey, "UnoControlEditModel", szServiceName_UnoControlEditModel, szServiceName2_UnoControlEditModel );
-        registerServices( xRegistryKey, "UnoDateFieldControl", szServiceName_UnoControlDateField, szServiceName2_UnoControlDateField );
-        registerServices( xRegistryKey, "UnoControlDateFieldModel", szServiceName_UnoControlDateFieldModel, szServiceName2_UnoControlDateFieldModel );
-        registerServices( xRegistryKey, "UnoTimeFieldControl", szServiceName_UnoControlTimeField, szServiceName2_UnoControlTimeField );
-        registerServices( xRegistryKey, "UnoControlTimeFieldModel", szServiceName_UnoControlTimeFieldModel, szServiceName2_UnoControlTimeFieldModel );
-        registerServices( xRegistryKey, "UnoNumericFieldControl", szServiceName_UnoControlNumericField, szServiceName2_UnoControlNumericField );
-        registerServices( xRegistryKey, "UnoControlNumericFieldModel", szServiceName_UnoControlNumericFieldModel, szServiceName2_UnoControlNumericFieldModel );
-        registerServices( xRegistryKey, "UnoCurrencyFieldControl", szServiceName_UnoControlCurrencyField, szServiceName2_UnoControlCurrencyField );
-        registerServices( xRegistryKey, "UnoControlCurrencyFieldModel", szServiceName_UnoControlCurrencyFieldModel, szServiceName2_UnoControlCurrencyFieldModel );
-        registerServices( xRegistryKey, "UnoPatternFieldControl", szServiceName_UnoControlPatternField, szServiceName2_UnoControlPatternField );
-        registerServices( xRegistryKey, "UnoControlPatternFieldModel", szServiceName_UnoControlPatternFieldModel, szServiceName2_UnoControlPatternFieldModel );
-        registerServices( xRegistryKey, "UnoFormattedFieldControl", szServiceName_UnoControlFormattedField, szServiceName2_UnoControlFormattedField );
-        registerServices( xRegistryKey, "UnoControlFormattedFieldModel", szServiceName_UnoControlFormattedFieldModel, szServiceName2_UnoControlFormattedFieldModel );
-        registerServices( xRegistryKey, "UnoFileControl", szServiceName_UnoControlFileControl, szServiceName2_UnoControlFileControl );
-        registerServices( xRegistryKey, "UnoControlFileControlModel", szServiceName_UnoControlFileControlModel, szServiceName2_UnoControlFileControlModel );
-        registerServices( xRegistryKey, "UnoButtonControl", szServiceName_UnoControlButton, szServiceName2_UnoControlButton );
-        registerServices( xRegistryKey, "UnoControlButtonModel", szServiceName_UnoControlButtonModel, szServiceName2_UnoControlButtonModel );
-        registerServices( xRegistryKey, "UnoImageControlControl", szServiceName_UnoControlImageButton, szServiceName2_UnoControlImageButton );
-        registerServices( xRegistryKey, "UnoControlImageControlModel", szServiceName_UnoControlImageButtonModel, szServiceName2_UnoControlImageButtonModel );
-        registerServices( xRegistryKey, "UnoImageControlControl", szServiceName_UnoControlImageControl, szServiceName2_UnoControlImageControl );
-        registerServices( xRegistryKey, "UnoControlImageControlModel", szServiceName_UnoControlImageControlModel, szServiceName2_UnoControlImageControlModel );
-        registerServices( xRegistryKey, "UnoRadioButtonControl", szServiceName_UnoControlRadioButton, szServiceName2_UnoControlRadioButton );
-        registerServices( xRegistryKey, "UnoControlRadioButtonModel", szServiceName_UnoControlRadioButtonModel, szServiceName2_UnoControlRadioButtonModel );
-        registerServices( xRegistryKey, "UnoCheckBoxControl", szServiceName_UnoControlCheckBox, szServiceName2_UnoControlCheckBox );
-        registerServices( xRegistryKey, "UnoControlCheckBoxModel", szServiceName_UnoControlCheckBoxModel, szServiceName2_UnoControlCheckBoxModel );
-        registerServices( xRegistryKey, "UnoListBoxControl", szServiceName_UnoControlListBox, szServiceName2_UnoControlListBox );
-        registerServices( xRegistryKey, "UnoControlListBoxModel", szServiceName_UnoControlListBoxModel, szServiceName2_UnoControlListBoxModel );
-        registerServices( xRegistryKey, "UnoComboBoxControl", szServiceName_UnoControlComboBox, szServiceName2_UnoControlComboBox );
-        registerServices( xRegistryKey, "UnoControlComboBoxModel", szServiceName_UnoControlComboBoxModel, szServiceName2_UnoControlComboBoxModel );
-        registerServices( xRegistryKey, "UnoFixedTextControl", szServiceName_UnoControlFixedText, szServiceName2_UnoControlFixedText );
-        registerServices( xRegistryKey, "UnoControlFixedTextModel", szServiceName_UnoControlFixedTextModel, szServiceName2_UnoControlFixedTextModel );
-        registerServices( xRegistryKey, "UnoGroupBoxControl", szServiceName_UnoControlGroupBox, szServiceName2_UnoControlGroupBox );
-        registerServices( xRegistryKey, "UnoControlGroupBoxModel", szServiceName_UnoControlGroupBoxModel, szServiceName2_UnoControlGroupBoxModel );
-        registerServices( xRegistryKey, "UnoProgressBarControl", szServiceName_UnoControlProgressBar, szServiceName2_UnoControlProgressBar );
-        registerServices( xRegistryKey, "UnoControlProgressBarModel", szServiceName_UnoControlProgressBarModel, szServiceName2_UnoControlProgressBarModel );
-        registerServices( xRegistryKey, "UnoScrollBarControl", szServiceName_UnoControlScrollBar, szServiceName2_UnoControlScrollBar );
-        registerServices( xRegistryKey, "UnoControlScrollBarModel", szServiceName_UnoControlScrollBarModel, szServiceName2_UnoControlScrollBarModel );
-        registerServices( xRegistryKey, "UnoSpinButtonModel", szServiceName_UnoSpinButtonModel );
-        registerServices( xRegistryKey, "UnoSpinButtonControl", szServiceName_UnoSpinButtonControl );
-        registerServices( xRegistryKey, "UnoFixedLineControl", szServiceName_UnoControlFixedLine, szServiceName2_UnoControlFixedLine );
-        registerServices( xRegistryKey, "UnoControlFixedLineModel", szServiceName_UnoControlFixedLineModel, szServiceName2_UnoControlFixedLineModel );
-        registerServices( xRegistryKey, "VCLXPrinterServer", szServiceName_PrinterServer, szServiceName2_PrinterServer );
-        registerServices( xRegistryKey, "UnoRoadmapControl", szServiceName_UnoControlRoadmap, szServiceName2_UnoControlRoadmap );
-        registerServices( xRegistryKey, "UnoControlRoadmapModel", szServiceName_UnoControlRoadmapModel, szServiceName2_UnoControlRoadmapModel );
-        registerServices( xRegistryKey, "TreeControl", szServiceName_TreeControl );
-        registerServices( xRegistryKey, "TreeControlModel", szServiceName_TreeControlModel );
-        registerServices( xRegistryKey, "MutableTreeDataModel", szServiceName_MutableTreeDataModel );
-        registerServices( xRegistryKey, "UnoSimpleAnimationControlModel", szServiceName_UnoSimpleAnimationControlModel, szServiceName2_UnoSimpleAnimationControlModel );
-        registerServices( xRegistryKey, "UnoSimpleAnimationControl", szServiceName_UnoSimpleAnimationControl, szServiceName2_UnoSimpleAnimationControl );
-        registerServices( xRegistryKey, "UnoThrobberControlModel", szServiceName_UnoThrobberControlModel, szServiceName2_UnoThrobberControlModel );
-        registerServices( xRegistryKey, "UnoThrobberControl", szServiceName_UnoThrobberControl, szServiceName2_UnoThrobberControl );
-        registerServices( xRegistryKey, "UnoFixedHyperlinkControl", szServiceName_UnoControlFixedHyperlink );
-        registerServices( xRegistryKey, "UnoControlFixedHyperlinkModel", szServiceName_UnoControlFixedHyperlinkModel );
-        registerServices( xRegistryKey, "GridControl", szServiceName_GridControl );
-        registerServices( xRegistryKey, "GridControlModel", szServiceName_GridControlModel );
-        registerServices( xRegistryKey, "DefaultGridDataModel", szServiceName_DefaultGridDataModel );
-        registerServices( xRegistryKey, "DefaultGridColumnModel", szServiceName_DefaultGridColumnModel );
-        registerServices( xRegistryKey, "GridColumn", szServiceName_GridColumn );
-
-        comp_AsyncCallback_component_writeInfo( _pServiceManager, _pRegistryKey );
-        comp_Layout_component_writeInfo( _pServiceManager, _pRegistryKey );
-
-        return sal_True;
-    }
-    return sal_False;
-}
-
 TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, void* _pRegistryKey )
 {
     void* pRet = NULL;
diff --git a/toolkit/source/layout/core/factory.cxx b/toolkit/source/layout/core/factory.cxx
index db9616a8cc77..1390d9405f71 100644
--- a/toolkit/source/layout/core/factory.cxx
+++ b/toolkit/source/layout/core/factory.cxx
@@ -57,33 +57,6 @@ void * SAL_CALL comp_Layout_component_getFactory( const char * pImplName, void *
         return pRet;
     }
 
-sal_Bool SAL_CALL comp_Layout_component_writeInfo( void * /*serviceManager*/, void * pRegistryKey )
-    {
-        if ( pRegistryKey )
-        {
-            try
-            {
-                uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) );
-                uno::Reference< registry::XRegistryKey >  xNewKey;
-
-                xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                                           LayoutFactory::impl_staticGetImplementationName() +
-                                           ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") )  );
-
-                const uno::Sequence< ::rtl::OUString > aServices = LayoutFactory::impl_staticGetSupportedServiceNames();
-                for ( sal_Int32 i = 0; i < aServices.getLength(); i++ )
-                    xNewKey->createKey( aServices.getConstArray()[i] );
-
-                return sal_True;
-            }
-            catch (registry::InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-        }
-        return sal_False;
-    }
-
 // Component registration
 ::rtl::OUString SAL_CALL LayoutFactory::impl_staticGetImplementationName()
 {
diff --git a/toolkit/util/makefile.mk b/toolkit/util/makefile.mk
index 48d534a8a9b3..2e9adce4f6bd 100644
--- a/toolkit/util/makefile.mk
+++ b/toolkit/util/makefile.mk
@@ -83,3 +83,11 @@ RESLIB1SRSFILES=$(RES1FILELIST)
 
 # --- Footer -------------------------------------------------------------
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/tk.component
+
+$(MISC)/tk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        tk.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt tk.component
diff --git a/toolkit/util/tk.component b/toolkit/util/tk.component
new file mode 100644
index 000000000000..e782283c39eb
--- /dev/null
+++ b/toolkit/util/tk.component
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.awt.comp.AsyncCallback">
+    <service name="com.sun.star.awt.AsyncCallback"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.awt.Layout">
+    <service name="com.sun.star.awt.Layout"/>
+    <service name="com.sun.star.comp.awt.Layout"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.DefaultGridColumnModel">
+    <service name="com.sun.star.awt.grid.DefaultGridColumnModel"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.DefaultGridDataModel">
+    <service name="com.sun.star.awt.grid.DefaultGridDataModel"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.GridColumn">
+    <service name="com.sun.star.awt.grid.GridColumn"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.GridControl">
+    <service name="com.sun.star.awt.grid.UnoControlGrid"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.GridControlModel">
+    <service name="com.sun.star.awt.grid.UnoControlGridModel"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.MutableTreeDataModel">
+    <service name="com.sun.star.awt.tree.MutableTreeDataModel"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.StdTabController">
+    <service name="com.sun.star.awt.TabController"/>
+    <service name="stardiv.vcl.control.TabController"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.StdTabControllerModel">
+    <service name="com.sun.star.awt.TabControllerModel"/>
+    <service name="stardiv.vcl.controlmodel.TabController"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.TreeControl">
+    <service name="com.sun.star.awt.tree.TreeControl"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.TreeControlModel">
+    <service name="com.sun.star.awt.tree.TreeControlModel"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoButtonControl">
+    <service name="com.sun.star.awt.UnoControlButton"/>
+    <service name="stardiv.vcl.control.Button"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoCheckBoxControl">
+    <service name="com.sun.star.awt.UnoControlCheckBox"/>
+    <service name="stardiv.vcl.control.CheckBox"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoComboBoxControl">
+    <service name="com.sun.star.awt.UnoControlComboBox"/>
+    <service name="stardiv.vcl.control.ComboBox"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlButtonModel">
+    <service name="com.sun.star.awt.UnoControlButtonModel"/>
+    <service name="stardiv.vcl.controlmodel.Button"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlCheckBoxModel">
+    <service name="com.sun.star.awt.UnoControlCheckBoxModel"/>
+    <service name="stardiv.vcl.controlmodel.CheckBox"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlComboBoxModel">
+    <service name="com.sun.star.awt.UnoControlComboBoxModel"/>
+    <service name="stardiv.vcl.controlmodel.ComboBox"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlContainer">
+    <service name="com.sun.star.awt.UnoControlContainer"/>
+    <service name="stardiv.vcl.control.ControlContainer"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlContainerModel">
+    <service name="com.sun.star.awt.UnoControlContainerModel"/>
+    <service name="stardiv.vcl.controlmodel.ControlContainer"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlCurrencyFieldModel">
+    <service name="com.sun.star.awt.UnoControlCurrencyFieldModel"/>
+    <service name="stardiv.vcl.controlmodel.CurrencyField"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlDateFieldModel">
+    <service name="com.sun.star.awt.UnoControlDateFieldModel"/>
+    <service name="stardiv.vcl.controlmodel.DateField"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlDialogModel">
+    <service name="com.sun.star.awt.UnoControlDialogModel"/>
+    <service name="stardiv.vcl.controlmodel.Dialog"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlEditModel">
+    <service name="com.sun.star.awt.UnoControlEditModel"/>
+    <service name="stardiv.vcl.controlmodel.Edit"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlFileControlModel">
+    <service name="com.sun.star.awt.UnoControlFileControlModel"/>
+    <service name="stardiv.vcl.controlmodel.FileControl"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlFixedHyperlinkModel">
+    <service name="com.sun.star.awt.UnoControlFixedHyperlinkModel"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlFixedLineModel">
+    <service name="com.sun.star.awt.UnoControlFixedLineModel"/>
+    <service name="stardiv.vcl.controlmodel.FixedLine"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlFixedTextModel">
+    <service name="com.sun.star.awt.UnoControlFixedTextModel"/>
+    <service name="stardiv.vcl.controlmodel.FixedText"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlFormattedFieldModel">
+    <service name="com.sun.star.awt.UnoControlFormattedFieldModel"/>
+    <service name="stardiv.vcl.controlmodel.FormattedField"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlGroupBoxModel">
+    <service name="com.sun.star.awt.UnoControlGroupBoxModel"/>
+    <service name="stardiv.vcl.controlmodel.GroupBox"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlImageControlModel">
+    <service name="com.sun.star.awt.UnoControlImageButtonModel"/>
+    <service name="com.sun.star.awt.UnoControlImageControlModel"/>
+    <service name="stardiv.vcl.controlmodel.ImageButton"/>
+    <service name="stardiv.vcl.controlmodel.ImageControl"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlListBoxModel">
+    <service name="com.sun.star.awt.UnoControlListBoxModel"/>
+    <service name="stardiv.vcl.controlmodel.ListBox"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlNumericFieldModel">
+    <service name="com.sun.star.awt.UnoControlNumericFieldModel"/>
+    <service name="stardiv.vcl.controlmodel.NumericField"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlPatternFieldModel">
+    <service name="com.sun.star.awt.UnoControlPatternFieldModel"/>
+    <service name="stardiv.vcl.controlmodel.PatternField"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlProgressBarModel">
+    <service name="com.sun.star.awt.UnoControlProgressBarModel"/>
+    <service name="stardiv.vcl.controlmodel.ProgressBar"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlRadioButtonModel">
+    <service name="com.sun.star.awt.UnoControlRadioButtonModel"/>
+    <service name="stardiv.vcl.controlmodel.RadioButton"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlRoadmapModel">
+    <service name="com.sun.star.awt.UnoControlRoadmapModel"/>
+    <service name="stardiv.vcl.controlmodel.Roadmap"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlScrollBarModel">
+    <service name="com.sun.star.awt.UnoControlScrollBarModel"/>
+    <service name="stardiv.vcl.controlmodel.ScrollBar"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoControlTimeFieldModel">
+    <service name="com.sun.star.awt.UnoControlTimeFieldModel"/>
+    <service name="stardiv.vcl.controlmodel.TimeField"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoCurrencyFieldControl">
+    <service name="com.sun.star.awt.UnoControlCurrencyField"/>
+    <service name="stardiv.vcl.control.CurrencyField"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoDateFieldControl">
+    <service name="com.sun.star.awt.UnoControlDateField"/>
+    <service name="stardiv.vcl.control.DateField"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoDialogControl">
+    <service name="com.sun.star.awt.UnoControlDialog"/>
+    <service name="stardiv.vcl.control.Dialog"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoEditControl">
+    <service name="com.sun.star.awt.UnoControlEdit"/>
+    <service name="stardiv.vcl.control.Edit"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoFileControl">
+    <service name="com.sun.star.awt.UnoControlFileControl"/>
+    <service name="stardiv.vcl.control.FileControl"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoFixedHyperlinkControl">
+    <service name="com.sun.star.awt.UnoControlFixedHyperlink"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoFixedLineControl">
+    <service name="com.sun.star.awt.UnoControlFixedLine"/>
+    <service name="stardiv.vcl.control.FixedLine"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoFixedTextControl">
+    <service name="com.sun.star.awt.UnoControlFixedText"/>
+    <service name="stardiv.vcl.control.FixedText"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoFormattedFieldControl">
+    <service name="com.sun.star.awt.UnoControlFormattedField"/>
+    <service name="stardiv.vcl.control.FormattedField"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoGroupBoxControl">
+    <service name="com.sun.star.awt.UnoControlGroupBox"/>
+    <service name="stardiv.vcl.control.GroupBox"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoImageControlControl">
+    <service name="com.sun.star.awt.UnoControlImageButton"/>
+    <service name="com.sun.star.awt.UnoControlImageControl"/>
+    <service name="stardiv.vcl.control.ImageButton"/>
+    <service name="stardiv.vcl.control.ImageControl"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoListBoxControl">
+    <service name="com.sun.star.awt.UnoControlListBox"/>
+    <service name="stardiv.vcl.control.ListBox"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoNumericFieldControl">
+    <service name="com.sun.star.awt.UnoControlNumericField"/>
+    <service name="stardiv.vcl.control.NumericField"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoPatternFieldControl">
+    <service name="com.sun.star.awt.UnoControlPatternField"/>
+    <service name="stardiv.vcl.control.PatternField"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoProgressBarControl">
+    <service name="com.sun.star.awt.UnoControlProgressBar"/>
+    <service name="stardiv.vcl.control.ProgressBar"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoRadioButtonControl">
+    <service name="com.sun.star.awt.UnoControlRadioButton"/>
+    <service name="stardiv.vcl.control.RadioButton"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoRoadmapControl">
+    <service name="com.sun.star.awt.UnoControlRoadmap"/>
+    <service name="stardiv.vcl.control.Roadmap"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoScrollBarControl">
+    <service name="com.sun.star.awt.UnoControlScrollBar"/>
+    <service name="stardiv.vcl.control.ScrollBar"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoSimpleAnimationControl">
+    <service name="com.sun.star.awt.UnoControlSimpleAnimation"/>
+    <service name="com.sun.star.awt.UnoSimpleAnimationControl"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoSimpleAnimationControlModel">
+    <service name="com.sun.star.awt.UnoControlSimpleAnimationModel"/>
+    <service name="com.sun.star.awt.UnoSimpleAnimationControlModel"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoSpinButtonControl">
+    <service name="com.sun.star.awt.UnoControlSpinButton"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoSpinButtonModel">
+    <service name="com.sun.star.awt.UnoControlSpinButtonModel"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoThrobberControl">
+    <service name="com.sun.star.awt.UnoControlThrobber"/>
+    <service name="com.sun.star.awt.UnoThrobberControl"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoThrobberControlModel">
+    <service name="com.sun.star.awt.UnoControlThrobberModel"/>
+    <service name="com.sun.star.awt.UnoThrobberControlModel"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.UnoTimeFieldControl">
+    <service name="com.sun.star.awt.UnoControlTimeField"/>
+    <service name="stardiv.vcl.control.TimeField"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.VCLXMenuBar">
+    <service name="com.sun.star.awt.MenuBar"/>
+    <service name="stardiv.vcl.MenuBar"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.VCLXPointer">
+    <service name="com.sun.star.awt.Pointer"/>
+    <service name="stardiv.vcl.Pointer"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.VCLXPopupMenu">
+    <service name="com.sun.star.awt.PopupMenu"/>
+    <service name="stardiv.vcl.PopupMenu"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.VCLXPrinterServer">
+    <service name="com.sun.star.awt.PrinterServer"/>
+    <service name="stardiv.vcl.PrinterServer"/>
+  </implementation>
+  <implementation name="stardiv.Toolkit.VCLXToolkit">
+    <service name="com.sun.star.awt.Toolkit"/>
+    <service name="stardiv.vcl.VclToolkit"/>
+  </implementation>
+</component>