tk: Constructor feature for unocontrols.cxx.

Change-Id: Ia7bae618724f3d16774a3a7794d0ae59fb79cfc6

3 files changed, 348 insertions, 116 deletions

diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 3a4c59ab4af2..bc7e6ad43c71 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -169,6 +169,13 @@ uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInf
     return xInfo;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlEditModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlEditModel(context));
+}
 
 //  ----------------------------------------------------
 //  class UnoEditControl
@@ -488,6 +495,14 @@ uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames() throw(uno::
     return aNames;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoEditControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoEditControl());
+}
+
 //  ----------------------------------------------------
 //  class UnoControlFileControlModel
 //  ----------------------------------------------------
@@ -548,6 +563,14 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropert
     return xInfo;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlFileControlModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlFileControlModel(context));
+}
+
 //  ----------------------------------------------------
 //  class UnoFileControl
 //  ----------------------------------------------------
@@ -561,6 +584,14 @@ OUString UnoFileControl::GetComponentServiceName()
     return OUString("filecontrol");
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoFileControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoFileControl());
+}
+
 //  ----------------------------------------------------
 //  class GraphicControlModel
 //  ----------------------------------------------------
@@ -689,6 +720,14 @@ uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetI
     return xInfo;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlButtonModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlButtonModel(context));
+}
+
 //  ----------------------------------------------------
 //  class UnoButtonControl
 //  ----------------------------------------------------
@@ -829,6 +868,14 @@ awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(
     return Impl_calcAdjustedSize( rNewSize );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoButtonControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoButtonControl());
+}
+
 //  ----------------------------------------------------
 //  class UnoControlImageControlModel
 //  ----------------------------------------------------
@@ -911,6 +958,14 @@ void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal
     }
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlImageControlModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlImageControlModel(context));
+}
+
 //  ----------------------------------------------------
 //  class UnoImageControlControl
 //  ----------------------------------------------------
@@ -956,6 +1011,14 @@ awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize )
     return Impl_calcAdjustedSize( rNewSize );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoImageControlControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoImageControlControl());
+}
+
 //  ----------------------------------------------------
 //  class UnoControlRadioButtonModel
 //  ----------------------------------------------------
@@ -1002,7 +1065,13 @@ uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropert
     return xInfo;
 }
 
-
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlRadioButtonModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlRadioButtonModel(context));
+}
 
 //  ----------------------------------------------------
 //  class UnoRadioButtonControl
@@ -1166,6 +1235,14 @@ awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) t
     return Impl_calcAdjustedSize( rNewSize );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoRadioButtonControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoRadioButtonControl());
+}
+
 //  ----------------------------------------------------
 //  class UnoControlCheckBoxModel
 //  ----------------------------------------------------
@@ -1212,7 +1289,13 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySe
     return xInfo;
 }
 
-
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlCheckBoxModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlCheckBoxModel(context));
+}
 
 //  ----------------------------------------------------
 //  class UnoCheckBoxControl
@@ -1351,6 +1434,14 @@ awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) thro
     return Impl_calcAdjustedSize( rNewSize );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoCheckBoxControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoCheckBoxControl());
+}
+
 //  ----------------------------------------------------
 //  class UnoControlFixedHyperlinkModel
 //  ----------------------------------------------------
@@ -1407,6 +1498,14 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedHyperlinkModel::getProp
     return xInfo;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlFixedHyperlinkModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlFixedHyperlinkModel(context));
+}
+
 //  ----------------------------------------------------
 //  class UnoFixedHyperlinkControl
 //  ----------------------------------------------------
@@ -1538,6 +1637,14 @@ void UnoFixedHyperlinkControl::removeActionListener(const uno::Reference< awt::X
     maActionListeners.removeInterface( l );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoFixedHyperlinkControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoFixedHyperlinkControl());
+}
+
 //  ----------------------------------------------------
 //  class UnoControlFixedTextModel
 //  ----------------------------------------------------
@@ -1588,6 +1695,13 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedTextModel::getPropertyS
     return xInfo;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlFixedTextModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlFixedTextModel(context));
