forms: Convert also com.sun.star.form.XForms.

Plus some associated cleanup.

Change-Id: I0a923198c23e2e4ecbc91e5b56cfac31b7f71256

9 files changed, 190 insertions, 545 deletions

diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index d371c67179c0..8d467cb421b8 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -108,7 +108,6 @@ $(eval $(call gb_Library_add_exception_objects,frm,\
     forms/source/misc/limitedformats \
     forms/source/misc/listenercontainers \
     forms/source/misc/property \
-    forms/source/misc/services \
     forms/source/resource/frm_resource \
     forms/source/richtext/attributedispatcher \
     forms/source/richtext/clipboarddispatcher \
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index 7656204de55d..2e80b2edc0a4 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -49,7 +49,6 @@ protected:
     void disableFormattedWriteFake() { m_bWritingFormattedFake = false; }
     bool lastReadWasFormattedFake() const { return (getLastReadVersion() & PF_FAKE_FORMATTED_FIELD) != 0; }
 
-    friend InterfaceRef SAL_CALL OEditModel_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
     friend class OFormattedFieldWrapper;
     friend class OFormattedModel;   // temporary
 
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index ed949e09a4a5..178f1939c9bd 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -30,8 +30,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-namespace frm
-{
+using namespace frm;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbc;
@@ -44,17 +43,6 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
-
-Reference<XInterface> SAL_CALL OFormattedFieldWrapper_CreateInstance_ForceFormatted(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return OFormattedFieldWrapper::createFormattedFieldWrapper( comphelper::getComponentContext(_rxFactory), true);
-}
-
-InterfaceRef SAL_CALL OFormattedFieldWrapper_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return OFormattedFieldWrapper::createFormattedFieldWrapper( comphelper::getComponentContext(_rxFactory), false);
-}
-
 OFormattedFieldWrapper::OFormattedFieldWrapper(const Reference<XComponentContext>& _rxFactory)
     :m_xContext(_rxFactory)
 {
@@ -353,8 +341,6 @@ void OFormattedFieldWrapper::ensureAggregate()
     decrement(m_refCount);
 }
 
-}
-
 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 &)
diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx
index 7109d387804c..6c0fdadd2bd1 100644
--- a/forms/source/component/FormattedFieldWrapper.hxx
+++ b/forms/source/component/FormattedFieldWrapper.hxx
@@ -59,9 +59,6 @@ protected:
 protected:
     virtual ~OFormattedFieldWrapper();
 
