forms: use constructor feature for form modules

Change-Id: I8f1588cbd338e2f8b5bc6047d84b17c697a7d2d3

39 files changed, 439 insertions, 569 deletions

diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index a00f4d250d4e..0b595ad9c95c 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -31,7 +31,6 @@
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 
-
 namespace frm
 {
 
@@ -53,12 +52,6 @@ using ::com::sun::star::frame::XDispatchProviderInterceptor;
 //= OButtonModel
 
 
-InterfaceRef SAL_CALL OButtonModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OButtonModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 OButtonModel::OButtonModel(const Reference<XComponentContext>& _rxFactory)
     :OClickableImageBaseModel( _rxFactory, VCL_CONTROLMODEL_COMMANDBUTTON, FRM_SUN_CONTROL_COMMANDBUTTON )
                                     // use the old control name for compatibility reasons
@@ -334,12 +327,6 @@ void OButtonModel::impl_resetNoBroadcast_nothrow()
 // OButtonControl
 
 
-InterfaceRef SAL_CALL OButtonControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OButtonControl( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 Sequence<Type> OButtonControl::_getTypes()
 {
     return ::comphelper::concatSequences(
@@ -759,8 +746,20 @@ void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Referenc
     OFormNavigationHelper::releaseDispatchProviderInterceptor( _rxInterceptor );
 }
 
-
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OButtonModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OButtonModel(component));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OButtonControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OButtonControl(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index 89ef88f1cdee..2c3ff8ef81f9 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -24,7 +24,6 @@
 #include <comphelper/basicio.hxx>
 #include <comphelper/processfactory.hxx>
 
-
 namespace frm
 {
 using namespace ::com::sun::star::uno;
@@ -46,12 +45,6 @@ OCheckBoxControl::OCheckBoxControl(const Reference<XComponentContext>& _rxFactor
 }
 
 
-InterfaceRef SAL_CALL OCheckBoxControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OCheckBoxControl( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 StringSequence SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
@@ -65,15 +58,6 @@ StringSequence SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(::com
 
 //= OCheckBoxModel
 
-
-
-InterfaceRef SAL_CALL OCheckBoxModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OCheckBoxModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
-
 OCheckBoxModel::OCheckBoxModel(const Reference<XComponentContext>& _rxFactory)
     :OReferenceValueComponent( _rxFactory, VCL_CONTROLMODEL_CHECKBOX, FRM_SUN_CONTROL_CHECKBOX, true )
     // use the old control name for compytibility reasons
@@ -281,8 +265,20 @@ bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     return true;
 }
 
+}
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OCheckBoxModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OCheckBoxModel(component));
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OCheckBoxControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OCheckBoxControl(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 76bc4cfee15b..8d959ee01525 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -71,14 +71,6 @@ using namespace ::com::sun::star::form::binding;
 
 
 // class OComboBoxModel
-
-
-InterfaceRef SAL_CALL OComboBoxModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return (*new OComboBoxModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 Sequence<Type> OComboBoxModel::_getTypes()
 {
     return ::comphelper::concatSequences(
@@ -867,14 +859,6 @@ void SAL_CALL OComboBoxModel::disposing( const EventObject& _rSource ) throw ( R
 
 //= OComboBoxControl
 
-
-
-InterfaceRef SAL_CALL OComboBoxControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OComboBoxControl( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 OComboBoxControl::OComboBoxControl(const Reference<XComponentContext>& _rxContext)
     :OBoundControl(_rxContext, VCL_CONTROL_COMBOBOX)
 {
@@ -891,8 +875,20 @@ StringSequence SAL_CALL OComboBoxControl::getSupportedServiceNames() throw(Runti
     return aSupported;
 }
 
+}
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OComboBoxModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OComboBoxModel(component));
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OComboBoxControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OComboBoxControl(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index 80cf96a2f05c..cad851f66bd3 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -24,6 +24,7 @@
 #include <unotools/syslocale.hxx>
 #include <comphelper/processfactory.hxx>
 
+
 namespace frm
 {
 
@@ -44,13 +45,6 @@ OCurrencyControl::OCurrencyControl(const Reference<XComponentContext>& _rxFactor
 {
 }
 
-
-InterfaceRef SAL_CALL OCurrencyControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OCurrencyControl( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 Sequence<Type> OCurrencyControl::_getTypes()
 {
     return OBoundControl::_getTypes();
@@ -70,13 +64,6 @@ StringSequence SAL_CALL OCurrencyControl::getSupportedServiceNames() throw(std::
 
 // OCurrencyModel
 
-
-InterfaceRef SAL_CALL OCurrencyModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OCurrencyModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 Sequence<Type> OCurrencyModel::_getTypes()
 {
     return OEditBaseModel::_getTypes();
@@ -247,5 +234,18 @@ void OCurrencyModel::resetNoBroadcast()
 
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OCurrencyModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OCurrencyModel(component));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OCurrencyControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OCurrencyControl(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index eaf6ab99e534..d446d094812b 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -26,7 +26,6 @@
 
 using namespace dbtools;
 
-
 namespace frm
 {
 
@@ -51,12 +50,6 @@ ODateControl::ODateControl(const Reference<XComponentContext>& _rxFactory)
 }
 
 
-InterfaceRef SAL_CALL ODateControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new ODateControl( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 Sequence<Type> ODateControl::_getTypes()
 {
     return OBoundControl::_getTypes();
@@ -73,11 +66,6 @@ StringSequence SAL_CALL ODateControl::getSupportedServiceNames() throw(std::exce
     return aSupported;
 }
 
-InterfaceRef SAL_CALL ODateModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new ODateModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
 
 Sequence<Type> ODateModel::_getTypes()
 {
@@ -318,8 +306,20 @@ Sequence< Type > ODateModel::getSupportedBindingTypes()
     return Sequence< Type >( & cppu::UnoType<util::Date>::get(), 1 );
 }
 
-
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_ODateModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::ODateModel(component));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_ODateControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::ODateControl(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index e543fd6a56cc..8bd967e3c959 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -60,12 +60,6 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::form::binding;
 
 
-InterfaceRef SAL_CALL OEditControl_CreateInstance(const Reference< XMultiServiceFactory > & _rxFactory)
-{
-    return *(new OEditControl( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 Sequence<Type> OEditControl::_getTypes()
 {
     static Sequence<Type> aTypes;
@@ -269,11 +263,6 @@ void SAL_CALL OEditControl::createPeer( const Reference< XToolkit>& _rxToolkit,
     OBoundControl::createPeer(_rxToolkit, _rxParent);
 }
 
-InterfaceRef SAL_CALL OEditModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OEditModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
 
 Sequence<Type> OEditModel::_getTypes()
 {
@@ -734,8 +723,20 @@ Any OEditModel::getDefaultForReset() const
     return makeAny( m_aDefaultText );
 }
 
+}
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OEditModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OEditModel(component));
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OEditControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OEditControl(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index fb34214e6f6d..7656204de55d 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -31,8 +31,7 @@ struct ImplSVEvent;
 namespace frm
 {
 
-class OEditModel
-                :public OEditBaseModel
+class OEditModel : public OEditBaseModel
 {
     ::std::unique_ptr< ::dbtools::FormattedColumnValue >
                                 m_pValueFormatter;
@@ -40,11 +39,12 @@ class OEditModel
 
     bool                    m_bWritingFormattedFake : 1; // are we writing something which should be interpreted as formatted upon reading?
 
+public:
+    DECLARE_DEFAULT_LEAF_XTOR( OEditModel );
+
 protected:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE;
 
-    DECLARE_DEFAULT_LEAF_XTOR( OEditModel );
-
     void enableFormattedWriteFake() { m_bWritingFormattedFake = true; }
     void disableFormattedWriteFake() { m_bWritingFormattedFake = false; }
     bool lastReadWasFormattedFake() const { return (getLastReadVersion() & PF_FAKE_FORMATTED_FIELD) != 0; }
@@ -168,10 +168,8 @@ private:
     DECL_LINK( OnKeyPressed, void* );
 };
 
-
 }
 
-
 #endif // INCLUDED_FORMS_SOURCE_COMPONENT_EDIT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 0139720999ee..2c6f97df8460 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -47,12 +47,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
 
-InterfaceRef SAL_CALL OFileControlModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OFileControlModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 Sequence<Type> OFileControlModel::_getTypes()
 {
     static Sequence<Type> aTypes;
@@ -283,8 +277,13 @@ void OFileControlModel::_reset()
     }
 }
 
-
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OFileControlModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OFileControlModel(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index a13b78454f4a..53316db0e901 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -66,16 +66,8 @@
 #include <tools/wintypes.hxx>
 
 
-extern "C" void SAL_CALL createRegistryInfo_OFilterControl()
-{
-    static ::frm::OMultiInstanceAutoRegistration< ::frm::OFilterControl > aAutoRegistration;
-}
-
-
 namespace frm
 {
-
-
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::awt;
     using namespace ::com::sun::star::lang;
@@ -914,14 +906,18 @@ namespace frm
         return aNames;
     }
 
-
     Reference< XInterface > SAL_CALL OFilterControl::Create( const Reference< XMultiServiceFactory >& _rxFactory )
     {
         return static_cast< XServiceInfo* >( new OFilterControl( comphelper::getComponentContext(_rxFactory) ) );
     }
 
-
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_forms_OFilterControl_get_implementation(css::uno::XComponentContext* context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OFilterControl(context));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx
index 249eca88665f..ba34a7241bc5 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -23,6 +23,7 @@
 #include "property.hxx"
 #include <comphelper/processfactory.hxx>
 
+
 namespace frm
 {
 using namespace ::com::sun::star::uno;
@@ -38,13 +39,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
 
-InterfaceRef SAL_CALL OFixedTextModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OFixedTextModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
-
 OFixedTextModel::OFixedTextModel( const Reference<XComponentContext>& _rxFactory )
         :OControlModel(_rxFactory, VCL_CONTROLMODEL_FIXEDTEXT)
 
@@ -113,8 +107,13 @@ void SAL_CALL OFixedTextModel::read(const Reference<XObjectInputStream>& _rxInSt
         readHelpTextCompatibly(_rxInStream);
 }
 
-
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OFixedTextModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OFixedTextModel(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 1168206f5a77..61f009acac28 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -55,6 +55,8 @@
 #include <unotools/desktopterminationobserver.hxx>
 #include <list>
 #include <algorithm>
+
+
 using namespace dbtools;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdb;
@@ -68,12 +70,14 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::form::binding;
+
 namespace
 {
     typedef com::sun::star::util::Date UNODate;
     typedef com::sun::star::util::Time UNOTime;
     typedef com::sun::star::util::DateTime UNODateTime;
 }
+
 namespace frm
 {
 class StandardFormatsSupplier : protected SvNumberFormatsSupplierObj, public ::utl::ITerminationListener
@@ -144,10 +148,6 @@ void StandardFormatsSupplier::notifyTermination()
     SetNumberFormatter( NULL );
     DELETEZ( m_pMyPrivateFormatter );
 }
-InterfaceRef SAL_CALL OFormattedControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OFormattedControl( comphelper::getComponentContext(_rxFactory) ));
-}
 Sequence<Type> OFormattedControl::_getTypes()
 {
     return ::comphelper::concatSequences(
@@ -1039,6 +1039,14 @@ void OFormattedModel::resetNoBroadcast()
     OEditBaseModel::resetNoBroadcast();
     m_aSaveValue.clear();
 }
+
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OFormattedControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OFormattedControl(component));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index 32ba7bc2fc28..ed949e09a4a5 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -355,5 +355,18 @@ void OFormattedFieldWrapper::ensureAggregate()
 
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OFormattedFieldWrapper_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OFormattedFieldWrapper(component));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_form_OFormattedFieldWrapper_ForcedFormatted_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OFormattedFieldWrapper(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx
index 1ea2290bc940..7109d387804c 100644
--- a/forms/source/component/FormattedFieldWrapper.hxx
+++ b/forms/source/component/FormattedFieldWrapper.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 
-
 namespace frm
 {
 
@@ -42,6 +41,9 @@ class OFormattedFieldWrapper : public OFormattedFieldWrapper_Base
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext;
 
+public:
+    OFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory);
+
 protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation>      m_xAggregate;
 
@@ -54,9 +56,6 @@ protected:
     // ::read or does anything which requires a living aggregate
     static InterfaceRef createFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, bool bActAsFormatted);
 
-private:
-    OFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory);
-
 protected:
     virtual ~OFormattedFieldWrapper();
 
@@ -86,10 +85,8 @@ protected:
     void ensureAggregate();
 };
 
-
 }
 
-
 #endif // INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELDWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 78860c825fe0..524e1292363c 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -35,7 +35,9 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
+
 using namespace ::com::sun::star::uno;
+
 namespace frm
 {
 using namespace ::com::sun::star;
@@ -61,10 +63,7 @@ const sal_uInt16 TEXTCOLOR          =   0x0020;
 const sal_uInt16 FONTDESCRIPTOR     =   0x0040;
 const sal_uInt16 RECORDMARKER       =   0x0080;
 const sal_uInt16 BACKGROUNDCOLOR    =   0x0100;
-InterfaceRef SAL_CALL OGridControlModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OGridControlModel( comphelper::getComponentContext(_rxFactory) ));
-}
+
 OGridControlModel::OGridControlModel(const Reference<XComponentContext>& _rxFactory)
     :OControlModel(_rxFactory, OUString())
     ,OInterfaceContainer(_rxFactory, m_aMutex, cppu::UnoType<XPropertySet>::get())
@@ -993,5 +992,14 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t
         m_aBackgroundColor <<= (sal_Int32)nValue;
     }
 }
+
 }
+
+extern "C" SAL_DLLPUBLIC_EXPORT XInterface* SAL_CALL
+com_sun_star_form_OGridControlModel_get_implementation(XComponentContext* component,
+        Sequence<Any> const &)
+{
+    return cppu::acquire(new frm::OGridControlModel(component));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index b0e5109a35d0..93fdd4e83cb5 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -24,9 +24,9 @@
 #include <tools/debug.hxx>
 #include <comphelper/processfactory.hxx>
 
-
 namespace frm
 {
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbc;
@@ -43,14 +43,6 @@ using namespace ::com::sun::star::util;
 // OGroupBoxModel
 
 
-
-InterfaceRef SAL_CALL OGroupBoxModel_CreateInstance(const Reference<css::lang::XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OGroupBoxModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
-
 OGroupBoxModel::OGroupBoxModel(const Reference<XComponentContext>& _rxFactory)
     :OControlModel(_rxFactory, VCL_CONTROLMODEL_GROUPBOX, VCL_CONTROL_GROUPBOX)
 {
@@ -129,14 +121,6 @@ void SAL_CALL OGroupBoxModel::read(const Reference< XObjectInputStream>& _rxInSt
 
 // OGroupBoxControl
 
-
-
-InterfaceRef SAL_CALL OGroupBoxControl_CreateInstance(const Reference<css::lang::XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OGroupBoxControl( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 OGroupBoxControl::OGroupBoxControl(const Reference<XComponentContext>& _rxFactory)
                    :OControl(_rxFactory, VCL_CONTROL_GROUPBOX)
 {
@@ -153,8 +137,21 @@ StringSequence SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(Runti
     return aSupported;
 }
 
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OGroupBoxModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OGroupBoxModel(component));
 
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OGroupBoxControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OGroupBoxControl(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index 5b8437084210..5e5eeeb83020 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -41,13 +41,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
 
-InterfaceRef SAL_CALL OHiddenModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OHiddenModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
-
 OHiddenModel::OHiddenModel(const Reference<XComponentContext>& _rxFactory)
     :OControlModel(_rxFactory, OUString())
 {
@@ -169,8 +162,13 @@ void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStrea
     OControlModel::read(_rxInStream);
 }
 
-
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OHiddenModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OHiddenModel(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index 936c69194f7e..c9a0b5fd58fa 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -27,6 +27,7 @@
 
 namespace frm
 {
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdb;
@@ -40,11 +41,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
 // OImageButtonModel
-InterfaceRef SAL_CALL OImageButtonModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-     return *(new OImageButtonModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
 OImageButtonModel::OImageButtonModel(const Reference<XComponentContext>& _rxFactory)
                     :OClickableImageBaseModel( _rxFactory, VCL_CONTROLMODEL_IMAGEBUTTON, FRM_SUN_CONTROL_IMAGEBUTTON )
                     // use the old control name for compytibility reasons
@@ -145,11 +141,6 @@ void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) t
 }
 
 // OImageButtonControl
-InterfaceRef SAL_CALL OImageButtonControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OImageButtonControl( comphelper::getComponentContext(_rxFactory) ));
-}
-
 Sequence<Type> OImageButtonControl::_getTypes()
 {
     static Sequence<Type> aTypes;
@@ -229,4 +220,18 @@ void SAL_CALL OImageButtonControl::mouseExited(const awt::MouseEvent& /*e*/) thr
 
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OImageButtonModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OImageButtonModel(component));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OImageButtonControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OImageButtonControl(component));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index fa12c3ce0c4e..8646fd512b67 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -59,7 +59,6 @@
 #define ID_OPEN_GRAPHICS            1
 #define ID_CLEAR_GRAPHICS           2
 
-
 namespace frm
 {
 
@@ -119,14 +118,6 @@ namespace
 
 // OImageControlModel
 
-
-
-InterfaceRef SAL_CALL OImageControlModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OImageControlModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 Sequence<Type> OImageControlModel::_getTypes()
 {
     return concatSequences(
@@ -692,14 +683,6 @@ IMPL_LINK( OImageControlModel, OnImageImportDone, ::Graphic*, i_pGraphic )
 
 // OImageControlControl
 
-
-
-InterfaceRef SAL_CALL OImageControlControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OImageControlControl( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 Sequence<Type> OImageControlControl::_getTypes()
 {
     return concatSequences(
@@ -1000,8 +983,20 @@ void SAL_CALL OImageControlControl::mouseExited(const awt::MouseEvent& /*e*/) th
 {
 }
 
-
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OImageControlModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OImageControlModel(component));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OImageControlControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OImageControlControl(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index e7f7e21c422d..bf829c0bcb0e 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -59,8 +59,6 @@
 #include <functional>
 #include <iterator>
 
-
-
 namespace frm
 {
     using namespace ::com::sun::star::uno;
@@ -134,13 +132,6 @@ namespace frm
 
     //= OListBoxModel
 
-
-    InterfaceRef SAL_CALL OListBoxModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-    {
-        return *(new OListBoxModel( comphelper::getComponentContext(_rxFactory) ));
-    }
-
-
     Sequence< Type> OListBoxModel::_getTypes()
     {
         return TypeBag(
@@ -1749,14 +1740,6 @@ namespace frm
 
     // OListBoxControl
 
-
-
-    InterfaceRef SAL_CALL OListBoxControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-    {
-        return *(new OListBoxControl( comphelper::getComponentContext(_rxFactory) ));
-    }
-
-
     Sequence< Type> OListBoxControl::_getTypes()
     {
         return TypeBag(
@@ -2153,8 +2136,20 @@ namespace frm
             m_xAggregateListBox->makeVisible( nEntry );
     }
 
+}
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OListBoxModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OListBoxModel(component));
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OListBoxControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OListBoxControl(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx
index 15c6b16d71b3..a8daa2e73f39 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -53,13 +53,6 @@ StringSequence ONumericControl::getSupportedServiceNames() throw(std::exception)
 }
 
 
-
-InterfaceRef SAL_CALL ONumericControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new ONumericControl( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 Sequence<Type> ONumericControl::_getTypes()
 {
     return OBoundControl::_getTypes();
@@ -68,13 +61,6 @@ Sequence<Type> ONumericControl::_getTypes()
 
 // ONumericModel
 
-
-InterfaceRef SAL_CALL ONumericModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new ONumericModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 Sequence<Type> ONumericModel::_getTypes()
 {
     return OEditBaseModel::_getTypes();
@@ -196,8 +182,20 @@ void ONumericModel::resetNoBroadcast()
     m_aSaveValue.clear();
 }
 
-
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_ONumericModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::ONumericModel(component));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_ONumericControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::ONumericControl(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index 8622f058034c..89a10a799eb1 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -20,38 +20,30 @@
 #include "Pattern.hxx"
 #include "comphelper/processfactory.hxx"
 
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::lang::XMultiServiceFactory;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::Type;
+using ::com::sun::star::uno::XComponentContext;
+using ::com::sun::star::beans::Property;
+using ::com::sun::star::uno::Exception;
+using ::com::sun::star::uno::XInterface;
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::makeAny;
+using ::com::sun::star::sdbc::XRowSet;
+using ::com::sun::star::uno::UNO_QUERY;
+
+namespace FormComponentType = ::com::sun::star::form::FormComponentType;
 
 namespace frm
 {
 
-
-    using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::lang::XMultiServiceFactory;
-    using ::com::sun::star::uno::Sequence;
-    using ::com::sun::star::uno::Type;
-    using ::com::sun::star::uno::XComponentContext;
-    using ::com::sun::star::beans::Property;
-    using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::XInterface;
-    using ::com::sun::star::uno::Any;
-    using ::com::sun::star::uno::makeAny;
-    using ::com::sun::star::sdbc::XRowSet;
-    using ::com::sun::star::uno::UNO_QUERY;
-
-    namespace FormComponentType = ::com::sun::star::form::FormComponentType;
-
 OPatternControl::OPatternControl(const Reference<XComponentContext>& _rxFactory)
     :OBoundControl(_rxFactory, VCL_CONTROL_PATTERNFIELD)
 {
 }
 
 
-InterfaceRef SAL_CALL OPatternControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OPatternControl( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 Sequence<Type> OPatternControl::_getTypes()
 {
     return OBoundControl::_getTypes();
@@ -72,12 +64,6 @@ StringSequence OPatternControl::getSupportedServiceNames() throw(std::exception)
 // OPatternModel
 
 
-InterfaceRef SAL_CALL OPatternModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OPatternModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 Sequence<Type> OPatternModel::_getTypes()
 {
     return OEditBaseModel::_getTypes();
@@ -228,15 +214,26 @@ Any OPatternModel::getDefaultForReset() const
     return makeAny( m_aDefaultText );
 }
 
-
 void OPatternModel::resetNoBroadcast()
 {
     OEditBaseModel::resetNoBroadcast();
     m_aLastKnownValue.clear();
 }
 
-
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OPatternModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OPatternModel(component));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OPatternControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OPatternControl(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index a07f9ac7ad85..abe62f0d36c6 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 
-
 namespace frm
 {
 using namespace ::com::sun::star::uno;
@@ -44,13 +43,6 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::form::binding;
 
 
-
-InterfaceRef SAL_CALL ORadioButtonControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new ORadioButtonControl( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 StringSequence SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(RuntimeException, std::exception)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
@@ -90,13 +82,6 @@ void SAL_CALL ORadioButtonControl::createPeer(const Reference<css::awt::XToolkit
 }
 
 
-InterfaceRef SAL_CALL ORadioButtonModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new ORadioButtonModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
-
 ORadioButtonModel::ORadioButtonModel(const Reference<XComponentContext>& _rxFactory)
     :OReferenceValueComponent( _rxFactory, VCL_CONTROLMODEL_RADIOBUTTON, FRM_SUN_CONTROL_RADIOBUTTON,true )
                     // use the old control name for compytibility reasons
@@ -413,8 +398,20 @@ bool ORadioButtonModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     return true;
 }
 
+}
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_ORadioButtonModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::ORadioButtonModel(component));
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_ORadioButtonControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::ORadioButtonControl(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index 13812043d43b..7c03a518fd63 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -50,12 +50,6 @@ OTimeControl::OTimeControl(const Reference<XComponentContext>& _rxFactory)
 }
 
 
-InterfaceRef SAL_CALL OTimeControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OTimeControl( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 Sequence<Type> OTimeControl::_getTypes()
 {
     return OBoundControl::_getTypes();
@@ -75,12 +69,6 @@ StringSequence SAL_CALL OTimeControl::getSupportedServiceNames() throw(std::exce
 
 //= OTimeModel
 
-
-InterfaceRef SAL_CALL OTimeModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OTimeModel( comphelper::getComponentContext(_rxFactory) ));
-}
-
 // XServiceInfo
 
 StringSequence SAL_CALL OTimeModel::getSupportedServiceNames() throw(std::exception)
@@ -311,8 +299,20 @@ Sequence< Type > OTimeModel::getSupportedBindingTypes()
     return Sequence< Type >( & cppu::UnoType<util::Time>::get(), 1 );
 }
 
-
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OTimeModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OTimeModel(component));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_OTimeControl_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OTimeControl(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index 64ea9f041a7c..bf1cfe758430 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "imgprod.hxx"
 #include "services.hxx"
 
@@ -33,7 +32,6 @@
 #include "svtools/imageresourceaccess.hxx"
 #include <comphelper/processfactory.hxx>
 
-
 // - ImgProdLockBytes -
 
 
@@ -554,15 +552,11 @@ void ImageProducer::initialize( const ::com::sun::star::uno::Sequence< ::com::su
     }
 }
 
-namespace frm
-{
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-SAL_CALL ImageProducer_CreateInstance(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& )
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_ImageProducer_get_implementation(::com::sun::star::uno::XComponentContext*,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
 {
-    return ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface >(
-        ( ::cppu::OWeakObject* ) new ImageProducer );
+    return cppu::acquire(new ImageProducer());
 }
-} // namespace frm
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index 6d34a1f33204..d784f032c83d 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -26,17 +26,9 @@
 #include <comphelper/basicio.hxx>
 #include <comphelper/processfactory.hxx>
 
-
-extern "C" void SAL_CALL createRegistryInfo_ONavigationBarModel()
-{
-    static ::frm::OMultiInstanceAutoRegistration< ::frm::ONavigationBarModel > aAutoRegistration;
-}
-
-
 namespace frm
 {
 
-
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::form;
@@ -482,8 +474,13 @@ namespace frm
         );
     }
 
-
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_form_ONavigationBarModel_get_implementation(css::uno::XComponentContext* context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::ONavigationBarModel(context));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 5fa5707d06d3..92f4181f92a2 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -22,17 +22,9 @@
 #include <comphelper/basicio.hxx>
 #include <rtl/math.hxx>
 
-
-extern "C" void SAL_CALL createRegistryInfo_OScrollBarModel()
-{
-    static ::frm::OMultiInstanceAutoRegistration< ::frm::OScrollBarModel >   aRegisterModel;
-}
-
-
 namespace frm
 {
 
-
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::form;
@@ -45,7 +37,6 @@ namespace frm
 
     //= helper
 
-
     Any translateExternalDoubleToControlIntValue(
         const Any& _rExternalValue, const Reference< XPropertySet >& _rxProperties,
         const OUString& _rMinValueName, const OUString& _rMaxValueName )
@@ -295,8 +286,13 @@ namespace frm
         return Sequence< Type >( & cppu::UnoType<double>::get(), 1 );
     }
 
-
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_forms_OScrollBarModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OScrollBarModel(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx
index aee2d41f0fef..a561c447be86 100644
--- a/forms/source/component/scrollbar.hxx
+++ b/forms/source/component/scrollbar.hxx
@@ -22,7 +22,6 @@
 #include "FormComponent.hxx"
 #include "frm_module.hxx"
 
-
 namespace frm
 {
 
@@ -33,9 +32,10 @@ namespace frm
         sal_Int32   m_nDefaultScrollValue;
         // </properties>
 
-    protected:
+    public:
         DECLARE_DEFAULT_LEAF_XTOR( OScrollBarModel );
 
+    protected:
         // XServiceInfo
         DECLARE_SERVICE_REGISTRATION( OScrollBarModel )
 
@@ -89,11 +89,8 @@ namespace frm
 
     css::uno::Any translateControlIntToExternalDoubleValue( const css::uno::Any& _rControlIntValue );
 
-
-
 } // namespacefrm
 
-
 #endif // INCLUDED_FORMS_SOURCE_COMPONENT_SCROLLBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index 79714a329b58..6fc2b3d4b6dd 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -23,16 +23,9 @@
 #include <comphelper/basicio.hxx>
 
 
-extern "C" void SAL_CALL createRegistryInfo_OSpinButtonModel()
-{
-    static ::frm::OMultiInstanceAutoRegistration< ::frm::OSpinButtonModel >   aRegisterModel;
-}
-
-
 namespace frm
 {
 
-
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::form;
@@ -246,8 +239,13 @@ namespace frm
         return Sequence< Type >( &cppu::UnoType<double>::get(), 1 );
     }
 
-
 }   // namespace frm
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_forms_OSpinButtonModel_get_implementation(::com::sun::star::uno::XComponentContext* component,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::OSpinButtonModel(component));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx
index 0cd4ee4667f0..97af488459fd 100644
--- a/forms/source/component/spinbutton.hxx
+++ b/forms/source/component/spinbutton.hxx
@@ -33,9 +33,10 @@ namespace frm
         sal_Int32   m_nDefaultSpinValue;
         // </properties>
 
-    protected:
+    public:
         DECLARE_DEFAULT_LEAF_XTOR( OSpinButtonModel );
 
+    protected:
         // XServiceInfo
         DECLARE_SERVICE_REGISTRATION( OSpinButtonModel )
 
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index fe49f0debad7..63a1b147b590 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -57,44 +57,6 @@ void registerClassInfo(
 }
 
 
-
-#define REGISTER_CLASS_CORE(classImplName) \
-    registerClassInfo( \
-        "com.sun.star.form." #classImplName, \
-        aServices, \
-        frm::classImplName##_CreateInstance)
-
-
-#define REGISTER_CLASS1(classImplName, service1) \
-    aServices.realloc(1); \
-    aServices.getArray()[0] = service1; \
-    REGISTER_CLASS_CORE(classImplName)
-
-
-#define REGISTER_CLASS2(classImplName, service1, service2) \
-    aServices.realloc(2); \
-    aServices.getArray()[0] = service1; \
-    aServices.getArray()[1] = service2; \
-    REGISTER_CLASS_CORE(classImplName)
-
-
-#define REGISTER_CLASS3(classImplName, service1, service2, service3) \
-    aServices.realloc(3); \
-    aServices.getArray()[0] = service1; \
-    aServices.getArray()[1] = service2; \
-    aServices.getArray()[2] = service3; \
-    REGISTER_CLASS_CORE(classImplName)
-
-
-#define REGISTER_CLASS4(classImplName, service1, service2, service3, service4) \
-    aServices.realloc(4); \
-    aServices.getArray()[0] = service1; \
-    aServices.getArray()[1] = service2; \
-    aServices.getArray()[2] = service3; \
-    aServices.getArray()[3] = service4; \
-    REGISTER_CLASS_CORE(classImplName)
-
-
 void ensureClassInfos()
 {
     if (s_aClassImplementationNames.getLength())
@@ -102,141 +64,19 @@ void ensureClassInfos()
         return;
     Sequence< OUString > aServices;
 
-
-    // = ControlModels
-
-    // - FixedText
-    REGISTER_CLASS2(OFixedTextModel, FRM_COMPONENT_FIXEDTEXT, FRM_SUN_COMPONENT_FIXEDTEXT);
-    // - Hidden
-    REGISTER_CLASS3(OHiddenModel, FRM_COMPONENT_HIDDENCONTROL, FRM_SUN_COMPONENT_HIDDENCONTROL, FRM_COMPONENT_HIDDEN);
-    // - FileControl
-    REGISTER_CLASS2(OFileControlModel, FRM_COMPONENT_FILECONTROL, FRM_SUN_COMPONENT_FILECONTROL);
-    // - ImageButton
-    REGISTER_CLASS2(OImageButtonModel, FRM_COMPONENT_IMAGEBUTTON, FRM_SUN_COMPONENT_IMAGEBUTTON);
-    // - GridControl
-    REGISTER_CLASS3(OGridControlModel, FRM_COMPONENT_GRID /* compatibility */, FRM_COMPONENT_GRIDCONTROL, FRM_SUN_COMPONENT_GRIDCONTROL);
-    // - GroupBox
-    REGISTER_CLASS2(OGroupBoxModel, FRM_COMPONENT_GROUPBOX, FRM_SUN_COMPONENT_GROUPBOX);
-
-    // - RadioButton
-    REGISTER_CLASS4( ORadioButtonModel, FRM_COMPONENT_RADIOBUTTON, FRM_SUN_COMPONENT_RADIOBUTTON, FRM_SUN_COMPONENT_DATABASE_RADIOBUTTON, BINDABLE_DATABASE_RADIO_BUTTON );
-    // - CheckBox
-    REGISTER_CLASS4( OCheckBoxModel, FRM_COMPONENT_CHECKBOX, FRM_SUN_COMPONENT_CHECKBOX, FRM_SUN_COMPONENT_DATABASE_CHECKBOX, BINDABLE_DATABASE_CHECK_BOX );
-    // - ListBox
-    REGISTER_CLASS4( OListBoxModel, FRM_COMPONENT_LISTBOX, FRM_SUN_COMPONENT_LISTBOX, FRM_SUN_COMPONENT_DATABASE_LISTBOX, BINDABLE_DATABASE_LIST_BOX );
-    // - ComboBox
-    REGISTER_CLASS4( OComboBoxModel, FRM_COMPONENT_COMBOBOX, FRM_SUN_COMPONENT_COMBOBOX, FRM_SUN_COMPONENT_DATABASE_COMBOBOX, BINDABLE_DATABASE_COMBO_BOX );
-    // - EditControl
-    REGISTER_CLASS4( OEditModel, FRM_COMPONENT_TEXTFIELD, FRM_SUN_COMPONENT_TEXTFIELD, FRM_SUN_COMPONENT_DATABASE_TEXTFIELD, BINDABLE_DATABASE_TEXT_FIELD );
-    // - DateControl
-    REGISTER_CLASS3( ODateModel, FRM_COMPONENT_DATEFIELD, FRM_SUN_COMPONENT_DATEFIELD, FRM_SUN_COMPONENT_DATABASE_DATEFIELD );
-    // - TimeControl
-    REGISTER_CLASS3( OTimeModel, FRM_COMPONENT_TIMEFIELD, FRM_SUN_COMPONENT_TIMEFIELD, FRM_SUN_COMPONENT_DATABASE_TIMEFIELD );
-    // - NumericField
-    REGISTER_CLASS4( ONumericModel, FRM_COMPONENT_NUMERICFIELD, FRM_SUN_COMPONENT_NUMERICFIELD, FRM_SUN_COMPONENT_DATABASE_NUMERICFIELD, BINDABLE_DATABASE_NUMERIC_FIELD );
-    // - CurrencyField
-    REGISTER_CLASS3( OCurrencyModel, FRM_COMPONENT_CURRENCYFIELD, FRM_SUN_COMPONENT_CURRENCYFIELD, FRM_SUN_COMPONENT_DATABASE_CURRENCYFIELD );
-    // - PatternField
-    REGISTER_CLASS3( OPatternModel, FRM_COMPONENT_PATTERNFIELD, FRM_SUN_COMPONENT_PATTERNFIELD, FRM_SUN_COMPONENT_DATABASE_PATTERNFIELD );
-    // - Button
-    REGISTER_CLASS2( OButtonModel, FRM_COMPONENT_COMMANDBUTTON, FRM_SUN_COMPONENT_COMMANDBUTTON );
-    // - ImageControl
-    REGISTER_CLASS2( OImageControlModel, FRM_COMPONENT_IMAGECONTROL, FRM_SUN_COMPONENT_IMAGECONTROL );
-
-    // - FormattedField
-    REGISTER_CLASS1(OFormattedFieldWrapper, FRM_COMPONENT_EDIT);
-        // since SRC568 both OFormattedModel and OEditModel use FRM_COMPONENT_EDIT for persistence,
-        // and while reading a wrapper determines which kind of model it is
-    // register the wrapper for the FormattedField, as it handles the XPersistObject::write
-    // so that version <= 5.1 are able to read it
-    aServices.realloc(4);
-    aServices.getArray()[0] = FRM_COMPONENT_FORMATTEDFIELD;
-    aServices.getArray()[1] = FRM_SUN_COMPONENT_FORMATTEDFIELD;
-    aServices.getArray()[2] = FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD;
-    aServices.getArray()[3] = BINDABLE_DATABASE_FORMATTED_FIELD;
-
-    registerClassInfo(OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"),
-        aServices,
-        frm::OFormattedFieldWrapper_CreateInstance_ForceFormatted);
-
-
-    // = Controls
-    // - RadioButton
-    REGISTER_CLASS2(ORadioButtonControl, STARDIV_ONE_FORM_CONTROL_RADIOBUTTON, FRM_SUN_CONTROL_RADIOBUTTON);
-    // - CheckBox
-    REGISTER_CLASS2(OCheckBoxControl, STARDIV_ONE_FORM_CONTROL_CHECKBOX, FRM_SUN_CONTROL_CHECKBOX);
-    // - GroupBox
-    REGISTER_CLASS2(OGroupBoxControl, STARDIV_ONE_FORM_CONTROL_GROUPBOX, FRM_SUN_CONTROL_GROUPBOX);
-    // - ListBox
-    REGISTER_CLASS2(OListBoxControl, STARDIV_ONE_FORM_CONTROL_LISTBOX, FRM_SUN_CONTROL_LISTBOX);
-    // - ComboBox
-    REGISTER_CLASS2(OComboBoxControl, STARDIV_ONE_FORM_CONTROL_COMBOBOX, FRM_SUN_CONTROL_COMBOBOX);
-    // - EditControl
-    REGISTER_CLASS3(OEditControl, STARDIV_ONE_FORM_CONTROL_TEXTFIELD, FRM_SUN_CONTROL_TEXTFIELD, STARDIV_ONE_FORM_CONTROL_EDIT);
-    // - DateControl
-    REGISTER_CLASS2(ODateControl, STARDIV_ONE_FORM_CONTROL_DATEFIELD, FRM_SUN_CONTROL_DATEFIELD);
-    // - TimeControl
-    REGISTER_CLASS2(OTimeControl, STARDIV_ONE_FORM_CONTROL_TIMEFIELD, FRM_SUN_CONTROL_TIMEFIELD);
-    // - NumericField
-    REGISTER_CLASS2(ONumericControl, STARDIV_ONE_FORM_CONTROL_NUMERICFIELD, FRM_SUN_CONTROL_NUMERICFIELD);
-    // - CurrencyField
-    REGISTER_CLASS2(OCurrencyControl, STARDIV_ONE_FORM_CONTROL_CURRENCYFIELD, FRM_SUN_CONTROL_CURRENCYFIELD);
-    // - PatternField
-    REGISTER_CLASS2(OPatternControl, STARDIV_ONE_FORM_CONTROL_PATTERNFIELD, FRM_SUN_CONTROL_PATTERNFIELD);
-    // - FormattedField
-    REGISTER_CLASS2(OFormattedControl, STARDIV_ONE_FORM_CONTROL_FORMATTEDFIELD, FRM_SUN_CONTROL_FORMATTEDFIELD);
-    // - Button
-    REGISTER_CLASS2(OButtonControl, STARDIV_ONE_FORM_CONTROL_COMMANDBUTTON, FRM_SUN_CONTROL_COMMANDBUTTON);
-    // - ImageButton
-    REGISTER_CLASS2(OImageButtonControl, STARDIV_ONE_FORM_CONTROL_IMAGEBUTTON, FRM_SUN_CONTROL_IMAGEBUTTON);
-    // - ImageControl
-    REGISTER_CLASS2(OImageControlControl, STARDIV_ONE_FORM_CONTROL_IMAGECONTROL, FRM_SUN_CONTROL_IMAGECONTROL);
-
-
-
-    // = various
     aServices.realloc(1);
-    aServices.getArray()[0] = "com.sun.star.form.Forms";
-
-    REGISTER_CLASS1(ImageProducer, SRV_AWT_IMAGEPRODUCER);
-
-
-    // = XForms core
-#define REGISTER_XFORMS_CLASS(name) \
-    aServices.realloc(1); \
-    aServices[0] = "com.sun.star.xforms." #name ; \
-    REGISTER_CLASS_CORE(name)
-
-    REGISTER_XFORMS_CLASS(Model);
-    REGISTER_XFORMS_CLASS(XForms);
+    aServices[0] = "com.sun.star.xforms.XForms";
 
+    registerClassInfo(
+        "com.sun.star.form.XForms",
+        aServices,
+        frm::XForms_CreateInstance);
 }
 
 
 extern "C"
 {
 
-void SAL_CALL createRegistryInfo_FORMS()
-{
-    static bool bInit = false;
-    if (!bInit)
-    {
-        createRegistryInfo_OFilterControl();
-        createRegistryInfo_OScrollBarModel();
-        createRegistryInfo_OSpinButtonModel();
-        createRegistryInfo_ONavigationBarModel();
-        createRegistryInfo_ONavigationBarControl();
-        createRegistryInfo_ORichTextModel();
-        createRegistryInfo_ORichTextControl();
-        createRegistryInfo_CLibxml2XFormsExtension();
-#if HAVE_FEATURE_DBCONNECTIVITY
-        createRegistryInfo_FormOperations();
-#endif
-        bInit = true;
-    }
-}
-
-
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pImplName, void* _pServiceManager, void* /*_pRegistryKey*/)
 {
     if (!_pServiceManager || !_pImplName)
@@ -289,18 +129,15 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pI
     // the real way - use the OModule
     if ( !pRet )
     {
-        createRegistryInfo_FORMS();
-        {
-            // let the module look for the component
-            Reference< XInterface > xRet;
-            xRet = ::frm::OFormsModule::getComponentFactory(
-                OUString::createFromAscii( _pImplName ),
-                static_cast< XMultiServiceFactory* >( _pServiceManager ) );
-
-            if ( xRet.is() )
-                xRet->acquire();
-            pRet = xRet.get();
-        }
+        // let the module look for the component
+        Reference< XInterface > xRet;
+        xRet = ::frm::OFormsModule::getComponentFactory(
+            OUString::createFromAscii( _pImplName ),
+            static_cast< XMultiServiceFactory* >( _pServiceManager ) );
+
+        if ( xRet.is() )
+            xRet->acquire();
+        pRet = xRet.get();
     }
 
     return pRet;
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 90eab6f20304..29f316b02cf8 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -40,13 +40,13 @@
 #include <svl/itempool.hxx>
 #include <sfx2/msgpool.hxx>
 
-
-extern "C" void SAL_CALL createRegistryInfo_ORichTextControl()
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_form_ORichTextControl_get_implementation(::com::sun::star::uno::XComponentContext*,
+                                                           ::com::sun::star::uno::Sequence<css::uno::Any> const &)
 {
-    static ::frm::OMultiInstanceAutoRegistration< ::frm::ORichTextControl > aAutoRegistration;
+    return cppu::acquire(new frm::ORichTextControl());
 }
 
-
 namespace frm
 {
 
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 6e50704ff07f..441ee199391e 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -34,16 +34,8 @@
 #include <vcl/svapp.hxx>
 
 
-extern "C" void SAL_CALL createRegistryInfo_ORichTextModel()
-{
-    static ::frm::OMultiInstanceAutoRegistration< ::frm::ORichTextModel >   aRegisterModel;
-}
-
-
 namespace frm
 {
-
-
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::awt;
     using namespace ::com::sun::star::lang;
@@ -611,4 +603,11 @@ namespace frm
 } // namespace frm
 
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_forms_ORichTextModel_get_implementation(css::uno::XComponentContext* context,
+                                                          css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::ORichTextModel(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index f64d22b34332..48257a7c4fa2 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -54,6 +54,9 @@ namespace frm
             ,public ::comphelper::OPropertyContainerHelper
             ,public ORichTextModel_BASE
     {
+    public:
+        DECLARE_DEFAULT_LEAF_XTOR( ORichTextModel );
+
     private:
         // <properties>
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >
@@ -100,7 +103,6 @@ namespace frm
         static  RichTextEngine* getEditEngine( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel );
 
     private:
-        DECLARE_DEFAULT_LEAF_XTOR( ORichTextModel );
 
         // UNO
         DECLARE_UNO3_AGG_DEFAULTS( ORichTextModel, OControlModel )
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 74e97821e877..cd95d32ffd66 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -64,12 +64,6 @@
 #include <sal/macros.h>
 
 
-extern "C" void SAL_CALL createRegistryInfo_FormOperations()
-{
-    static ::frm::OMultiInstanceAutoRegistration< ::frm::FormOperations > aAutoRegistration;
-}
-
-
 namespace frm
 {
 
@@ -1764,4 +1758,11 @@ namespace frm
 } // namespace frm
 
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_forms_FormOperations_get_implementation(css::uno::XComponentContext* context,
+                                                          css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::FormOperations(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 8e6b4d4ce7d8..c734d49b46a5 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -40,16 +40,9 @@
 #include <vcl/settings.hxx>
 
 
-extern "C" void SAL_CALL createRegistryInfo_ONavigationBarControl()
-{
-    static ::frm::OMultiInstanceAutoRegistration< ::frm::ONavigationBarControl > aAutoRegistration;
-}
-
-
 namespace frm
 {
 
-
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::awt;
@@ -513,8 +506,14 @@ namespace frm
         _rFeatureIds.push_back( FormFeature::RemoveFilterAndSort );
     }
 
-
 }   // namespace frm
 
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_form_ONavigationBarControl_get_implementation (css::uno::XComponentContext* context,
+                                                                 css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new frm::ONavigationBarControl(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 6c81ae1c4396..2e56e10143a6 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -680,4 +680,13 @@ Sequence<sal_Int8> Model::getImplementationId()
     return css::uno::Sequence<sal_Int8>();
 }
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_xform_Model_get_implementation(::com::sun::star::uno::XComponentContext*,
+                                            ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new xforms::Model());
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index 23b7f270ac1b..0404022ffa4b 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -84,10 +84,10 @@ void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequen
 }
 
 
-
-extern "C" void SAL_CALL createRegistryInfo_CLibxml2XFormsExtension()
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+CLibxlm2XFormsExtension_get_implementation(::com::sun::star::uno::XComponentContext*,
+                                           ::com::sun::star::uno::Sequence<css::uno::Any> const &)
 {
-    static frm::OMultiInstanceAutoRegistration< CLibxml2XFormsExtension >   aRegistration;
+    return cppu::acquire(new CLibxml2XFormsExtension());
 }
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/xpathlib/extension.hxx b/forms/source/xforms/xpathlib/extension.hxx
index bbb9d9838615..37e968dc5d2c 100644
--- a/forms/source/xforms/xpathlib/extension.hxx
+++ b/forms/source/xforms/xpathlib/extension.hxx
@@ -47,6 +47,8 @@ private:
     com::sun::star::uno::Reference <com::sun::star::xml::dom::XNode> m_aContextNode;
 
 public:
+    CLibxml2XFormsExtension() {}
+
     static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL Create(
         const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& aFactory);
     static OUString SAL_CALL getImplementationName_Static();
diff --git a/forms/util/frm.component b/forms/util/frm.component
index 276b7c4f2121..9a738863779a 100644
--- a/forms/util/frm.component
+++ b/forms/util/frm.component
@@ -19,18 +19,22 @@
 
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
     prefix="frm" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.form.ONavigationBarControl">
+    <implementation name="com.sun.star.comp.form.ONavigationBarControl"
+        constructor="com_sun_star_comp_form_ONavigationBarControl_get_implementation">
     <service name="com.sun.star.form.control.NavigationToolBar"/>
   </implementation>
-  <implementation name="com.sun.star.comp.form.ONavigationBarModel">
+  <implementation name="com.sun.star.comp.form.ONavigationBarModel"
+      constructor="com_sun_star_comp_form_ONavigationBarModel_get_implementation">
     <service name="com.sun.star.form.FormComponent"/>
     <service name="com.sun.star.form.FormControlModel"/>
     <service name="com.sun.star.form.component.NavigationToolBar"/>
   </implementation>
-  <implementation name="com.sun.star.comp.form.ORichTextControl">
+  <implementation name="com.sun.star.comp.form.ORichTextControl"
+      constructor="com_sun_star_form_ORichTextControl_get_implementation">
     <service name="com.sun.star.form.control.RichTextControl"/>
   </implementation>
-  <implementation name="com.sun.star.comp.forms.FormOperations">
+  <implementation name="com.sun.star.comp.forms.FormOperations"
+      constructor="com_sun_star_comp_forms_FormOperations_get_implementation">
     <service name="com.sun.star.form.runtime.FormOperations"/>
   </implementation>
   <implementation name="com.sun.star.comp.forms.ODatabaseForm"
@@ -42,17 +46,20 @@
     <service name="com.sun.star.form.component.HTMLForm"/>
     <service name="stardiv.one.form.component.Form"/>
   </implementation>
-  <implementation name="com.sun.star.comp.forms.OFilterControl">
+  <implementation name="com.sun.star.comp.forms.OFilterControl"
+      constructor="com_sun_star_comp_forms_OFilterControl_get_implementation">
     <service name="com.sun.star.awt.UnoControl"/>
     <service name="com.sun.star.form.control.FilterControl"/>
   </implementation>
-  <implementation name="com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted">
+  <implementation name="com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"
+      constructor="com_sun_star_comp_form_OFormattedFieldWrapper_ForcedFormatted_get_implementation">
     <service name="com.sun.star.form.binding.BindableDatabaseFormattedField"/>
     <service name="com.sun.star.form.component.DatabaseFormattedField"/>
     <service name="com.sun.star.form.component.FormattedField"/>
     <service name="stardiv.one.form.component.FormattedField"/>
   </implementation>
-  <implementation name="com.sun.star.comp.forms.ORichTextModel">
+  <implementation name="com.sun.star.comp.forms.ORichTextModel"
+      constructor="com_sun_star_comp_forms_ORichTextModel_get_implementation">
     <service name="com.sun.star.form.FormComponent"/>
     <service name="com.sun.star.form.FormControlModel"/>
     <service name="com.sun.star.form.component.RichTextControl"/>
@@ -63,181 +70,220 @@
     <service name="com.sun.star.style.ParagraphPropertiesComplex"/>
     <service name="com.sun.star.text.TextRange"/>
   </implementation>
-  <implementation name="com.sun.star.comp.forms.OScrollBarModel">
+  <implementation name="com.sun.star.comp.forms.OScrollBarModel"
+      constructor="com_sun_star_comp_forms_OScrollBarModel_get_implementation">
     <service name="com.sun.star.form.FormComponent"/>
     <service name="com.sun.star.form.FormControlModel"/>
     <service name="com.sun.star.form.binding.BindableIntegerValueRange"/>
     <service name="com.sun.star.form.component.ScrollBar"/>
   </implementation>
-  <implementation name="com.sun.star.comp.forms.OSpinButtonModel">
+  <implementation name="com.sun.star.comp.forms.OSpinButtonModel"
+      constructor="com_sun_star_comp_forms_OSpinButtonModel_get_implementation">
     <service name="com.sun.star.form.FormComponent"/>
     <service name="com.sun.star.form.FormControlModel"/>
     <service name="com.sun.star.form.binding.BindableIntegerValueRange"/>
     <service name="com.sun.star.form.component.SpinButton"/>
   </implementation>
-  <implementation name="com.sun.star.comp.xml.xpath.XFormsExtension">
+  <implementation name="com.sun.star.comp.xml.xpath.XFormsExtension"
+      constructor="CLibxlm2XFormsExtension_get_implementation">
     <service name="com.sun.star.xml.xpath.XPathExtension"/>
   </implementation>
-  <implementation name="com.sun.star.form.ImageProducer">
+  <implementation name="com.sun.star.form.ImageProducer"
+      constructor="com_sun_star_form_ImageProducer_get_implementation">
     <service name="com.sun.star.awt.ImageProducer"/>
   </implementation>
-  <implementation name="com.sun.star.form.Model">
+  <implementation name="com.sun.star.form.Model"
+      constructor="com_sun_star_xform_Model_get_implementation">
     <service name="com.sun.star.xforms.Model"/>
   </implementation>
-  <implementation name="com.sun.star.form.OButtonControl">
+  <implementation name="com.sun.star.form.OButtonControl"
+      constructor="com_sun_star_form_OButtonControl_get_implementation">
     <service name="com.sun.star.form.control.CommandButton"/>
     <service name="stardiv.one.form.control.CommandButton"/>
   </implementation>
-  <implementation name="com.sun.star.form.OButtonModel">
+  <implementation name="com.sun.star.form.OButtonModel"
+      constructor="com_sun_star_form_OButtonModel_get_implementation">
     <service name="com.sun.star.form.component.CommandButton"/>
     <service name="stardiv.one.form.component.CommandButton"/>
   </implementation>
-  <implementation name="com.sun.star.form.OCheckBoxControl">
+  <implementation name="com.sun.star.form.OCheckBoxControl"
+      constructor="com_sun_star_form_OCheckBoxControl_get_implementation">
     <service name="com.sun.star.form.control.CheckBox"/>
     <service name="stardiv.one.form.control.CheckBox"/>
   </implementation>
-  <implementation name="com.sun.star.form.OCheckBoxModel">
+  <implementation name="com.sun.star.form.OCheckBoxModel"
+      constructor="com_sun_star_form_OCheckBoxModel_get_implementation">
     <service name="com.sun.star.form.binding.BindableDatabaseCheckBox"/>
     <service name="com.sun.star.form.component.CheckBox"/>
     <service name="com.sun.star.form.component.DatabaseCheckBox"/>
     <service name="stardiv.one.form.component.CheckBox"/>
   </implementation>
-  <implementation name="com.sun.star.form.OComboBoxControl">
+  <implementation name="com.sun.star.form.OComboBoxControl"
+      constructor="com_sun_star_form_OComboBoxControl_get_implementation">
     <service name="com.sun.star.form.control.ComboBox"/>
     <service name="stardiv.one.form.control.ComboBox"/>
   </implementation>
-  <implementation name="com.sun.star.form.OComboBoxModel">
+  <implementation name="com.sun.star.form.OComboBoxModel"
+      constructor="com_sun_star_form_OComboBoxModel_get_implementation">
     <service name="com.sun.star.form.binding.BindableDatabaseComboBox"/>
     <service name="com.sun.star.form.component.ComboBox"/>
     <service name="com.sun.star.form.component.DatabaseComboBox"/>
     <service name="stardiv.one.form.component.ComboBox"/>
   </implementation>
-  <implementation name="com.sun.star.form.OCurrencyControl">
+  <implementation name="com.sun.star.form.OCurrencyControl"
+      constructor="com_sun_star_form_OCurrencyControl_get_implementation">
     <service name="com.sun.star.form.control.CurrencyField"/>
     <service name="stardiv.one.form.control.CurrencyField"/>
   </implementation>
-  <implementation name="com.sun.star.form.OCurrencyModel">
+  <implementation name="com.sun.star.form.OCurrencyModel"
+      constructor="com_sun_star_form_OCurrencyModel_get_implementation">
     <service name="com.sun.star.form.component.CurrencyField"/>
     <service name="com.sun.star.form.component.DatabaseCurrencyField"/>
     <service name="stardiv.one.form.component.CurrencyField"/>
   </implementation>
-  <implementation name="com.sun.star.form.ODateControl">
+  <implementation name="com.sun.star.form.ODateControl"
+      constructor="com_sun_star_form_ODateControl_get_implementation">
     <service name="com.sun.star.form.control.DateField"/>
     <service name="stardiv.one.form.control.DateField"/>
   </implementation>
-  <implementation name="com.sun.star.form.ODateModel">
+  <implementation name="com.sun.star.form.ODateModel"
+      constructor="com_sun_star_form_ODateModel_get_implementation">
     <service name="com.sun.star.form.component.DatabaseDateField"/>
     <service name="com.sun.star.form.component.DateField"/>
     <service name="stardiv.one.form.component.DateField"/>
   </implementation>
-  <implementation name="com.sun.star.form.OEditControl">
+  <implementation name="com.sun.star.form.OEditControl"
+      constructor="com_sun_star_form_OEditControl_get_implementation">
     <service name="com.sun.star.form.control.TextField"/>
     <service name="stardiv.one.form.control.Edit"/>
     <service name="stardiv.one.form.control.TextField"/>
   </implementation>
-  <implementation name="com.sun.star.form.OEditModel">
+  <implementation name="com.sun.star.form.OEditModel"
+      constructor="com_sun_star_form_OEditModel_get_implementation">
     <service name="com.sun.star.form.binding.BindableDatabaseTextField"/>
     <service name="com.sun.star.form.component.DatabaseTextField"/>
     <service name="com.sun.star.form.component.TextField"/>
     <service name="stardiv.one.form.component.TextField"/>
   </implementation>
-  <implementation name="com.sun.star.form.OFileControlModel">
+  <implementation name="com.sun.star.form.OFileControlModel"
+      constructor="com_sun_star_form_OFileControlModel_get_implementation">
     <service name="com.sun.star.form.component.FileControl"/>
     <service name="stardiv.one.form.component.FileControl"/>
   </implementation>
-  <implementation name="com.sun.star.form.OFixedTextModel">
+  <implementation name="com.sun.star.form.OFixedTextModel"
+      constructor="com_sun_star_form_OFixedTextModel_get_implementation">
     <service name="com.sun.star.form.component.FixedText"/>
     <service name="stardiv.one.form.component.FixedText"/>
   </implementation>
-  <implementation name="com.sun.star.form.OFormattedControl">
+  <implementation name="com.sun.star.form.OFormattedControl"
+      constructor="com_sun_star_form_OFormattedControl_get_implementation">
     <service name="com.sun.star.form.control.FormattedField"/>
     <service name="stardiv.one.form.control.FormattedField"/>
   </implementation>
-  <implementation name="com.sun.star.form.OFormattedFieldWrapper">
+  <implementation name="com.sun.star.form.OFormattedFieldWrapper"
+      constructor="com_sun_star_form_OFormattedFieldWrapper_get_implementation">
     <service name="stardiv.one.form.component.Edit"/>
   </implementation>
   <implementation name="com.sun.star.form.OFormsCollection"
       constructor="com_sun_star_form_OFormsCollection_get_implementation">
     <service name="com.sun.star.form.Forms"/>
   </implementation>
-  <implementation name="com.sun.star.form.OGridControlModel">
+  <implementation name="com.sun.star.form.OGridControlModel"
+      constructor="com_sun_star_form_OGridControlModel_get_implementation">
     <service name="com.sun.star.form.component.GridControl"/>
     <service name="stardiv.one.form.component.Grid"/>
     <service name="stardiv.one.form.component.GridControl"/>
   </implementation>
-  <implementation name="com.sun.star.form.OGroupBoxControl">
+  <implementation name="com.sun.star.form.OGroupBoxControl"
+      constructor="com_sun_star_form_OGroupBoxModel_get_implementation">
     <service name="com.sun.star.form.control.GroupBox"/>
     <service name="stardiv.one.form.control.GroupBox"/>
   </implementation>
-  <implementation name="com.sun.star.form.OGroupBoxModel">
+  <implementation name="com.sun.star.form.OGroupBoxModel"
+      constructor="com_sun_star_form_OGroupBoxModel_get_implementation">
     <service name="com.sun.star.form.component.GroupBox"/>
     <service name="stardiv.one.form.component.GroupBox"/>
   </implementation>
-  <implementation name="com.sun.star.form.OHiddenModel">
+  <implementation name="com.sun.star.form.OHiddenModel"
+      constructor="com_sun_star_form_OHiddenModel_get_implementation">
     <service name="com.sun.star.form.component.HiddenControl"/>
     <service name="stardiv.one.form.component.Hidden"/>
     <service name="stardiv.one.form.component.HiddenControl"/>
   </implementation>
-  <implementation name="com.sun.star.form.OImageButtonControl">
+  <implementation name="com.sun.star.form.OImageButtonControl"
+      constructor="com_sun_star_form_OImageButtonControl_get_implementation">
     <service name="com.sun.star.form.control.ImageButton"/>
     <service name="stardiv.one.form.control.ImageButton"/>
   </implementation>
-  <implementation name="com.sun.star.form.OImageButtonModel">
+  <implementation name="com.sun.star.form.OImageButtonModel"
+      constructor="com_sun_star_form_OImageButtonModel_get_implementation">
     <service name="com.sun.star.form.component.ImageButton"/>
     <service name="stardiv.one.form.component.ImageButton"/>
   </implementation>
-  <implementation name="com.sun.star.form.OImageControlControl">
+  <implementation name="com.sun.star.form.OImageControlControl"
+      constructor="com_sun_star_form_OImageControlControl_get_implementation">
     <service name="com.sun.star.form.control.ImageControl"/>
     <service name="stardiv.one.form.control.ImageControl"/>
   </implementation>
-  <implementation name="com.sun.star.form.OImageControlModel">
+  <implementation name="com.sun.star.form.OImageControlModel"
+      constructor="com_sun_star_form_OImageControlModel_get_implementation">
     <service name="com.sun.star.form.component.DatabaseImageControl"/>
     <service name="stardiv.one.form.component.ImageControl"/>
   </implementation>
-  <implementation name="com.sun.star.form.OListBoxControl">
+  <implementation name="com.sun.star.form.OListBoxControl"
+      constructor="com_sun_star_form_OListBoxControl_get_implementation">
     <service name="com.sun.star.form.control.ListBox"/>
     <service name="stardiv.one.form.control.ListBox"/>
   </implementation>
-  <implementation name="com.sun.star.form.OListBoxModel">
+  <implementation name="com.sun.star.form.OListBoxModel"
+      constructor="com_sun_star_form_OListBoxModel_get_implementation">
     <service name="com.sun.star.form.binding.BindableDatabaseListBox"/>
     <service name="com.sun.star.form.component.DatabaseListBox"/>
     <service name="com.sun.star.form.component.ListBox"/>
     <service name="stardiv.one.form.component.ListBox"/>
   </implementation>
-  <implementation name="com.sun.star.form.ONumericControl">
+  <implementation name="com.sun.star.form.ONumericControl"
+      constructor="com_sun_star_form_ONumericControl_get_implementation">
     <service name="com.sun.star.form.control.NumericField"/>
     <service name="stardiv.one.form.control.NumericField"/>
   </implementation>
-  <implementation name="com.sun.star.form.ONumericModel">
+  <implementation name="com.sun.star.form.ONumericModel"
+      constructor="com_sun_star_form_ONumericModel_get_implementation">
     <service name="com.sun.star.form.binding.BindableDatabaseNumericField"/>
     <service name="com.sun.star.form.component.DatabaseNumericField"/>
     <service name="com.sun.star.form.component.NumericField"/>
     <service name="stardiv.one.form.component.NumericField"/>
   </implementation>
-  <implementation name="com.sun.star.form.OPatternControl">
+  <implementation name="com.sun.star.form.OPatternControl"
+      constructor="com_sun_star_form_OPatternControl_get_implementation">
     <service name="com.sun.star.form.control.PatternField"/>
     <service name="stardiv.one.form.control.PatternField"/>
   </implementation>
-  <implementation name="com.sun.star.form.OPatternModel">
+  <implementation name="com.sun.star.form.OPatternModel"
+      constructor="com_sun_star_form_OPatternModel_get_implementation">
     <service name="com.sun.star.form.component.DatabasePatternField"/>
     <service name="com.sun.star.form.component.PatternField"/>
     <service name="stardiv.one.form.component.PatternField"/>
   </implementation>
-  <implementation name="com.sun.star.form.ORadioButtonControl">
+  <implementation name="com.sun.star.form.ORadioButtonControl"
+      constructor="com_sun_star_form_ORadioButtonModel_get_implementation">
     <service name="com.sun.star.form.control.RadioButton"/>
     <service name="stardiv.one.form.control.RadioButton"/>
   </implementation>
-  <implementation name="com.sun.star.form.ORadioButtonModel">
+  <implementation name="com.sun.star.form.ORadioButtonModel"
+      constructor="com_sun_star_form_ORadioButtonModel_get_implementation">
     <service name="com.sun.star.form.binding.BindableDatabaseRadioButton"/>
     <service name="com.sun.star.form.component.DatabaseRadioButton"/>
     <service name="com.sun.star.form.component.RadioButton"/>
     <service name="stardiv.one.form.component.RadioButton"/>
   </implementation>
-  <implementation name="com.sun.star.form.OTimeControl">
+  <implementation name="com.sun.star.form.OTimeControl"
+      constructor="com_sun_star_form_OTimeControl_get_implementation">
     <service name="com.sun.star.form.control.TimeField"/>
     <service name="stardiv.one.form.control.TimeField"/>
   </implementation>
-  <implementation name="com.sun.star.form.OTimeModel">
+  <implementation name="com.sun.star.form.OTimeModel"
+      constructor="com_sun_star_form_OTimeModel_get_implementation">
     <service name="com.sun.star.form.component.DatabaseTimeField"/>
     <service name="com.sun.star.form.component.TimeField"/>
     <service name="stardiv.one.form.component.TimeField"/>