+}
 
 //  ----------------------------------------------------
 //  class UnoFixedTextControl
@@ -1670,6 +1784,14 @@ awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize ) thr
     return Impl_calcAdjustedSize( rNewSize );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoFixedTextControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoFixedTextControl());
+}
+
 //  ----------------------------------------------------
 //  class UnoControlGroupBoxModel
 //  ----------------------------------------------------
@@ -1722,6 +1844,14 @@ uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySe
     return xInfo;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlGroupBoxModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlGroupBoxModel(context));
+}
+
 //  ----------------------------------------------------
 //  class UnoGroupBoxControl
 //  ----------------------------------------------------
@@ -1742,6 +1872,14 @@ sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException)
     return sal_True;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoGroupBoxControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoGroupBoxControl());
+}
+
 // =====================================================================================================================
 // = UnoControlListBoxModel_Data
 // =====================================================================================================================
@@ -2288,6 +2426,14 @@ void UnoControlListBoxModel::impl_notifyItemListEvent_nolck( const sal_Int32 i_n
     m_aItemListListeners.notifyEach( NotificationMethod, aEvent );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlListBoxModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlListBoxModel(context));
+}
+
 //  ----------------------------------------------------
 //  class UnoListBoxControl
 //  ----------------------------------------------------
@@ -2712,6 +2858,14 @@ void SAL_CALL UnoListBoxControl::itemListChanged( const lang::EventObject& i_rEv
         xPeerListener->itemListChanged( i_rEvent );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoListBoxControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoListBoxControl());
+}
+
 //  ----------------------------------------------------
 //  class UnoControlComboBoxModel
 //  ----------------------------------------------------
@@ -2788,6 +2942,14 @@ uno::Any UnoControlComboBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
     return UnoControlModel::ImplGetDefaultValue( nPropId );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlComboBoxModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlComboBoxModel(context));
+}
+
 //  ----------------------------------------------------
 //  class UnoComboBoxControl
 //  ----------------------------------------------------
@@ -3101,6 +3263,13 @@ sal_Int16 UnoComboBoxControl::getDropDownLineCount() throw(uno::RuntimeException
     return ImplGetPropertyValue_INT16( BASEPROPERTY_LINECOUNT );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoComboBoxControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoComboBoxControl());
+}
 
 //  ----------------------------------------------------
 //  UnoSpinFieldControl
@@ -3238,7 +3407,13 @@ uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertyS
     return xInfo;
 }
 
-
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlDateFieldModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlDateFieldModel(context));
+}
 
 //  ----------------------------------------------------
 //  class UnoDateFieldControl
@@ -3436,6 +3611,14 @@ sal_Bool UnoDateFieldControl::isStrictFormat() throw(uno::RuntimeException)
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoDateFieldControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoDateFieldControl());
+}
+
 //  ----------------------------------------------------
 //  class UnoControlTimeFieldModel
 //  ----------------------------------------------------
@@ -3480,7 +3663,13 @@ uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertyS
     return xInfo;
 }
 
-
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlTimeFieldModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlTimeFieldModel(context));
+}
 
 //  ----------------------------------------------------
 //  class UnoTimeFieldControl
@@ -3637,6 +3826,14 @@ sal_Bool UnoTimeFieldControl::isStrictFormat() throw(uno::RuntimeException)
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoTimeFieldControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoTimeFieldControl());
+}
+
 //  ----------------------------------------------------
 //  class UnoControlNumericFieldModel
 //  ----------------------------------------------------
@@ -3681,7 +3878,13 @@ uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getProper
     return xInfo;
 }
 
-
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlNumericFieldModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlNumericFieldModel(context));
+}
 
 //  ----------------------------------------------------
 //  class UnoNumericFieldControl
@@ -3835,6 +4038,14 @@ sal_Int16 UnoNumericFieldControl::getDecimalDigits() throw(uno::RuntimeException
     return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoNumericFieldControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoNumericFieldControl());
+}
+
 //  ----------------------------------------------------
 //  class UnoControlCurrencyFieldModel
 //  ----------------------------------------------------
@@ -3885,6 +4096,14 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPrope
     return xInfo;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlCurrencyFieldModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlCurrencyFieldModel(context));