-    friend InterfaceRef SAL_CALL OFormattedFieldWrapper_CreateInstance_ForceFormatted(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
-    friend InterfaceRef SAL_CALL OFormattedFieldWrapper_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
-
 public:
     // UNO
     DECLARE_UNO3_AGG_DEFAULTS(OFormattedFieldWrapper, OWeakAggObject)
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index d67c10861032..daa1b0cf3672 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "FormsCollection.hxx"
 #include "services.hxx"
 #include <comphelper/sequence.hxx>
@@ -25,42 +24,28 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/form/XForm.hpp>
 
-
-namespace frm
-{
-
+using namespace frm;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::util;
 
-
-
-InterfaceRef SAL_CALL OFormsCollection_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
-{
-    return *(new OFormsCollection( comphelper::getComponentContext(_rxFactory) ));
-}
-
-
 OUString SAL_CALL OFormsCollection::getServiceName() throw(RuntimeException, std::exception)
 {
     return OUString("com.sun.star.form.Forms");
 }
 
-
 Sequence< sal_Int8 > SAL_CALL OFormsCollection::getImplementationId(  ) throw(RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-
 Sequence<Type> SAL_CALL OFormsCollection::getTypes() throw(RuntimeException, std::exception)
 {
     return concatSequences(OInterfaceContainer::getTypes(), FormsCollectionComponentBase::getTypes(), OFormsCollection_BASE::getTypes());
 }
 
-
 OFormsCollection::OFormsCollection(const Reference<XComponentContext>& _rxFactory)
     :FormsCollectionComponentBase( m_aMutex )
     ,OInterfaceContainer( _rxFactory, m_aMutex, cppu::UnoType<XForm>::get() )
@@ -68,7 +53,6 @@ OFormsCollection::OFormsCollection(const Reference<XComponentContext>& _rxFactor
 {
 }
 
-
 OFormsCollection::OFormsCollection( const OFormsCollection& _cloneSource )
     :FormsCollectionComponentBase( m_aMutex )
     ,OInterfaceContainer( m_aMutex, _cloneSource )
@@ -76,7 +60,6 @@ OFormsCollection::OFormsCollection( const OFormsCollection& _cloneSource )
 {
 }
 
-
 OFormsCollection::~OFormsCollection()
 {
     if (!FormsCollectionComponentBase::rBHelper.bDisposed)
@@ -86,7 +69,6 @@ OFormsCollection::~OFormsCollection()
     }
 }
 
-
 Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception)
 {
     Any aReturn = OFormsCollection_BASE::queryInterface(_rType);
@@ -151,18 +133,14 @@ void OFormsCollection::setParent(const InterfaceRef& Parent) throw( NoSupportExc
     m_xParent = Parent;
 }
 
-
 InterfaceRef  OFormsCollection::getParent() throw( RuntimeException, std::exception )
 {
     return m_xParent;
 }
 
-
-}   // namespace frm
-
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
 com_sun_star_form_OFormsCollection_get_implementation(css::uno::XComponentContext* context,
-                                                      css::uno::Sequence<css::uno::Any> const &)
+        css::uno::Sequence<css::uno::Any> const &)
 {
     return cppu::acquire(new frm::OFormsCollection(context));
 }
diff --git a/forms/source/inc/services.hxx b/forms/source/inc/services.hxx
index 1fb42f112859..170cc33f24e7 100644
--- a/forms/source/inc/services.hxx
+++ b/forms/source/inc/services.hxx
@@ -23,330 +23,184 @@
 #include <rtl/ustring.hxx>
 #include "frm_strings.hxx"
 
-namespace com { namespace sun { namespace star { namespace lang {
-    class XMultiServiceFactory;
-} } } }
-
-namespace frm
-{
-
-
-    #define AWT_CONTROL_TEXTFIELD "com.sun.star.awt.TextField"
-
-    #define VCL_CONTROL_EDIT "stardiv.vcl.control.Edit"
-    #define VCL_CONTROL_LISTBOX "stardiv.vcl.control.ListBox"
-    #define VCL_CONTROL_COMBOBOX "stardiv.vcl.control.ComboBox"
-    #define VCL_CONTROL_RADIOBUTTON "stardiv.vcl.control.RadioButton"
-    #define VCL_CONTROL_GROUPBOX "stardiv.vcl.control.GroupBox"
-    #define VCL_CONTROL_FIXEDTEXT "stardiv.vcl.control.FixedText"
-    #define VCL_CONTROL_COMMANDBUTTON "stardiv.vcl.control.Button"
-    #define VCL_CONTROL_CHECKBOX "stardiv.vcl.control.CheckBox"
-    #define VCL_CONTROL_IMAGEBUTTON "stardiv.vcl.control.ImageButton"
-    #define VCL_CONTROL_FILECONTROL "stardiv.vcl.control.FileControl"
-    #define VCL_CONTROL_TIMEFIELD "stardiv.vcl.control.TimeField"
-    #define VCL_CONTROL_DATEFIELD "stardiv.vcl.control.DateField"
-    #define VCL_CONTROL_NUMERICFIELD "stardiv.vcl.control.NumericField"
-    #define VCL_CONTROL_CURRENCYFIELD "stardiv.vcl.control.CurrencyField"
-    #define VCL_CONTROL_PATTERNFIELD "stardiv.vcl.control.PatternField"
-    #define VCL_CONTROL_FORMATTEDFIELD "stardiv.vcl.control.FormattedField"
-    #define VCL_CONTROL_IMAGECONTROL "stardiv.vcl.control.ImageControl"
-
-    #define VCL_CONTROLMODEL_EDIT             "stardiv.vcl.controlmodel.Edit"
-    #define VCL_CONTROLMODEL_LISTBOX          "stardiv.vcl.controlmodel.ListBox"
-    #define VCL_CONTROLMODEL_COMBOBOX         "stardiv.vcl.controlmodel.ComboBox"
-    #define VCL_CONTROLMODEL_RADIOBUTTON      "stardiv.vcl.controlmodel.RadioButton"
-    #define VCL_CONTROLMODEL_GROUPBOX         "stardiv.vcl.controlmodel.GroupBox"
-    #define VCL_CONTROLMODEL_FIXEDTEXT        "stardiv.vcl.controlmodel.FixedText"
-    #define VCL_CONTROLMODEL_COMMANDBUTTON    "stardiv.vcl.controlmodel.Button"
-    #define VCL_CONTROLMODEL_CHECKBOX         "stardiv.vcl.controlmodel.CheckBox"
-    #define VCL_CONTROLMODEL_IMAGEBUTTON      "stardiv.vcl.controlmodel.ImageButton"
-    #define VCL_CONTROLMODEL_FILECONTROL      "stardiv.vcl.controlmodel.FileControl"
-    #define VCL_CONTROLMODEL_TIMEFIELD        "stardiv.vcl.controlmodel.TimeField"
-    #define VCL_CONTROLMODEL_DATEFIELD        "stardiv.vcl.controlmodel.DateField"
-    #define VCL_CONTROLMODEL_NUMERICFIELD     "stardiv.vcl.controlmodel.NumericField"
-    #define VCL_CONTROLMODEL_CURRENCYFIELD    "stardiv.vcl.controlmodel.CurrencyField"
-    #define VCL_CONTROLMODEL_PATTERNFIELD     "stardiv.vcl.controlmodel.PatternField"
-    #define VCL_CONTROLMODEL_FORMATTEDFIELD   "stardiv.vcl.controlmodel.FormattedField"
-    #define VCL_CONTROLMODEL_IMAGECONTROL     "stardiv.vcl.controlmodel.ImageControl"
-
-    #define VCL_CONTROLMODEL_SCROLLBAR        "com.sun.star.awt.UnoControlScrollBarModel"
-    #define VCL_CONTROL_SCROLLBAR             "com.sun.star.awt.UnoControlScrollBar"
-    #define VCL_CONTROLMODEL_SPINBUTTON       "com.sun.star.awt.UnoControlSpinButtonModel"
-    #define VCL_CONTROL_SPINBUTTON            "com.sun.star.awt.UnoControlSpinButton"
-
-
-    // service names for compatibility
-
-    #define FRM_COMPONENT_FORM "stardiv.one.form.component.Form"
-    #define FRM_COMPONENT_EDIT "stardiv.one.form.component.Edit"           // compatibility
-    #define FRM_COMPONENT_TEXTFIELD "stardiv.one.form.component.TextField"
-    #define FRM_COMPONENT_LISTBOX "stardiv.one.form.component.ListBox"
-    #define FRM_COMPONENT_COMBOBOX "stardiv.one.form.component.ComboBox"
-    #define FRM_COMPONENT_RADIOBUTTON "stardiv.one.form.component.RadioButton"
-    #define FRM_COMPONENT_GROUPBOX "stardiv.one.form.component.GroupBox"       // compatibility
-    #define FRM_COMPONENT_FIXEDTEXT "stardiv.one.form.component.FixedText"     // compatibility
-    #define FRM_COMPONENT_COMMANDBUTTON "stardiv.one.form.component.CommandButton"
-    #define FRM_COMPONENT_CHECKBOX "stardiv.one.form.component.CheckBox"
-    #define FRM_COMPONENT_GRID "stardiv.one.form.component.Grid"           // compatibility
-    #define FRM_COMPONENT_GRIDCONTROL "stardiv.one.form.component.GridControl"
-    #define FRM_COMPONENT_IMAGEBUTTON "stardiv.one.form.component.ImageButton"
-    #define FRM_COMPONENT_FILECONTROL "stardiv.one.form.component.FileControl"
-    #define FRM_COMPONENT_TIMEFIELD "stardiv.one.form.component.TimeField"
-    #define FRM_COMPONENT_DATEFIELD "stardiv.one.form.component.DateField"
-    #define FRM_COMPONENT_NUMERICFIELD "stardiv.one.form.component.NumericField"
-    #define FRM_COMPONENT_CURRENCYFIELD "stardiv.one.form.component.CurrencyField"
-    #define FRM_COMPONENT_PATTERNFIELD "stardiv.one.form.component.PatternField"
-    #define FRM_COMPONENT_HIDDEN "stardiv.one.form.component.Hidden"
-    #define FRM_COMPONENT_HIDDENCONTROL "stardiv.one.form.component.HiddenControl"
-    #define FRM_COMPONENT_IMAGECONTROL "stardiv.one.form.component.ImageControl"
-    #define FRM_COMPONENT_FORMATTEDFIELD "stardiv.one.form.component.FormattedField"
-
-    // <compatibility_I>
-    #define STARDIV_ONE_FORM_CONTROL_COMMANDBUTTON   "stardiv.one.form.control.CommandButton"
-    #define STARDIV_ONE_FORM_CONTROL_RADIOBUTTON     "stardiv.one.form.control.RadioButton"
-    #define STARDIV_ONE_FORM_CONTROL_CHECKBOX        "stardiv.one.form.control.CheckBox"
-    #define STARDIV_ONE_FORM_CONTROL_EDIT            "stardiv.one.form.control.Edit"
-    #define STARDIV_ONE_FORM_CONTROL_LISTBOX         "stardiv.one.form.control.ListBox"
-    #define STARDIV_ONE_FORM_CONTROL_COMBOBOX        "stardiv.one.form.control.ComboBox"
-    #define STARDIV_ONE_FORM_CONTROL_GROUPBOX        "stardiv.one.form.control.GroupBox"
-    #define STARDIV_ONE_FORM_CONTROL_TEXTFIELD       "stardiv.one.form.control.TextField"
-    #define STARDIV_ONE_FORM_CONTROL_GRID            "stardiv.one.form.control.Grid"
-    #define STARDIV_ONE_FORM_CONTROL_IMAGEBUTTON     "stardiv.one.form.control.ImageButton"
-    #define STARDIV_ONE_FORM_CONTROL_TIMEFIELD       "stardiv.one.form.control.TimeField"
-    #define STARDIV_ONE_FORM_CONTROL_DATEFIELD       "stardiv.one.form.control.DateField"
-    #define STARDIV_ONE_FORM_CONTROL_NUMERICFIELD    "stardiv.one.form.control.NumericField"
-    #define STARDIV_ONE_FORM_CONTROL_CURRENCYFIELD   "stardiv.one.form.control.CurrencyField"
-    #define STARDIV_ONE_FORM_CONTROL_PATTERNFIELD    "stardiv.one.form.control.PatternField"
-    #define STARDIV_ONE_FORM_CONTROL_IMAGECONTROL    "stardiv.one.form.control.ImageControl"
-    #define STARDIV_ONE_FORM_CONTROL_FORMATTEDFIELD  "stardiv.one.form.control.FormattedField"
-    // </compatibility_I>
-
-
-    // new (sun) service names
-
-    #define FRM_SUN_COMPONENT_FORM            "com.sun.star.form.component.Form"
-    #define FRM_SUN_COMPONENT_HTMLFORM        "com.sun.star.form.component.HTMLForm"
-    #define FRM_SUN_COMPONENT_DATAFORM        "com.sun.star.form.component.DataForm"
-    #define FRM_SUN_COMPONENT_TEXTFIELD       "com.sun.star.form.component.TextField"
-    #define FRM_SUN_COMPONENT_LISTBOX         "com.sun.star.form.component.ListBox"
-    #define FRM_SUN_COMPONENT_COMBOBOX        "com.sun.star.form.component.ComboBox"
-    #define FRM_SUN_COMPONENT_RADIOBUTTON     "com.sun.star.form.component.RadioButton"
-    #define FRM_SUN_COMPONENT_GROUPBOX        "com.sun.star.form.component.GroupBox"
-    #define FRM_SUN_COMPONENT_FIXEDTEXT       "com.sun.star.form.component.FixedText"
-    #define FRM_SUN_COMPONENT_COMMANDBUTTON   "com.sun.star.form.component.CommandButton"
-    #define FRM_SUN_COMPONENT_CHECKBOX        "com.sun.star.form.component.CheckBox"
-    #define FRM_SUN_COMPONENT_GRIDCONTROL     "com.sun.star.form.component.GridControl"
-    #define FRM_SUN_COMPONENT_IMAGEBUTTON     "com.sun.star.form.component.ImageButton"
-    #define FRM_SUN_COMPONENT_FILECONTROL     "com.sun.star.form.component.FileControl"
-    #define FRM_SUN_COMPONENT_TIMEFIELD       "com.sun.star.form.component.TimeField"
-    #define FRM_SUN_COMPONENT_DATEFIELD       "com.sun.star.form.component.DateField"
-    #define FRM_SUN_COMPONENT_NUMERICFIELD    "com.sun.star.form.component.NumericField"
-    #define FRM_SUN_COMPONENT_CURRENCYFIELD   "com.sun.star.form.component.CurrencyField"
-    #define FRM_SUN_COMPONENT_PATTERNFIELD    "com.sun.star.form.component.PatternField"
-    #define FRM_SUN_COMPONENT_HIDDENCONTROL   "com.sun.star.form.component.HiddenControl"
-    #define FRM_SUN_COMPONENT_FORMATTEDFIELD  "com.sun.star.form.component.FormattedField"
-    #define FRM_SUN_COMPONENT_SCROLLBAR       "com.sun.star.form.component.ScrollBar"
-    #define FRM_SUN_COMPONENT_SPINBUTTON      "com.sun.star.form.component.SpinButton"
-    #define FRM_SUN_COMPONENT_RICHTEXTCONTROL "com.sun.star.form.component.RichTextControl"
-    #define FRM_SUN_COMPONENT_NAVTOOLBAR      "com.sun.star.form.component.NavigationToolBar"
-    #define FRM_SUN_COMPONENT_SUBMITBUTTON    "com.sun.star.form.component.SubmitButton"
-
-    #define FRM_SUN_COMPONENT_IMAGECONTROL "com.sun.star.form.component.DatabaseImageControl"
-    #define FRM_SUN_COMPONENT_DATABASE_RADIOBUTTON "com.sun.star.form.component.DatabaseRadioButton"
-    #define FRM_SUN_COMPONENT_DATABASE_CHECKBOX "com.sun.star.form.component.DatabaseCheckBox"
-    #define FRM_SUN_COMPONENT_DATABASE_LISTBOX "com.sun.star.form.component.DatabaseListBox"
-    #define FRM_SUN_COMPONENT_DATABASE_COMBOBOX "com.sun.star.form.component.DatabaseComboBox"
-    #define FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD "com.sun.star.form.component.DatabaseFormattedField"
-    #define FRM_SUN_COMPONENT_DATABASE_TEXTFIELD "com.sun.star.form.component.DatabaseTextField"
-    #define FRM_SUN_COMPONENT_DATABASE_DATEFIELD "com.sun.star.form.component.DatabaseDateField"
-    #define FRM_SUN_COMPONENT_DATABASE_TIMEFIELD "com.sun.star.form.component.DatabaseTimeField"
-    #define FRM_SUN_COMPONENT_DATABASE_NUMERICFIELD "com.sun.star.form.component.DatabaseNumericField"
-    #define FRM_SUN_COMPONENT_DATABASE_CURRENCYFIELD "com.sun.star.form.component.DatabaseCurrencyField"
-    #define FRM_SUN_COMPONENT_DATABASE_PATTERNFIELD "com.sun.star.form.component.DatabasePatternField"
-
-    #define FRM_SUN_CONTROL_TEXTFIELD "com.sun.star.form.control.TextField"
-    #define FRM_SUN_CONTROL_LISTBOX "com.sun.star.form.control.ListBox"
-    #define FRM_SUN_CONTROL_COMBOBOX "com.sun.star.form.control.ComboBox"
-    #define FRM_SUN_CONTROL_RADIOBUTTON "com.sun.star.form.control.RadioButton"
-    #define FRM_SUN_CONTROL_GROUPBOX "com.sun.star.form.control.GroupBox"
-    #define FRM_SUN_CONTROL_FIXEDTEXT "com.sun.star.form.control.FixedText"
-    #define FRM_SUN_CONTROL_COMMANDBUTTON "com.sun.star.form.control.CommandButton"
-    #define FRM_SUN_CONTROL_CHECKBOX "com.sun.star.form.control.CheckBox"
-    #define FRM_SUN_CONTROL_GRIDCONTROL "com.sun.star.form.control.GridControl"
-    #define FRM_SUN_CONTROL_IMAGEBUTTON "com.sun.star.form.control.ImageButton"
-    #define FRM_SUN_CONTROL_TIMEFIELD "com.sun.star.form.control.TimeField"
-    #define FRM_SUN_CONTROL_DATEFIELD "com.sun.star.form.control.DateField"
-    #define FRM_SUN_CONTROL_NUMERICFIELD "com.sun.star.form.control.NumericField"
-    #define FRM_SUN_CONTROL_CURRENCYFIELD "com.sun.star.form.control.CurrencyField"
-    #define FRM_SUN_CONTROL_PATTERNFIELD "com.sun.star.form.control.PatternField"
-    #define FRM_SUN_CONTROL_IMAGECONTROL "com.sun.star.form.control.ImageControl"
-    #define FRM_SUN_CONTROL_FORMATTEDFIELD "com.sun.star.form.control.FormattedField"
-    #define FRM_SUN_CONTROL_RICHTEXTCONTROL "com.sun.star.form.control.RichTextControl"
-    #define FRM_SUN_CONTROL_SUBMITBUTTON   "com.sun.star.form.control.SubmitButton"
-
-    #define BINDABLE_DATABASE_CHECK_BOX      "com.sun.star.form.binding.BindableDatabaseCheckBox"
-    #define BINDABLE_DATABASE_COMBO_BOX      "com.sun.star.form.binding.BindableDatabaseComboBox"
-    #define BINDABLE_DATABASE_FORMATTED_FIELD "com.sun.star.form.binding.BindableDatabaseFormattedField"
-    #define BINDABLE_DATABASE_LIST_BOX       "com.sun.star.form.binding.BindableDatabaseListBox"
-    #define BINDABLE_DATABASE_NUMERIC_FIELD  "com.sun.star.form.binding.BindableDatabaseNumericField"
-    #define BINDABLE_DATABASE_RADIO_BUTTON   "com.sun.star.form.binding.BindableDatabaseRadioButton"
-    #define BINDABLE_DATABASE_TEXT_FIELD     "com.sun.star.form.binding.BindableDatabaseTextField"
-    #define BINDABLE_DATABASE_DATE_FIELD     "com.sun.star.form.binding.BindableDatabaseDateField"
-    #define BINDABLE_DATABASE_TIME_FIELD     "com.sun.star.form.binding.BindableDatabaseTimeField"
-
-    #define BINDABLE_CONTROL_MODEL            "com.sun.star.form.binding.BindableControlModel"
-    #define BINDABLE_INTEGER_VALUE_RANGE      "com.sun.star.form.binding.BindableIntegerValueRange"
-    #define BINDABLE_DATA_AWARE_CONTROL_MODEL "com.sun.star.form.binding.BindableDataAwareControlModel"
-    #define DATA_AWARE_CONTROL_MODEL          "com.sun.star.form.binding.DataAwareControlModel"
-    #define VALIDATABLE_CONTROL_MODEL         "com.sun.star.form.binding.ValidatableControlModel"
-    #define VALIDATABLE_BINDABLE_CONTROL_MODEL "com.sun.star.form.binding.ValidatableBindableControlModel"
-
-
-    // common
-
-    #define FRM_SUN_FORMCOMPONENT "com.sun.star.form.FormComponent"
-
-
-    // misc
-
-    #define SRV_AWT_IMAGEPRODUCER "com.sun.star.awt.ImageProducer"
-
-    #define SRV_SDB_ROWSET "com.sun.star.sdb.RowSet"
-    #define SRV_SDB_CONNECTION "com.sun.star.sdb.Connection"
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OFixedTextModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL ORadioButtonModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL ORadioButtonControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OCheckBoxModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OCheckBoxControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OHiddenModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OGroupBoxModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OGroupBoxControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OListBoxControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OListBoxModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OComboBoxControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OComboBoxModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OEditControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OEditModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL ONumericControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL ONumericModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OPatternControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OPatternModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OCurrencyControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OCurrencyModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL ODateControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL ODateModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OTimeControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OTimeModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OFormattedControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OFormattedModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OFileControlModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OButtonControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OButtonModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OImageButtonControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OImageButtonModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OImageControlControl_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OImageControlModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OGridControlModel_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-// XForms objects
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL Binding_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL Model_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL XForms_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-// some special handling for the FormattedFieldWrapper which can act as FormattedModel or as EditModel
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OFormattedFieldWrapper_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-    // this is for a service, which is instantiated through the EditModel service name
-    // and which acts mostly as Edit (mostly means : if somebody uses XPersistObject::read immediately after
-    // the object was instantiated and the stream contains a FormattedModel, it switches permanently to
-    // formatted.)
-css::uno::Reference<css::uno::XInterface> SAL_CALL
-OFormattedFieldWrapper_CreateInstance_ForceFormatted(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL OFormsCollection_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL ImageProducer_CreateInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxFactory);
-
-}   // namespace frm
+#define AWT_CONTROL_TEXTFIELD "com.sun.star.awt.TextField"
+
+#define VCL_CONTROL_EDIT "stardiv.vcl.control.Edit"
+#define VCL_CONTROL_LISTBOX "stardiv.vcl.control.ListBox"
+#define VCL_CONTROL_COMBOBOX "stardiv.vcl.control.ComboBox"
+#define VCL_CONTROL_RADIOBUTTON "stardiv.vcl.control.RadioButton"
+#define VCL_CONTROL_GROUPBOX "stardiv.vcl.control.GroupBox"
+#define VCL_CONTROL_FIXEDTEXT "stardiv.vcl.control.FixedText"
+#define VCL_CONTROL_COMMANDBUTTON "stardiv.vcl.control.Button"
+#define VCL_CONTROL_CHECKBOX "stardiv.vcl.control.CheckBox"
+#define VCL_CONTROL_IMAGEBUTTON "stardiv.vcl.control.ImageButton"
+#define VCL_CONTROL_FILECONTROL "stardiv.vcl.control.FileControl"
+#define VCL_CONTROL_TIMEFIELD "stardiv.vcl.control.TimeField"
+#define VCL_CONTROL_DATEFIELD "stardiv.vcl.control.DateField"
+#define VCL_CONTROL_NUMERICFIELD "stardiv.vcl.control.NumericField"
+#define VCL_CONTROL_CURRENCYFIELD "stardiv.vcl.control.CurrencyField"
+#define VCL_CONTROL_PATTERNFIELD "stardiv.vcl.control.PatternField"
+#define VCL_CONTROL_FORMATTEDFIELD "stardiv.vcl.control.FormattedField"
+#define VCL_CONTROL_IMAGECONTROL "stardiv.vcl.control.ImageControl"
+
+#define VCL_CONTROLMODEL_EDIT             "stardiv.vcl.controlmodel.Edit"
+#define VCL_CONTROLMODEL_LISTBOX          "stardiv.vcl.controlmodel.ListBox"
+#define VCL_CONTROLMODEL_COMBOBOX         "stardiv.vcl.controlmodel.ComboBox"
+#define VCL_CONTROLMODEL_RADIOBUTTON      "stardiv.vcl.controlmodel.RadioButton"
+#define VCL_CONTROLMODEL_GROUPBOX         "stardiv.vcl.controlmodel.GroupBox"
+#define VCL_CONTROLMODEL_FIXEDTEXT        "stardiv.vcl.controlmodel.FixedText"
+#define VCL_CONTROLMODEL_COMMANDBUTTON    "stardiv.vcl.controlmodel.Button"
+#define VCL_CONTROLMODEL_CHECKBOX         "stardiv.vcl.controlmodel.CheckBox"
+#define VCL_CONTROLMODEL_IMAGEBUTTON      "stardiv.vcl.controlmodel.ImageButton"
+#define VCL_CONTROLMODEL_FILECONTROL      "stardiv.vcl.controlmodel.FileControl"
+#define VCL_CONTROLMODEL_TIMEFIELD        "stardiv.vcl.controlmodel.TimeField"
+#define VCL_CONTROLMODEL_DATEFIELD        "stardiv.vcl.controlmodel.DateField"
+#define VCL_CONTROLMODEL_NUMERICFIELD     "stardiv.vcl.controlmodel.NumericField"
+#define VCL_CONTROLMODEL_CURRENCYFIELD    "stardiv.vcl.controlmodel.CurrencyField"
+#define VCL_CONTROLMODEL_PATTERNFIELD     "stardiv.vcl.controlmodel.PatternField"
+#define VCL_CONTROLMODEL_FORMATTEDFIELD   "stardiv.vcl.controlmodel.FormattedField"
+#define VCL_CONTROLMODEL_IMAGECONTROL     "stardiv.vcl.controlmodel.ImageControl"
+
+#define VCL_CONTROLMODEL_SCROLLBAR        "com.sun.star.awt.UnoControlScrollBarModel"
+#define VCL_CONTROL_SCROLLBAR             "com.sun.star.awt.UnoControlScrollBar"
+#define VCL_CONTROLMODEL_SPINBUTTON       "com.sun.star.awt.UnoControlSpinButtonModel"
+#define VCL_CONTROL_SPINBUTTON            "com.sun.star.awt.UnoControlSpinButton"
+
+// service names for compatibility
+
+#define FRM_COMPONENT_FORM "stardiv.one.form.component.Form"
+#define FRM_COMPONENT_EDIT "stardiv.one.form.component.Edit"           // compatibility
+#define FRM_COMPONENT_TEXTFIELD "stardiv.one.form.component.TextField"
+#define FRM_COMPONENT_LISTBOX "stardiv.one.form.component.ListBox"
+#define FRM_COMPONENT_COMBOBOX "stardiv.one.form.component.ComboBox"
+#define FRM_COMPONENT_RADIOBUTTON "stardiv.one.form.component.RadioButton"
+#define FRM_COMPONENT_GROUPBOX "stardiv.one.form.component.GroupBox"       // compatibility
+#define FRM_COMPONENT_FIXEDTEXT "stardiv.one.form.component.FixedText"     // compatibility
+#define FRM_COMPONENT_COMMANDBUTTON "stardiv.one.form.component.CommandButton"
+#define FRM_COMPONENT_CHECKBOX "stardiv.one.form.component.CheckBox"
+#define FRM_COMPONENT_GRID "stardiv.one.form.component.Grid"           // compatibility
+#define FRM_COMPONENT_GRIDCONTROL "stardiv.one.form.component.GridControl"
+#define FRM_COMPONENT_IMAGEBUTTON "stardiv.one.form.component.ImageButton"
+#define FRM_COMPONENT_FILECONTROL "stardiv.one.form.component.FileControl"
+#define FRM_COMPONENT_TIMEFIELD "stardiv.one.form.component.TimeField"
+#define FRM_COMPONENT_DATEFIELD "stardiv.one.form.component.DateField"
+#define FRM_COMPONENT_NUMERICFIELD "stardiv.one.form.component.NumericField"
+#define FRM_COMPONENT_CURRENCYFIELD "stardiv.one.form.component.CurrencyField"
+#define FRM_COMPONENT_PATTERNFIELD "stardiv.one.form.component.PatternField"
+#define FRM_COMPONENT_HIDDEN "stardiv.one.form.component.Hidden"
+#define FRM_COMPONENT_HIDDENCONTROL "stardiv.one.form.component.HiddenControl"
+#define FRM_COMPONENT_IMAGECONTROL "stardiv.one.form.component.ImageControl"
+#define FRM_COMPONENT_FORMATTEDFIELD "stardiv.one.form.component.FormattedField"
+
+// <compatibility_I>
+#define STARDIV_ONE_FORM_CONTROL_COMMANDBUTTON   "stardiv.one.form.control.CommandButton"
+#define STARDIV_ONE_FORM_CONTROL_RADIOBUTTON     "stardiv.one.form.control.RadioButton"
+#define STARDIV_ONE_FORM_CONTROL_CHECKBOX        "stardiv.one.form.control.CheckBox"
+#define STARDIV_ONE_FORM_CONTROL_EDIT            "stardiv.one.form.control.Edit"
+#define STARDIV_ONE_FORM_CONTROL_LISTBOX         "stardiv.one.form.control.ListBox"
+#define STARDIV_ONE_FORM_CONTROL_COMBOBOX        "stardiv.one.form.control.ComboBox"
+#define STARDIV_ONE_FORM_CONTROL_GROUPBOX        "stardiv.one.form.control.GroupBox"
+#define STARDIV_ONE_FORM_CONTROL_TEXTFIELD       "stardiv.one.form.control.TextField"
+#define STARDIV_ONE_FORM_CONTROL_GRID            "stardiv.one.form.control.Grid"
+#define STARDIV_ONE_FORM_CONTROL_IMAGEBUTTON     "stardiv.one.form.control.ImageButton"
+#define STARDIV_ONE_FORM_CONTROL_TIMEFIELD       "stardiv.one.form.control.TimeField"
+#define STARDIV_ONE_FORM_CONTROL_DATEFIELD       "stardiv.one.form.control.DateField"
+#define STARDIV_ONE_FORM_CONTROL_NUMERICFIELD    "stardiv.one.form.control.NumericField"
+#define STARDIV_ONE_FORM_CONTROL_CURRENCYFIELD   "stardiv.one.form.control.CurrencyField"
+#define STARDIV_ONE_FORM_CONTROL_PATTERNFIELD    "stardiv.one.form.control.PatternField"
+#define STARDIV_ONE_FORM_CONTROL_IMAGECONTROL    "stardiv.one.form.control.ImageControl"
+#define STARDIV_ONE_FORM_CONTROL_FORMATTEDFIELD  "stardiv.one.form.control.FormattedField"
+// </compatibility_I>
+
+// new (sun) service names
+
+#define FRM_SUN_COMPONENT_FORM            "com.sun.star.form.component.Form"
+#define FRM_SUN_COMPONENT_HTMLFORM        "com.sun.star.form.component.HTMLForm"
+#define FRM_SUN_COMPONENT_DATAFORM        "com.sun.star.form.component.DataForm"
+#define FRM_SUN_COMPONENT_TEXTFIELD       "com.sun.star.form.component.TextField"
+#define FRM_SUN_COMPONENT_LISTBOX         "com.sun.star.form.component.ListBox"
+#define FRM_SUN_COMPONENT_COMBOBOX        "com.sun.star.form.component.ComboBox"
+#define FRM_SUN_COMPONENT_RADIOBUTTON     "com.sun.star.form.component.RadioButton"
+#define FRM_SUN_COMPONENT_GROUPBOX        "com.sun.star.form.component.GroupBox"
+#define FRM_SUN_COMPONENT_FIXEDTEXT       "com.sun.star.form.component.FixedText"
+#define FRM_SUN_COMPONENT_COMMANDBUTTON   "com.sun.star.form.component.CommandButton"
+#define FRM_SUN_COMPONENT_CHECKBOX        "com.sun.star.form.component.CheckBox"
+#define FRM_SUN_COMPONENT_GRIDCONTROL     "com.sun.star.form.component.GridControl"
+#define FRM_SUN_COMPONENT_IMAGEBUTTON     "com.sun.star.form.component.ImageButton"
+#define FRM_SUN_COMPONENT_FILECONTROL     "com.sun.star.form.component.FileControl"
+#define FRM_SUN_COMPONENT_TIMEFIELD       "com.sun.star.form.component.TimeField"
+#define FRM_SUN_COMPONENT_DATEFIELD       "com.sun.star.form.component.DateField"
+#define FRM_SUN_COMPONENT_NUMERICFIELD    "com.sun.star.form.component.NumericField"
+#define FRM_SUN_COMPONENT_CURRENCYFIELD   "com.sun.star.form.component.CurrencyField"
+#define FRM_SUN_COMPONENT_PATTERNFIELD    "com.sun.star.form.component.PatternField"
+#define FRM_SUN_COMPONENT_HIDDENCONTROL   "com.sun.star.form.component.HiddenControl"
+#define FRM_SUN_COMPONENT_FORMATTEDFIELD  "com.sun.star.form.component.FormattedField"
+#define FRM_SUN_COMPONENT_SCROLLBAR       "com.sun.star.form.component.ScrollBar"
+#define FRM_SUN_COMPONENT_SPINBUTTON      "com.sun.star.form.component.SpinButton"
+#define FRM_SUN_COMPONENT_RICHTEXTCONTROL "com.sun.star.form.component.RichTextControl"
+#define FRM_SUN_COMPONENT_NAVTOOLBAR      "com.sun.star.form.component.NavigationToolBar"
+#define FRM_SUN_COMPONENT_SUBMITBUTTON    "com.sun.star.form.component.SubmitButton"
+
+#define FRM_SUN_COMPONENT_IMAGECONTROL "com.sun.star.form.component.DatabaseImageControl"
+#define FRM_SUN_COMPONENT_DATABASE_RADIOBUTTON "com.sun.star.form.component.DatabaseRadioButton"
+#define FRM_SUN_COMPONENT_DATABASE_CHECKBOX "com.sun.star.form.component.DatabaseCheckBox"
+#define FRM_SUN_COMPONENT_DATABASE_LISTBOX "com.sun.star.form.component.DatabaseListBox"
+#define FRM_SUN_COMPONENT_DATABASE_COMBOBOX "com.sun.star.form.component.DatabaseComboBox"
+#define FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD "com.sun.star.form.component.DatabaseFormattedField"
+#define FRM_SUN_COMPONENT_DATABASE_TEXTFIELD "com.sun.star.form.component.DatabaseTextField"
+#define FRM_SUN_COMPONENT_DATABASE_DATEFIELD "com.sun.star.form.component.DatabaseDateField"
+#define FRM_SUN_COMPONENT_DATABASE_TIMEFIELD "com.sun.star.form.component.DatabaseTimeField"
+#define FRM_SUN_COMPONENT_DATABASE_NUMERICFIELD "com.sun.star.form.component.DatabaseNumericField"
+#define FRM_SUN_COMPONENT_DATABASE_CURRENCYFIELD "com.sun.star.form.component.DatabaseCurrencyField"
+#define FRM_SUN_COMPONENT_DATABASE_PATTERNFIELD "com.sun.star.form.component.DatabasePatternField"
+
+#define FRM_SUN_CONTROL_TEXTFIELD "com.sun.star.form.control.TextField"
+#define FRM_SUN_CONTROL_LISTBOX "com.sun.star.form.control.ListBox"
+#define FRM_SUN_CONTROL_COMBOBOX "com.sun.star.form.control.ComboBox"
+#define FRM_SUN_CONTROL_RADIOBUTTON "com.sun.star.form.control.RadioButton"
+#define FRM_SUN_CONTROL_GROUPBOX "com.sun.star.form.control.GroupBox"
+#define FRM_SUN_CONTROL_FIXEDTEXT "com.sun.star.form.control.FixedText"
+#define FRM_SUN_CONTROL_COMMANDBUTTON "com.sun.star.form.control.CommandButton"
+#define FRM_SUN_CONTROL_CHECKBOX "com.sun.star.form.control.CheckBox"
+#define FRM_SUN_CONTROL_GRIDCONTROL "com.sun.star.form.control.GridControl"
+#define FRM_SUN_CONTROL_IMAGEBUTTON "com.sun.star.form.control.ImageButton"
+#define FRM_SUN_CONTROL_TIMEFIELD "com.sun.star.form.control.TimeField"
+#define FRM_SUN_CONTROL_DATEFIELD "com.sun.star.form.control.DateField"
+#define FRM_SUN_CONTROL_NUMERICFIELD "com.sun.star.form.control.NumericField"
+#define FRM_SUN_CONTROL_CURRENCYFIELD "com.sun.star.form.control.CurrencyField"
+#define FRM_SUN_CONTROL_PATTERNFIELD "com.sun.star.form.control.PatternField"
+#define FRM_SUN_CONTROL_IMAGECONTROL "com.sun.star.form.control.ImageControl"
+#define FRM_SUN_CONTROL_FORMATTEDFIELD "com.sun.star.form.control.FormattedField"
+#define FRM_SUN_CONTROL_RICHTEXTCONTROL "com.sun.star.form.control.RichTextControl"
+#define FRM_SUN_CONTROL_SUBMITBUTTON   "com.sun.star.form.control.SubmitButton"
+
+#define BINDABLE_DATABASE_CHECK_BOX      "com.sun.star.form.binding.BindableDatabaseCheckBox"
+#define BINDABLE_DATABASE_COMBO_BOX      "com.sun.star.form.binding.BindableDatabaseComboBox"
+#define BINDABLE_DATABASE_FORMATTED_FIELD "com.sun.star.form.binding.BindableDatabaseFormattedField"
+#define BINDABLE_DATABASE_LIST_BOX       "com.sun.star.form.binding.BindableDatabaseListBox"
+#define BINDABLE_DATABASE_NUMERIC_FIELD  "com.sun.star.form.binding.BindableDatabaseNumericField"
+#define BINDABLE_DATABASE_RADIO_BUTTON   "com.sun.star.form.binding.BindableDatabaseRadioButton"
+#define BINDABLE_DATABASE_TEXT_FIELD     "com.sun.star.form.binding.BindableDatabaseTextField"
+#define BINDABLE_DATABASE_DATE_FIELD     "com.sun.star.form.binding.BindableDatabaseDateField"
+#define BINDABLE_DATABASE_TIME_FIELD     "com.sun.star.form.binding.BindableDatabaseTimeField"
+
+#define BINDABLE_CONTROL_MODEL            "com.sun.star.form.binding.BindableControlModel"
+#define BINDABLE_INTEGER_VALUE_RANGE      "com.sun.star.form.binding.BindableIntegerValueRange"
+#define BINDABLE_DATA_AWARE_CONTROL_MODEL "com.sun.star.form.binding.BindableDataAwareControlModel"
+#define DATA_AWARE_CONTROL_MODEL          "com.sun.star.form.binding.DataAwareControlModel"
+#define VALIDATABLE_CONTROL_MODEL         "com.sun.star.form.binding.ValidatableControlModel"
+#define VALIDATABLE_BINDABLE_CONTROL_MODEL "com.sun.star.form.binding.ValidatableBindableControlModel"
+
+// common
+
+#define FRM_SUN_FORMCOMPONENT "com.sun.star.form.FormComponent"
+
+// misc
+
+#define SRV_AWT_IMAGEPRODUCER "com.sun.star.awt.ImageProducer"
+
+#define SRV_SDB_ROWSET "com.sun.star.sdb.RowSet"
+#define SRV_SDB_CONNECTION "com.sun.star.sdb.Connection"
 
 extern "C" {
 
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
deleted file mode 100644
index 63a1b147b590..000000000000
--- a/forms/source/misc/services.cxx
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <config_features.h>
-
-#include "services.hxx"
-#include "frm_module.hxx"
-#include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
-#include <uno/mapping.hxx>
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-
-static Sequence< OUString >              s_aClassImplementationNames;
-static Sequence<Sequence< OUString > >   s_aClassServiceNames;
-
-// need to use sal_Int64 instead of ComponentInstantiation, as ComponentInstantiation has no cppuType, so
-// it can't be used with sequences
-static Sequence<sal_Int64>               s_aFactories;
-
-void registerClassInfo(
-        const OUString& _rClassImplName,                 // the ImplName of the class
-        const Sequence< OUString >& _rServiceNames,      // the services supported by this class
-        ::cppu::ComponentInstantiation _pCreateFunction  // the method for instantiating such a class
-        )
-{
-    sal_Int32 nCurrentLength = s_aClassImplementationNames.getLength();
-    OSL_ENSURE((nCurrentLength == s_aClassServiceNames.getLength())
-        && (nCurrentLength == s_aFactories.getLength()),
-        "forms::registerClassInfo : invalid class infos !");
-
-    s_aClassImplementationNames.realloc(nCurrentLength + 1);
-    s_aClassServiceNames.realloc(nCurrentLength + 1);
-    s_aFactories.realloc(nCurrentLength + 1);
-
-    s_aClassImplementationNames.getArray()[nCurrentLength] = _rClassImplName;
-    s_aClassServiceNames.getArray()[nCurrentLength] = _rServiceNames;
-    s_aFactories.getArray()[nCurrentLength] = reinterpret_cast<sal_Int64>(_pCreateFunction);
-}
-
-
-void ensureClassInfos()
-{
-    if (s_aClassImplementationNames.getLength())
-        // nothing to do
-        return;
-    Sequence< OUString > aServices;
-
-    aServices.realloc(1);
-    aServices[0] = "com.sun.star.xforms.XForms";
-
-    registerClassInfo(
-        "com.sun.star.form.XForms",
-        aServices,
-        frm::XForms_CreateInstance);
-}
-
-
-extern "C"
-{
-
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pImplName, void* _pServiceManager, void* /*_pRegistryKey*/)
-{
-    if (!_pServiceManager || !_pImplName)
-        return NULL;
-
-
-    // a lot of stuff which is implemented "manually" here in this file
-    void* pRet = NULL;
-
-    // collect the class infos
-    ensureClassInfos();
-
-    // both our static sequences should have the same length ...
-    sal_Int32 nClasses = s_aClassImplementationNames.getLength();
-    OSL_ENSURE((s_aClassServiceNames.getLength() == nClasses) &&
-        (s_aFactories.getLength() == nClasses),
-        "forms::component_getFactory : invalid class infos !");
-
-    // loop through the sequences and register the service providers
-    const OUString* pClasses = s_aClassImplementationNames.getConstArray();
-    const Sequence< OUString >* pServices = s_aClassServiceNames.getConstArray();
-    const sal_Int64* pFunctionsAsInts = s_aFactories.getConstArray();
-
-    for (sal_Int32 i=0; i<nClasses; ++i, ++pClasses, ++pServices, ++pFunctionsAsInts)
-    {
-        if (rtl_ustr_ascii_compare(pClasses->getStr(), _pImplName) == 0)
-        {
-            ::cppu::ComponentInstantiation aCurrentCreateFunction =
-                reinterpret_cast< ::cppu::ComponentInstantiation>(*pFunctionsAsInts);
-
-            Reference<XSingleServiceFactory> xFactory(
-                ::cppu::createSingleFactory(
-                    static_cast<css::lang::XMultiServiceFactory*>(
-                        _pServiceManager),
-                    *pClasses,
-                    aCurrentCreateFunction,
-                    *pServices
-                )
-            );
-            if (xFactory.is())
-            {
-                xFactory->acquire();
-                pRet = xFactory.get();
-                break;
-            }
-        }
-    }
-
-
-    // the real way - use the OModule
-    if ( !pRet )
-    {
-        // 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;
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/xforms_services.cxx b/forms/source/xforms/xforms_services.cxx
index 6d50f65f561e..9637ae1ae97c 100644
--- a/forms/source/xforms/xforms_services.cxx
+++ b/forms/source/xforms/xforms_services.cxx
@@ -17,42 +17,21 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "services.hxx"
-
-#include "binding.hxx"
 #include "model.hxx"
 #include "NameContainer.hxx"
 
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-
-using com::sun::star::uno::Reference;
-using com::sun::star::uno::XInterface;
-using com::sun::star::lang::XMultiServiceFactory;
-using com::sun::star::uno::RuntimeException;
-using com::sun::star::form::binding::XValueBinding;
-using com::sun::star::beans::XPropertySet;
-using com::sun::star::container::XNameContainer;
 
+using namespace ::com::sun::star;
 
-namespace frm
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL
+com_sun_star_form_XForms_get_implementation(uno::XComponentContext*,
+        uno::Sequence<uno::Any> const &)
 {
-
-Reference<XInterface> Model_CreateInstance(
-    const Reference<XMultiServiceFactory>& )
-{
-    return static_cast<XPropertySet*>( static_cast<PropertySetBase*>( new xforms::Model ) );
-}
-
-Reference<XInterface> XForms_CreateInstance(
-    const Reference<XMultiServiceFactory>& )
-{
-    return static_cast<XNameContainer*>( new NameContainer<Reference<XPropertySet> >() );
-}
-
+    return cppu::acquire(new NameContainer<uno::Reference<beans::XPropertySet> >());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/util/frm.component b/forms/util/frm.component
index 9a738863779a..7fac98389fc9 100644
--- a/forms/util/frm.component
+++ b/forms/util/frm.component
@@ -288,7 +288,8 @@
     <service name="com.sun.star.form.component.TimeField"/>
     <service name="stardiv.one.form.component.TimeField"/>
   </implementation>
-  <implementation name="com.sun.star.form.XForms">
+  <implementation name="com.sun.star.form.XForms"
+      constructor="com_sun_star_form_XForms_get_implementation">
     <service name="com.sun.star.xforms.XForms"/>
   </implementation>
 </component>