+}
+
 //  ----------------------------------------------------
 //  class UnoCurrencyFieldControl
 //  ----------------------------------------------------
@@ -4036,6 +4255,14 @@ sal_Int16 UnoCurrencyFieldControl::getDecimalDigits() throw(uno::RuntimeExceptio
     return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoCurrencyFieldControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoCurrencyFieldControl());
+}
+
 //  ----------------------------------------------------
 //  class UnoControlPatternFieldModel
 //  ----------------------------------------------------
@@ -4079,6 +4306,13 @@ uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getProper
     return xInfo;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlPatternFieldModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlPatternFieldModel(context));
+}
 
 //  ----------------------------------------------------
 //  class UnoPatternFieldControl
@@ -4169,6 +4403,13 @@ sal_Bool UnoPatternFieldControl::isStrictFormat() throw(uno::RuntimeException)
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoPatternFieldControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoPatternFieldControl());
+}
 
 //  ----------------------------------------------------
 //  class UnoControlProgressBarModel
@@ -4226,6 +4467,13 @@ uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropert
     return xInfo;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlProgressBarModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlProgressBarModel(context));
+}
 
 //  ----------------------------------------------------
 //  class UnoProgressBarControl
@@ -4303,6 +4551,13 @@ sal_Int32 UnoProgressBarControl::getValue() throw(::com::sun::star::uno::Runtime
     return ImplGetPropertyValue_INT32( BASEPROPERTY_PROGRESSVALUE );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoProgressBarControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoProgressBarControl());
+}
 
 //  ----------------------------------------------------
 //  class UnoControlFixedLineModel
@@ -4356,6 +4611,14 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertyS
     return xInfo;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlFixedLineModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlFixedLineModel(context));
+}
+
 //  ----------------------------------------------------
 //  class UnoFixedLineControl
 //  ----------------------------------------------------
@@ -4376,4 +4639,12 @@ sal_Bool UnoFixedLineControl::isTransparent() throw(uno::RuntimeException)
     return sal_True;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoFixedLineControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoFixedLineControl());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index b49c20a261dc..20ca8952c6d9 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/registerservices.cxx
@@ -31,7 +31,6 @@
 #include <toolkit/awt/vclxmenu.hxx>
 #include <toolkit/awt/vclxpointer.hxx>
 #include <toolkit/awt/vclxprinter.hxx>
-#include <toolkit/controls/unocontrols.hxx>
 #include <toolkit/controls/dialogcontrol.hxx>
 #include <toolkit/controls/unocontrolcontainer.hxx>
 #include <toolkit/controls/unocontrolcontainermodel.hxx>
@@ -105,54 +104,18 @@ using namespace toolkit;
 IMPL_CREATEINSTANCE( VCLXToolkit )
 IMPL_CREATEINSTANCE( StdTabController )
 IMPL_CREATEINSTANCE( StdTabControllerModel )
-IMPL_CREATEINSTANCE( UnoButtonControl )
-IMPL_CREATEINSTANCE( UnoCheckBoxControl )
-IMPL_CREATEINSTANCE( UnoComboBoxControl )
-IMPL_CREATEINSTANCE_CTX( UnoControlButtonModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlCheckBoxModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlComboBoxModel )
 IMPL_CREATEINSTANCE( UnoControlContainer )
 IMPL_CREATEINSTANCE_CTX( UnoControlContainerModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlCurrencyFieldModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlDateFieldModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlEditModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlFileControlModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlFixedHyperlinkModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlFixedTextModel )
 IMPL_CREATEINSTANCE_CTX( UnoControlFormattedFieldModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlGroupBoxModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlImageControlModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlListBoxModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlNumericFieldModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlPatternFieldModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlRadioButtonModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlTimeFieldModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlProgressBarModel )
 IMPL_CREATEINSTANCE_CTX( UnoControlScrollBarModel )
 IMPL_CREATEINSTANCE_CTX( UnoSpinButtonModel )
 IMPL_CREATEINSTANCE_CTX( UnoMultiPageModel )
 IMPL_CREATEINSTANCE_CTX( UnoPageModel )
 IMPL_CREATEINSTANCE_CTX( UnoFrameModel )
-IMPL_CREATEINSTANCE_CTX( UnoControlFixedLineModel )
-IMPL_CREATEINSTANCE( UnoCurrencyFieldControl )
-IMPL_CREATEINSTANCE( UnoDateFieldControl )
 IMPL_CREATEINSTANCE_CTX( UnoDialogControl )
-IMPL_CREATEINSTANCE( UnoEditControl )
-IMPL_CREATEINSTANCE( UnoFileControl )
-IMPL_CREATEINSTANCE( UnoFixedHyperlinkControl )
-IMPL_CREATEINSTANCE( UnoFixedTextControl )
 IMPL_CREATEINSTANCE( UnoFormattedFieldControl )
-IMPL_CREATEINSTANCE( UnoGroupBoxControl )
-IMPL_CREATEINSTANCE( UnoImageControlControl )
-IMPL_CREATEINSTANCE( UnoListBoxControl )
-IMPL_CREATEINSTANCE( UnoNumericFieldControl )
-IMPL_CREATEINSTANCE( UnoPatternFieldControl )
-IMPL_CREATEINSTANCE( UnoRadioButtonControl )
-IMPL_CREATEINSTANCE( UnoTimeFieldControl )
-IMPL_CREATEINSTANCE( UnoProgressBarControl )
 IMPL_CREATEINSTANCE( UnoScrollBarControl )
 IMPL_CREATEINSTANCE( UnoSpinButtonControl )
-IMPL_CREATEINSTANCE( UnoFixedLineControl )
 IMPL_CREATEINSTANCE_CTX( UnoMultiPageControl )
 IMPL_CREATEINSTANCE_CTX( UnoPageControl )
 IMPL_CREATEINSTANCE_CTX( UnoFrameControl )
@@ -186,46 +149,10 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL tk_component_getFactory( const sal_Char* sImple
         GET_FACTORY( StdTabController, szServiceName_TabController, szServiceName2_TabController )
         GET_FACTORY( StdTabControllerModel, szServiceName_TabControllerModel, szServiceName2_TabControllerModel )
         GET_FACTORY( UnoDialogControl, szServiceName_UnoControlDialog, szServiceName2_UnoControlDialog )
-        GET_FACTORY( UnoEditControl, szServiceName_UnoControlEdit, szServiceName2_UnoControlEdit )
-        GET_FACTORY( UnoControlEditModel, szServiceName_UnoControlEditModel, szServiceName2_UnoControlEditModel )
-        GET_FACTORY( UnoDateFieldControl, szServiceName_UnoControlDateField, szServiceName2_UnoControlDateField )
-        GET_FACTORY( UnoControlDateFieldModel, szServiceName_UnoControlDateFieldModel, szServiceName2_UnoControlDateFieldModel )
-        GET_FACTORY( UnoTimeFieldControl, szServiceName_UnoControlTimeField, szServiceName2_UnoControlTimeField )
-        GET_FACTORY( UnoControlTimeFieldModel, szServiceName_UnoControlTimeFieldModel, szServiceName2_UnoControlTimeFieldModel )
-        GET_FACTORY( UnoNumericFieldControl, szServiceName_UnoControlNumericField, szServiceName2_UnoControlNumericField )
-        GET_FACTORY( UnoControlNumericFieldModel, szServiceName_UnoControlNumericFieldModel, szServiceName2_UnoControlNumericFieldModel )
-        GET_FACTORY( UnoCurrencyFieldControl, szServiceName_UnoControlCurrencyField, szServiceName2_UnoControlCurrencyField )
-        GET_FACTORY( UnoControlCurrencyFieldModel, szServiceName_UnoControlCurrencyFieldModel, szServiceName2_UnoControlCurrencyFieldModel )
-        GET_FACTORY( UnoPatternFieldControl, szServiceName_UnoControlPatternField, szServiceName2_UnoControlPatternField )
-        GET_FACTORY( UnoControlPatternFieldModel, szServiceName_UnoControlPatternFieldModel, szServiceName2_UnoControlPatternFieldModel )
         GET_FACTORY( UnoFormattedFieldControl, szServiceName_UnoControlFormattedField, szServiceName2_UnoControlFormattedField )
         GET_FACTORY( UnoControlFormattedFieldModel, szServiceName_UnoControlFormattedFieldModel, szServiceName2_UnoControlFormattedFieldModel )
-        GET_FACTORY( UnoFileControl, szServiceName_UnoControlFileControl, szServiceName2_UnoControlFileControl )
-        GET_FACTORY( UnoControlFileControlModel, szServiceName_UnoControlFileControlModel, szServiceName2_UnoControlFileControlModel )
-        GET_FACTORY( UnoButtonControl, szServiceName_UnoControlButton, szServiceName2_UnoControlButton )
-        GET_FACTORY( UnoControlButtonModel, szServiceName_UnoControlButtonModel, szServiceName2_UnoControlButtonModel )
-        GET_FACTORY( UnoImageControlControl, szServiceName_UnoControlImageButton, szServiceName2_UnoControlImageButton )
-        GET_FACTORY( UnoControlImageControlModel, szServiceName_UnoControlImageButtonModel, szServiceName2_UnoControlImageButtonModel )
-        GET_FACTORY( UnoImageControlControl, szServiceName_UnoControlImageControl, szServiceName2_UnoControlImageControl )
-        GET_FACTORY( UnoControlImageControlModel, szServiceName_UnoControlImageControlModel, szServiceName2_UnoControlImageControlModel )
-        GET_FACTORY( UnoRadioButtonControl, szServiceName_UnoControlRadioButton, szServiceName2_UnoControlRadioButton )
-        GET_FACTORY( UnoControlRadioButtonModel, szServiceName_UnoControlRadioButtonModel, szServiceName2_UnoControlRadioButtonModel )
-        GET_FACTORY( UnoCheckBoxControl, szServiceName_UnoControlCheckBox, szServiceName2_UnoControlCheckBox )
-        GET_FACTORY( UnoControlCheckBoxModel, szServiceName_UnoControlCheckBoxModel, szServiceName2_UnoControlCheckBoxModel )
-        GET_FACTORY( UnoListBoxControl, szServiceName_UnoControlListBox, szServiceName2_UnoControlListBox )
-        GET_FACTORY( UnoControlListBoxModel, szServiceName_UnoControlListBoxModel, szServiceName2_UnoControlListBoxModel )
-        GET_FACTORY( UnoComboBoxControl, szServiceName_UnoControlComboBox, szServiceName2_UnoControlComboBox )
-        GET_FACTORY( UnoControlComboBoxModel, szServiceName_UnoControlComboBoxModel, szServiceName2_UnoControlComboBoxModel )
-        GET_FACTORY( UnoFixedTextControl, szServiceName_UnoControlFixedText, szServiceName2_UnoControlFixedText )
-        GET_FACTORY( UnoControlFixedTextModel, szServiceName_UnoControlFixedTextModel, szServiceName2_UnoControlFixedTextModel )
-        GET_FACTORY( UnoGroupBoxControl, szServiceName_UnoControlGroupBox, szServiceName2_UnoControlGroupBox )
-        GET_FACTORY( UnoControlGroupBoxModel, szServiceName_UnoControlGroupBoxModel, szServiceName2_UnoControlGroupBoxModel )
-        GET_FACTORY( UnoProgressBarControl, szServiceName_UnoControlProgressBar, szServiceName2_UnoControlProgressBar )
-        GET_FACTORY( UnoControlProgressBarModel, szServiceName_UnoControlProgressBarModel, szServiceName2_UnoControlProgressBarModel )
         GET_FACTORY( UnoScrollBarControl, szServiceName_UnoControlScrollBar, szServiceName2_UnoControlScrollBar )
         GET_FACTORY( UnoControlScrollBarModel, szServiceName_UnoControlScrollBarModel, szServiceName2_UnoControlScrollBarModel )
-        GET_FACTORY( UnoFixedLineControl, szServiceName_UnoControlFixedLine, szServiceName2_UnoControlFixedLine )
-        GET_FACTORY( UnoControlFixedLineModel, szServiceName_UnoControlFixedLineModel, szServiceName2_UnoControlFixedLineModel )
         GET_FACTORY( VCLXPrinterServer, szServiceName_PrinterServer, szServiceName2_PrinterServer )
         GET_FACTORY( UnoRoadmapControl, szServiceName_UnoControlRoadmap, szServiceName2_UnoControlRoadmap )
         GET_FACTORY( UnoControlRoadmapModel, szServiceName_UnoControlRoadmapModel, szServiceName2_UnoControlRoadmapModel )
@@ -238,8 +165,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL tk_component_getFactory( const sal_Char* sImple
         GET_FACTORY( UnoSpinButtonModel, szServiceName_UnoSpinButtonModel, NULL )
         GET_FACTORY( UnoSpinButtonControl, szServiceName_UnoSpinButtonControl, NULL )
         GET_FACTORY( MutableTreeDataModel, szServiceName_MutableTreeDataModel, NULL )
-        GET_FACTORY( UnoFixedHyperlinkControl, szServiceName_UnoControlFixedHyperlink, NULL )
-        GET_FACTORY( UnoControlFixedHyperlinkModel, szServiceName_UnoControlFixedHyperlinkModel, NULL )
     }
     return pRet;
 }
diff --git a/toolkit/util/tk.component b/toolkit/util/tk.component
index 291a1c09e8e5..ee1d376a7072 100644
--- a/toolkit/util/tk.component
+++ b/toolkit/util/tk.component
@@ -86,27 +86,33 @@
       constructor="stardiv_Toolkit_TreeControlModel_get_implementation">
     <service name="com.sun.star.awt.tree.TreeControlModel"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoButtonControl">
+  <implementation name="stardiv.Toolkit.UnoButtonControl"
+      constructor="stardiv_Toolkit_UnoButtonControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlButton"/>
     <service name="stardiv.vcl.control.Button"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoCheckBoxControl">
+  <implementation name="stardiv.Toolkit.UnoCheckBoxControl"
+      constructor="stardiv_Toolkit_UnoCheckBoxControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlCheckBox"/>
     <service name="stardiv.vcl.control.CheckBox"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoComboBoxControl">
+  <implementation name="stardiv.Toolkit.UnoComboBoxControl"
+      constructor="stardiv_Toolkit_UnoComboBoxControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlComboBox"/>
     <service name="stardiv.vcl.control.ComboBox"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlButtonModel">
+  <implementation name="stardiv.Toolkit.UnoControlButtonModel"
+      constructor="stardiv_Toolkit_UnoControlButtonModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlButtonModel"/>
     <service name="stardiv.vcl.controlmodel.Button"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlCheckBoxModel">
+  <implementation name="stardiv.Toolkit.UnoControlCheckBoxModel"
+      constructor="stardiv_Toolkit_UnoControlCheckBoxModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlCheckBoxModel"/>
     <service name="stardiv.vcl.controlmodel.CheckBox"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlComboBoxModel">
+  <implementation name="stardiv.Toolkit.UnoControlComboBoxModel"
+      constructor="stardiv_Toolkit_UnoControlComboBoxModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlComboBoxModel"/>
     <service name="stardiv.vcl.controlmodel.ComboBox"/>
   </implementation>
@@ -118,11 +124,13 @@
     <service name="com.sun.star.awt.UnoControlContainerModel"/>
     <service name="stardiv.vcl.controlmodel.ControlContainer"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlCurrencyFieldModel">
+  <implementation name="stardiv.Toolkit.UnoControlCurrencyFieldModel"
+      constructor="stardiv_Toolkit_UnoControlCurrencyFieldModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlCurrencyFieldModel"/>
     <service name="stardiv.vcl.controlmodel.CurrencyField"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlDateFieldModel">
+  <implementation name="stardiv.Toolkit.UnoControlDateFieldModel"
+      constructor="stardiv_Toolkit_UnoControlDateFieldModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlDateFieldModel"/>
     <service name="stardiv.vcl.controlmodel.DateField"/>
   </implementation>
@@ -131,22 +139,27 @@
     <service name="com.sun.star.awt.UnoControlDialogModel"/>
     <service name="stardiv.vcl.controlmodel.Dialog"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlEditModel">
+  <implementation name="stardiv.Toolkit.UnoControlEditModel"
+      constructor="stardiv_Toolkit_UnoControlEditModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlEditModel"/>
     <service name="stardiv.vcl.controlmodel.Edit"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlFileControlModel">
+  <implementation name="stardiv.Toolkit.UnoControlFileControlModel"
+      constructor="stardiv_Toolkit_UnoControlFileControlModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlFileControlModel"/>
     <service name="stardiv.vcl.controlmodel.FileControl"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlFixedHyperlinkModel">
+  <implementation name="stardiv.Toolkit.UnoControlFixedHyperlinkModel"
+      constructor="stardiv_Toolkit_UnoControlFixedHyperlinkModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlFixedHyperlinkModel"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlFixedLineModel">
+  <implementation name="stardiv.Toolkit.UnoControlFixedLineModel"
+      constructor="stardiv_Toolkit_UnoControlFixedLineModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlFixedLineModel"/>
     <service name="stardiv.vcl.controlmodel.FixedLine"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlFixedTextModel">
+  <implementation name="stardiv.Toolkit.UnoControlFixedTextModel"
+      constructor="stardiv_Toolkit_UnoControlFixedTextModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlFixedTextModel"/>
     <service name="stardiv.vcl.controlmodel.FixedText"/>
   </implementation>
@@ -154,33 +167,40 @@
     <service name="com.sun.star.awt.UnoControlFormattedFieldModel"/>
     <service name="stardiv.vcl.controlmodel.FormattedField"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlGroupBoxModel">
+  <implementation name="stardiv.Toolkit.UnoControlGroupBoxModel"
+      constructor="stardiv_Toolkit_UnoControlGroupBoxModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlGroupBoxModel"/>
     <service name="stardiv.vcl.controlmodel.GroupBox"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlImageControlModel">
+  <implementation name="stardiv.Toolkit.UnoControlImageControlModel"
+      constructor="stardiv_Toolkit_UnoControlImageControlModel_get_implementation">
     <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">
+  <implementation name="stardiv.Toolkit.UnoControlListBoxModel"
+      constructor="stardiv_Toolkit_UnoControlListBoxModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlListBoxModel"/>
     <service name="stardiv.vcl.controlmodel.ListBox"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlNumericFieldModel">
+  <implementation name="stardiv.Toolkit.UnoControlNumericFieldModel"
+      constructor="stardiv_Toolkit_UnoControlNumericFieldModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlNumericFieldModel"/>
     <service name="stardiv.vcl.controlmodel.NumericField"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlPatternFieldModel">
+  <implementation name="stardiv.Toolkit.UnoControlPatternFieldModel"
+      constructor="stardiv_Toolkit_UnoControlPatternFieldModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlPatternFieldModel"/>
     <service name="stardiv.vcl.controlmodel.PatternField"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlProgressBarModel">
+  <implementation name="stardiv.Toolkit.UnoControlProgressBarModel"
+      constructor="stardiv_Toolkit_UnoControlProgressBarModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlProgressBarModel"/>
     <service name="stardiv.vcl.controlmodel.ProgressBar"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlRadioButtonModel">
+  <implementation name="stardiv.Toolkit.UnoControlRadioButtonModel"
+      constructor="stardiv_Toolkit_UnoControlRadioButtonModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlRadioButtonModel"/>
     <service name="stardiv.vcl.controlmodel.RadioButton"/>
   </implementation>
@@ -192,15 +212,18 @@
     <service name="com.sun.star.awt.UnoControlScrollBarModel"/>
     <service name="stardiv.vcl.controlmodel.ScrollBar"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlTimeFieldModel">
+  <implementation name="stardiv.Toolkit.UnoControlTimeFieldModel"
+      constructor="stardiv_Toolkit_UnoControlTimeFieldModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlTimeFieldModel"/>
     <service name="stardiv.vcl.controlmodel.TimeField"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoCurrencyFieldControl">
+  <implementation name="stardiv.Toolkit.UnoCurrencyFieldControl"
+      constructor="stardiv_Toolkit_UnoCurrencyFieldControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlCurrencyField"/>
     <service name="stardiv.vcl.control.CurrencyField"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoDateFieldControl">
+  <implementation name="stardiv.Toolkit.UnoDateFieldControl"
+      constructor="stardiv_Toolkit_UnoDateFieldControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlDateField"/>
     <service name="stardiv.vcl.control.DateField"/>
   </implementation>
@@ -208,22 +231,27 @@
     <service name="com.sun.star.awt.UnoControlDialog"/>
     <service name="stardiv.vcl.control.Dialog"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoEditControl">
+  <implementation name="stardiv.Toolkit.UnoEditControl"
+      constructor="stardiv_Toolkit_UnoEditControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlEdit"/>
     <service name="stardiv.vcl.control.Edit"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoFileControl">
+  <implementation name="stardiv.Toolkit.UnoFileControl"
+      constructor="stardiv_Toolkit_UnoFileControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlFileControl"/>
     <service name="stardiv.vcl.control.FileControl"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoFixedHyperlinkControl">
+  <implementation name="stardiv.Toolkit.UnoFixedHyperlinkControl"
+      constructor="stardiv_Toolkit_UnoFixedHyperlinkControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlFixedHyperlink"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoFixedLineControl">
+  <implementation name="stardiv.Toolkit.UnoFixedLineControl"
+      constructor="stardiv_Toolkit_UnoFixedLineControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlFixedLine"/>
     <service name="stardiv.vcl.control.FixedLine"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoFixedTextControl">
+  <implementation name="stardiv.Toolkit.UnoFixedTextControl"
+      constructor="stardiv_Toolkit_UnoFixedTextControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlFixedText"/>
     <service name="stardiv.vcl.control.FixedText"/>
   </implementation>
@@ -231,33 +259,40 @@
     <service name="com.sun.star.awt.UnoControlFormattedField"/>
     <service name="stardiv.vcl.control.FormattedField"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoGroupBoxControl">
+  <implementation name="stardiv.Toolkit.UnoGroupBoxControl"
+      constructor="stardiv_Toolkit_UnoGroupBoxControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlGroupBox"/>
     <service name="stardiv.vcl.control.GroupBox"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoImageControlControl">
+  <implementation name="stardiv.Toolkit.UnoImageControlControl"
+      constructor="stardiv_Toolkit_UnoImageControlControl_get_implementation">
     <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">
+  <implementation name="stardiv.Toolkit.UnoListBoxControl"
+      constructor="stardiv_Toolkit_UnoListBoxControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlListBox"/>
     <service name="stardiv.vcl.control.ListBox"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoNumericFieldControl">
+  <implementation name="stardiv.Toolkit.UnoNumericFieldControl"
+      constructor="stardiv_Toolkit_UnoNumericFieldControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlNumericField"/>
     <service name="stardiv.vcl.control.NumericField"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoPatternFieldControl">
+  <implementation name="stardiv.Toolkit.UnoPatternFieldControl"
+      constructor="stardiv_Toolkit_UnoPatternFieldControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlPatternField"/>
     <service name="stardiv.vcl.control.PatternField"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoProgressBarControl">
+  <implementation name="stardiv.Toolkit.UnoProgressBarControl"
+      constructor="stardiv_Toolkit_UnoProgressBarControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlProgressBar"/>
     <service name="stardiv.vcl.control.ProgressBar"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoRadioButtonControl">
+  <implementation name="stardiv.Toolkit.UnoRadioButtonControl"
+      constructor="stardiv_Toolkit_UnoRadioButtonControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlRadioButton"/>
     <service name="stardiv.vcl.control.RadioButton"/>
   </implementation>
@@ -287,7 +322,8 @@
   <implementation name="stardiv.Toolkit.UnoSpinButtonModel">
     <service name="com.sun.star.awt.UnoControlSpinButtonModel"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoTimeFieldControl">
+  <implementation name="stardiv.Toolkit.UnoTimeFieldControl"
+      constructor="stardiv_Toolkit_UnoTimeFieldControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlTimeField"/>
     <service name="stardiv.vcl.control.TimeField"/>
   </implementation>