Fix various XServiceInfo implementations

...to match what is recorded in the .component files

Change-Id: Ie548cd37872d3b8540222201afaac73040e65c8f

48 files changed, 308 insertions, 148 deletions

diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 0b595ad9c95c..05aefec23513 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -116,10 +116,11 @@ IMPLEMENT_DEFAULT_CLONING( OButtonModel )
 StringSequence  OButtonModel::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames();
-    aSupported.realloc( aSupported.getLength() + 1 );
+    aSupported.realloc( aSupported.getLength() + 2 );
 
     OUString* pArray = aSupported.getArray();
-    pArray[ aSupported.getLength() - 1 ] = FRM_SUN_COMPONENT_COMMANDBUTTON;
+    pArray[ aSupported.getLength() - 2 ] = FRM_SUN_COMPONENT_COMMANDBUTTON;
+    pArray[ aSupported.getLength() - 1 ] = FRM_COMPONENT_COMMANDBUTTON;
 
     return aSupported;
 }
@@ -340,10 +341,11 @@ Sequence<Type> OButtonControl::_getTypes()
 StringSequence  OButtonControl::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_COMMANDBUTTON;
+    pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_COMMANDBUTTON;
+    pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_COMMANDBUTTON;
     return aSupported;
 }
 
diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index 418de7fa3c27..cd28061b545f 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -55,7 +55,10 @@ public:
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE;
 
 // ::com::sun::star::lang::XServiceInfo
-    IMPLEMENTATION_NAME(OButtonModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OButtonModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
 // ::com::sun::star::io::XPersistObject
@@ -131,7 +134,10 @@ public:
     virtual ~OButtonControl();
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(OButtonControl);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OButtonControl"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
     // UNO binding
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index 2c3ff8ef81f9..dc4d86fe3e09 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -48,10 +48,11 @@ OCheckBoxControl::OCheckBoxControl(const Reference<XComponentContext>& _rxFactor
 StringSequence SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString* pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_CHECKBOX;
+    pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_CHECKBOX;
+    pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_CHECKBOX;
     return aSupported;
 }
 
@@ -88,7 +89,7 @@ StringSequence SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(::com::
     StringSequence aSupported = OReferenceValueComponent::getSupportedServiceNames();
 
     sal_Int32 nOldLen = aSupported.getLength();
-    aSupported.realloc( nOldLen + 8 );
+    aSupported.realloc( nOldLen + 9 );
     OUString* pStoreTo = aSupported.getArray() + nOldLen;
 
     *pStoreTo++ = BINDABLE_CONTROL_MODEL;
@@ -102,6 +103,8 @@ StringSequence SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(::com::
     *pStoreTo++ = FRM_SUN_COMPONENT_DATABASE_CHECKBOX;
     *pStoreTo++ = BINDABLE_DATABASE_CHECK_BOX;
 
+    *pStoreTo++ = FRM_COMPONENT_CHECKBOX;
+
     return aSupported;
 }
 
diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx
index 276992af12cb..2819ee328880 100644
--- a/forms/source/component/CheckBox.hxx
+++ b/forms/source/component/CheckBox.hxx
@@ -36,7 +36,10 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OCheckBoxModel );
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(OCheckBoxModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OCheckBoxModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XPersistObject
@@ -66,7 +69,10 @@ public:
     OCheckBoxControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext);
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(OCheckBoxControl);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OCheckBoxControl"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 8d959ee01525..654d962b49a9 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -87,7 +87,7 @@ StringSequence SAL_CALL OComboBoxModel::getSupportedServiceNames() throw(Runtime
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
 
     sal_Int32 nOldLen = aSupported.getLength();
-    aSupported.realloc( nOldLen + 8 );
+    aSupported.realloc( nOldLen + 9 );
     OUString* pStoreTo = aSupported.getArray() + nOldLen;
 
     *pStoreTo++ = BINDABLE_CONTROL_MODEL;
@@ -101,6 +101,8 @@ StringSequence SAL_CALL OComboBoxModel::getSupportedServiceNames() throw(Runtime
     *pStoreTo++ = FRM_SUN_COMPONENT_DATABASE_COMBOBOX;
     *pStoreTo++ = BINDABLE_DATABASE_COMBO_BOX;
 
+    *pStoreTo++ = FRM_COMPONENT_COMBOBOX;
+
     return aSupported;
 }
 
@@ -868,10 +870,11 @@ OComboBoxControl::OComboBoxControl(const Reference<XComponentContext>& _rxContex
 StringSequence SAL_CALL OComboBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString* pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_COMBOBOX;
+    pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_COMBOBOX;
+    pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_COMBOBOX;
     return aSupported;
 }
 
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index ad3ed573e5cb..b752c3240f21 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -84,7 +84,10 @@ public:
     virtual void SAL_CALL reloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(OComboBoxModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OComboBoxModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // UNO
@@ -144,7 +147,10 @@ public:
     OComboBoxControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext);
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(OComboBoxControl);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OComboBoxControl"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index cad851f66bd3..bc7975d0b7b4 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -54,10 +54,11 @@ Sequence<Type> OCurrencyControl::_getTypes()
 StringSequence SAL_CALL OCurrencyControl::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_CURRENCYFIELD;
+    pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_CURRENCYFIELD;
+    pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_CURRENCYFIELD;
     return aSupported;
 }
 
@@ -150,7 +151,7 @@ StringSequence SAL_CALL OCurrencyModel::getSupportedServiceNames() throw(std::ex
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
 
     sal_Int32 nOldLen = aSupported.getLength();
-    aSupported.realloc( nOldLen + 4 );
+    aSupported.realloc( nOldLen + 5 );
     OUString* pStoreTo = aSupported.getArray() + nOldLen;
 
     *pStoreTo++ = DATA_AWARE_CONTROL_MODEL;
@@ -159,6 +160,8 @@ StringSequence SAL_CALL OCurrencyModel::getSupportedServiceNames() throw(std::ex
     *pStoreTo++ = FRM_SUN_COMPONENT_CURRENCYFIELD;
     *pStoreTo++ = FRM_SUN_COMPONENT_DATABASE_CURRENCYFIELD;
 
+    *pStoreTo++ = FRM_COMPONENT_CURRENCYFIELD;
+
     return aSupported;
 }
 
diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx
index 23a2ee8f326d..98230b94b46e 100644
--- a/forms/source/component/Currency.hxx
+++ b/forms/source/component/Currency.hxx
@@ -38,7 +38,10 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OCurrencyModel );
 
     // ::com::sun::star::lang::XServiceInfo
-    IMPLEMENTATION_NAME(OCurrencyModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OCurrencyModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
     // ::com::sun::star::io::XPersistObject
@@ -74,7 +77,10 @@ protected:
 public:
     OCurrencyControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext);
     // ::com::sun::star::lang::XServiceInfo
-    IMPLEMENTATION_NAME(OCurrencyControl);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OCurrencyControl"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 };
 
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index bb2c6a885987..6bb799181c28 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -3768,39 +3768,12 @@ OUString SAL_CALL ODatabaseForm::getImplementationName_Static()
     return OUString( "com.sun.star.comp.forms.ODatabaseForm" );
 }
 
-
-Sequence< OUString > SAL_CALL ODatabaseForm::getCompatibleServiceNames_Static()
-{
-    Sequence< OUString > aServices( 1 );
-    OUString* pServices = aServices.getArray();
-
-    *pServices++ = FRM_COMPONENT_FORM;
-
-    return aServices;
-}
-
-
-Sequence< OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Static()
-{
-    Sequence< OUString > aServices( 5 );
-    OUString* pServices = aServices.getArray();
-
-    *pServices++ = FRM_SUN_FORMCOMPONENT;
-    *pServices++ = "com.sun.star.form.FormComponents";
-    *pServices++ = FRM_SUN_COMPONENT_FORM;
-    *pServices++ = FRM_SUN_COMPONENT_HTMLFORM;
-    *pServices++ = FRM_SUN_COMPONENT_DATAFORM;
-
-    return aServices;
-}
-
-
 Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames_Static()
 {
-    return ::comphelper::concatSequences(
-        getCurrentServiceNames_Static(),
-        getCompatibleServiceNames_Static()
-    );
+    return css::uno::Sequence<OUString>{
+        FRM_SUN_FORMCOMPONENT, "com.sun.star.form.FormComponents",
+        FRM_SUN_COMPONENT_FORM, FRM_SUN_COMPONENT_HTMLFORM,
+        FRM_SUN_COMPONENT_DATAFORM, FRM_COMPONENT_FORM};
 }
 
 
@@ -3820,13 +3793,9 @@ Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() throw( R
 
     // concat with out own services
     return ::comphelper::concatSequences(
-        getCurrentServiceNames_Static(),
+        getSupportedServiceNames_Static(),
         aServices
     );
-    // use getCurrentXXX instead of getSupportedXXX, because at runtime, we do not want to have
-    // the compatible names
-    // This is maily to be consistent with the implementation before fixing #97083#, though the
-    // better solution _may_ be to return the compatible names at runtime, too
 }
 
 sal_Bool SAL_CALL ODatabaseForm::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception )
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 72358a4f669d..e9110ed06d55 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -383,8 +383,6 @@ public:
     // com::sun::star::lang::XServiceInfo - static version
     static  OUString SAL_CALL getImplementationName_Static();
     static  ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static();
-    static  ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCurrentServiceNames_Static();
-    static  ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCompatibleServiceNames_Static();
     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 >& _rxFactory );
 
     // com::sun::star::io::XPersistObject
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index d446d094812b..ace219607fc5 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -59,10 +59,11 @@ Sequence<Type> ODateControl::_getTypes()
 StringSequence SAL_CALL ODateControl::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString*pArray = aSupported.getArray();
     pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_DATEFIELD;
+    pArray[aSupported.getLength()-2] = STARDIV_ONE_FORM_CONTROL_DATEFIELD;
     return aSupported;
 }
 
@@ -124,7 +125,7 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw(std::except
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
 
     sal_Int32 nOldLen = aSupported.getLength();
-    aSupported.realloc( nOldLen + 8 );
+    aSupported.realloc( nOldLen + 9 );
     OUString* pStoreTo = aSupported.getArray() + nOldLen;
 
     *pStoreTo++ = BINDABLE_CONTROL_MODEL;
@@ -138,6 +139,8 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw(std::except
     *pStoreTo++ = FRM_SUN_COMPONENT_DATABASE_DATEFIELD;
     *pStoreTo++ = BINDABLE_DATABASE_DATE_FIELD;
 
+    *pStoreTo++ = FRM_COMPONENT_DATEFIELD;
+
     return aSupported;
 }
 
diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx
index 5942e7e1d342..572f51bc4a55 100644
--- a/forms/source/component/Date.hxx
+++ b/forms/source/component/Date.hxx
@@ -51,7 +51,10 @@ public:
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(ODateModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.ODateModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
     // XPropertySet
@@ -106,7 +109,10 @@ public:
     DECLARE_UNO3_AGG_DEFAULTS(ODateControl, OBoundControl)
 
 // ::com::sun::star::lang::XServiceInfo
-    IMPLEMENTATION_NAME(ODateControl);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.ODateControl"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 };
 
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 8bd967e3c959..4b0472ae1b45 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -142,10 +142,12 @@ void OEditControl::disposing()
 StringSequence  OEditControl::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 3);
 
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_TEXTFIELD;
+    pArray[aSupported.getLength()-3] = FRM_SUN_CONTROL_TEXTFIELD;
+    pArray[aSupported.getLength()-2] = STARDIV_ONE_FORM_CONTROL_EDIT;
+    pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_TEXTFIELD;
     return aSupported;
 }
 
@@ -330,7 +332,7 @@ StringSequence SAL_CALL OEditModel::getSupportedServiceNames() throw(std::except
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
 
     sal_Int32 nOldLen = aSupported.getLength();
-    aSupported.realloc( nOldLen + 8 );
+    aSupported.realloc( nOldLen + 9 );
     OUString* pStoreTo = aSupported.getArray() + nOldLen;
 
     *pStoreTo++ = BINDABLE_CONTROL_MODEL;
@@ -344,6 +346,8 @@ StringSequence SAL_CALL OEditModel::getSupportedServiceNames() throw(std::except
     *pStoreTo++ = FRM_SUN_COMPONENT_DATABASE_TEXTFIELD;
     *pStoreTo++ = BINDABLE_DATABASE_TEXT_FIELD;
 
+    *pStoreTo++ = FRM_COMPONENT_TEXTFIELD;
+
     return aSupported;
 }
 
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index 2e80b2edc0a4..1d17c00e31b9 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -70,7 +70,10 @@ public:
     virtual void SAL_CALL reset(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(OEditModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OEditModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
     // OControlModel's property handling
@@ -145,7 +148,10 @@ public:
     virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 // ::com::sun::star::lang::XServiceInfo
-    IMPLEMENTATION_NAME(OEditControl);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OEditControl"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
 // ::com::sun::star::form::XChangeBroadcaster
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 2c6f97df8460..c42625775b93 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -70,10 +70,11 @@ Sequence<Type> OFileControlModel::_getTypes()
 StringSequence  OFileControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
 {
     StringSequence aSupported = OControlModel::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_FILECONTROL;
+    pArray[aSupported.getLength()-2] = FRM_SUN_COMPONENT_FILECONTROL;
+    pArray[aSupported.getLength()-1] = FRM_COMPONENT_FILECONTROL;
     return aSupported;
 }
 
diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx
index 9e5fd5a7b999..80b3ef6ce07d 100644
--- a/forms/source/component/File.hxx
+++ b/forms/source/component/File.hxx
@@ -43,7 +43,10 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(OFileControlModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OFileControlModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // OComponentHelper
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx
index ba34a7241bc5..b281b509fe74 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -65,10 +65,11 @@ IMPLEMENT_DEFAULT_CLONING( OFixedTextModel )
 StringSequence SAL_CALL OFixedTextModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
     StringSequence aSupported = OControlModel::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString* pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_FIXEDTEXT;
+    pArray[aSupported.getLength()-2] = FRM_SUN_COMPONENT_FIXEDTEXT;
+    pArray[aSupported.getLength()-1] = FRM_COMPONENT_FIXEDTEXT;
     return aSupported;
 }
 
diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx
index f733fa3ac550..d6299e42030b 100644
--- a/forms/source/component/FixedText.hxx
+++ b/forms/source/component/FixedText.hxx
@@ -33,7 +33,10 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OFixedTextModel );
 
 // XServiceInfo
-    IMPLEMENTATION_NAME(OFixedTextModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OFixedTextModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 // XPersistObject
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 4fa30d53bd27..662aec432ba4 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -1533,7 +1533,7 @@ void SAL_CALL OBoundControlModel::disposing(const com::sun::star::lang::EventObj
 // XServiceInfo
 StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
 {
-    return ::comphelper::concatSequences(
+    return ::comphelper::combineSequences(
         getAggregateServiceNames(),
         getSupportedServiceNames_Static()
     );
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 61f009acac28..c5ef478545b1 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -254,9 +254,10 @@ IMPL_LINK(OFormattedControl, OnKeyPressed, void*, /*EMPTYARG*/)
 StringSequence  OFormattedControl::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_FORMATTEDFIELD;
+    pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_FORMATTEDFIELD;
+    pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_FORMATTEDFIELD;
     return aSupported;
 }
 
@@ -315,7 +316,7 @@ StringSequence OFormattedModel::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OEditBaseModel::getSupportedServiceNames();
     sal_Int32 nOldLen = aSupported.getLength();
-    aSupported.realloc( nOldLen + 8 );
+    aSupported.realloc( nOldLen + 9 );
     OUString* pStoreTo = aSupported.getArray() + nOldLen;
     *pStoreTo++ = BINDABLE_CONTROL_MODEL;
     *pStoreTo++ = DATA_AWARE_CONTROL_MODEL;
@@ -325,6 +326,7 @@ StringSequence OFormattedModel::getSupportedServiceNames() throw(std::exception)
     *pStoreTo++ = FRM_SUN_COMPONENT_FORMATTEDFIELD;
     *pStoreTo++ = FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD;
     *pStoreTo++ = BINDABLE_DATABASE_FORMATTED_FIELD;
+    *pStoreTo++ = FRM_COMPONENT_FORMATTEDFIELD;
     return aSupported;
 }
 
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index c4b047b8b6e3..424f0dbc27a0 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -70,7 +70,10 @@ class OFormattedModel
         virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
         // XServiceInfo
-        IMPLEMENTATION_NAME(OFormattedModel);
+        OUString SAL_CALL getImplementationName()
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        { return OUString("com.sun.star.form.OFormattedModel"); }
+
         virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
         // XPersistObject
@@ -158,7 +161,10 @@ class OFormattedModel
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE;
 
         // ::com::sun::star::lang::XServiceInfo
-        IMPLEMENTATION_NAME(OFormattedControl);
+        OUString SAL_CALL getImplementationName()
+            throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        { return OUString("com.sun.star.form.OFormattedControl"); }
+
         virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
         // ::com::sun::star::lang::XEventListener
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index f27813278977..b368eaca33ee 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -177,7 +177,7 @@ OUString SAL_CALL OFormattedFieldWrapper::getServiceName() throw(RuntimeExceptio
 
 OUString SAL_CALL OFormattedFieldWrapper::getImplementationName(  ) throw (RuntimeException, std::exception)
 {
-    return OUString("com.sun.star.comp.forms.OFormattedFieldWrapper");
+    return OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted");
 }
 
 sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index daa1b0cf3672..074c8f70ed2f 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -85,7 +85,7 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(Runtim
 
 OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException, std::exception)
 {
-    return OUString("com.sun.star.comp.forms.OFormsCollection");
+    return OUString("com.sun.star.form.OFormsCollection");
 }
 
 sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 524e1292363c..c33afe9b605d 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -169,9 +169,11 @@ void OGridControlModel::cloneColumns( const OGridControlModel* _pOriginalContain
 StringSequence OGridControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
 {
     StringSequence aSupported = OControlModel::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 2);
-    aSupported[aSupported.getLength()-2] = "com.sun.star.awt.UnoControlModel";
-    aSupported[aSupported.getLength()-1] = FRM_SUN_COMPONENT_GRIDCONTROL;
+    aSupported.realloc(aSupported.getLength() + 4);
+    aSupported[aSupported.getLength()-4] = "com.sun.star.awt.UnoControlModel";
+    aSupported[aSupported.getLength()-3] = FRM_SUN_COMPONENT_GRIDCONTROL;
+    aSupported[aSupported.getLength()-2] = FRM_COMPONENT_GRID;
+    aSupported[aSupported.getLength()-1] = FRM_COMPONENT_GRIDCONTROL;
     return aSupported;
 }
 Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception)
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index d48f8e19e2d3..44a8b37e5f8a 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -108,7 +108,10 @@ public:
     virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(OGridControlModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OGridControlModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XTypeProvider
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index 93fdd4e83cb5..73792e17d25b 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -60,10 +60,11 @@ OGroupBoxModel::OGroupBoxModel( const OGroupBoxModel* _pOriginal, const Referenc
 StringSequence SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
 {
     StringSequence aSupported = OControlModel::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString* pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_GROUPBOX;
+    pArray[aSupported.getLength()-2] = FRM_SUN_COMPONENT_GROUPBOX;
+    pArray[aSupported.getLength()-1] = FRM_COMPONENT_GROUPBOX;
     return aSupported;
 }
 
@@ -130,10 +131,11 @@ OGroupBoxControl::OGroupBoxControl(const Reference<XComponentContext>& _rxFactor
 StringSequence SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception)
 {
     StringSequence aSupported = OControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString* pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_GROUPBOX;
+    pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_GROUPBOX;
+    pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_GROUPBOX;
     return aSupported;
 }
 
diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx
index 255f705d80a0..0c9ebedf3ed8 100644
--- a/forms/source/component/GroupBox.hxx
+++ b/forms/source/component/GroupBox.hxx
@@ -33,7 +33,10 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OGroupBoxModel );
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(OGroupBoxModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OGroupBoxModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XPersistObject
@@ -61,7 +64,10 @@ public:
     OGroupBoxControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory);
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(OGroupBoxControl);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OGroupBoxControl"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index 5e5eeeb83020..92b15008532d 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -120,10 +120,9 @@ void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) cons
 
 StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
-    StringSequence aSupported( 2 );
-    aSupported[ 0 ] = FRM_SUN_COMPONENT_HIDDENCONTROL;
-    aSupported[ 1 ] = FRM_SUN_FORMCOMPONENT;
-    return aSupported;
+    return css::uno::Sequence<OUString>{
+        FRM_SUN_COMPONENT_HIDDENCONTROL, FRM_SUN_FORMCOMPONENT,
+        FRM_COMPONENT_HIDDEN, FRM_COMPONENT_HIDDENCONTROL };
 }
 
 
diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx
index 358c71c1e223..68a29a5b6318 100644
--- a/forms/source/component/Hidden.hxx
+++ b/forms/source/component/Hidden.hxx
@@ -43,7 +43,10 @@ public:
                 throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE;
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(OHiddenModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OHiddenModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XPersistObject
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index c9a0b5fd58fa..f355b9d21266 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -64,10 +64,11 @@ OImageButtonModel::~OImageButtonModel()
 StringSequence  OImageButtonModel::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_IMAGEBUTTON;
+    pArray[aSupported.getLength()-2] = FRM_SUN_COMPONENT_IMAGEBUTTON;
+    pArray[aSupported.getLength()-1] = FRM_COMPONENT_IMAGEBUTTON;
     return aSupported;
 }
 
@@ -152,10 +153,11 @@ Sequence<Type> OImageButtonControl::_getTypes()
 StringSequence  OImageButtonControl::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_IMAGEBUTTON;
+    pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_IMAGEBUTTON;
+    pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_IMAGEBUTTON;
     return aSupported;
 }
 
diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx
index ee728e81fd8f..1d9dd1abd3cd 100644
--- a/forms/source/component/ImageButton.hxx
+++ b/forms/source/component/ImageButton.hxx
@@ -34,7 +34,10 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OImageButtonModel );
 
 // ::com::sun::star::lang::XServiceInfo
-    IMPLEMENTATION_NAME(OImageButtonModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OImageButtonModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
 // ::com::sun::star::io::XPersistObject
@@ -63,7 +66,10 @@ public:
     OImageButtonControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory);
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(OImageButtonControl);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OImageButtonControl"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
     // UNO Binding
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 8646fd512b67..e3789cf92030 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -191,10 +191,11 @@ IMPLEMENT_DEFAULT_CLONING( OImageControlModel )
 StringSequence  OImageControlModel::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_IMAGECONTROL;
+    pArray[aSupported.getLength()-2] = FRM_SUN_COMPONENT_IMAGECONTROL;
+    pArray[aSupported.getLength()-1] = FRM_COMPONENT_IMAGECONTROL;
     return aSupported;
 }
 
@@ -725,10 +726,11 @@ Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) throw (R
 StringSequence  OImageControlControl::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_IMAGECONTROL;
+    pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_IMAGECONTROL;
+    pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_IMAGECONTROL;
     return aSupported;
 }
 
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index 4caaf90b2e94..1317c754932f 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -76,7 +76,10 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(OImageControlModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OImageControlModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
     // OComponentHelper
@@ -165,7 +168,10 @@ public:
     virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(OImageControlControl);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OImageControlControl"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
     // XMouseListener
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 2fd08c75b313..d87da0bd7eb5 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -208,7 +208,7 @@ namespace frm
         StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
 
         sal_Int32 nOldLen = aSupported.getLength();
-        aSupported.realloc( nOldLen + 8 );
+        aSupported.realloc( nOldLen + 9 );
         OUString* pStoreTo = aSupported.getArray() + nOldLen;
 
         *pStoreTo++ = BINDABLE_CONTROL_MODEL;
@@ -222,6 +222,8 @@ namespace frm
         *pStoreTo++ = FRM_SUN_COMPONENT_DATABASE_LISTBOX;
         *pStoreTo++ = BINDABLE_DATABASE_LIST_BOX;
 
+        *pStoreTo++ = FRM_COMPONENT_LISTBOX;
+
         return aSupported;
     }
 
@@ -1806,10 +1808,11 @@ namespace frm
     StringSequence SAL_CALL OListBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception)
     {
         StringSequence aSupported = OBoundControl::getSupportedServiceNames();
-        aSupported.realloc(aSupported.getLength() + 1);
+        aSupported.realloc(aSupported.getLength() + 2);
 
         OUString* pArray = aSupported.getArray();
-        pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_LISTBOX;
+        pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_LISTBOX;
+        pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_LISTBOX;
         return aSupported;
     }
 
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 9b9bee3382fc..381d36ed8638 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -127,7 +127,10 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OListBoxModel );
 
 // XServiceInfo
-    IMPLEMENTATION_NAME(OListBoxModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OListBoxModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 // UNO Anbindung
@@ -280,7 +283,10 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 // XServiceInfo
-    IMPLEMENTATION_NAME(OListBoxControl);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OListBoxControl"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 // XChangeBroadcaster
diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx
index a8daa2e73f39..2d1cb74083fe 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -45,10 +45,11 @@ ONumericControl::ONumericControl(const Reference<XComponentContext>& _rxFactory)
 StringSequence ONumericControl::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_NUMERICFIELD;
+    pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_NUMERICFIELD;
+    pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_NUMERICFIELD;
     return aSupported;
 }
 
@@ -99,7 +100,7 @@ StringSequence ONumericModel::getSupportedServiceNames() throw(std::exception)
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
 
     sal_Int32 nOldLen = aSupported.getLength();
-    aSupported.realloc( nOldLen + 8 );
+    aSupported.realloc( nOldLen + 9 );
     OUString* pStoreTo = aSupported.getArray() + nOldLen;
 
     *pStoreTo++ = BINDABLE_CONTROL_MODEL;
@@ -113,6 +114,8 @@ StringSequence ONumericModel::getSupportedServiceNames() throw(std::exception)
     *pStoreTo++ = FRM_SUN_COMPONENT_DATABASE_NUMERICFIELD;
     *pStoreTo++ = BINDABLE_DATABASE_NUMERIC_FIELD;
 
+    *pStoreTo++ = FRM_COMPONENT_NUMERICFIELD;
+
     return aSupported;
 }
 
diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx
index 3d37a965afe7..5b97d9e1b361 100644
--- a/forms/source/component/Numeric.hxx
+++ b/forms/source/component/Numeric.hxx
@@ -38,7 +38,10 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( ONumericModel );
 
     // ::com::sun::star::lang::XServiceInfo
-    IMPLEMENTATION_NAME(ONumericModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.ONumericModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
     // ::com::sun::star::io::XPersistObject
@@ -72,7 +75,10 @@ public:
     ONumericControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory);
 
     // ::com::sun::star::lang::XServiceInfo
-    IMPLEMENTATION_NAME(ONumericControl);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.ONumericControl"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 };
 
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index 89a10a799eb1..8631f0deec9a 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -53,10 +53,11 @@ Sequence<Type> OPatternControl::_getTypes()
 StringSequence OPatternControl::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_PATTERNFIELD;
+    pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_PATTERNFIELD;
+    pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_PATTERNFIELD;
     return aSupported;
 }
 
@@ -100,11 +101,12 @@ IMPLEMENT_DEFAULT_CLONING( OPatternModel )
 StringSequence SAL_CALL OPatternModel::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 2);
+    aSupported.realloc(aSupported.getLength() + 3);
 
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-2] = FRM_SUN_COMPONENT_DATABASE_PATTERNFIELD;
-    pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_PATTERNFIELD;
+    pArray[aSupported.getLength()-3] = FRM_SUN_COMPONENT_DATABASE_PATTERNFIELD;
+    pArray[aSupported.getLength()-2] = FRM_SUN_COMPONENT_PATTERNFIELD;
+    pArray[aSupported.getLength()-1] = FRM_COMPONENT_PATTERNFIELD;
     return aSupported;
 }
 
diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx
index dfcdde01dd43..2f5d6bf57da0 100644
--- a/forms/source/component/Pattern.hxx
+++ b/forms/source/component/Pattern.hxx
@@ -45,7 +45,10 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OPatternModel );
 
     // ::com::sun::star::lang::XServiceInfo
-    IMPLEMENTATION_NAME(OPatternModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OPatternModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
     // ::com::sun::star::io::XPersistObject
@@ -81,7 +84,10 @@ public:
     OPatternControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory);
 
     // ::com::sun::star::lang::XServiceInfo
-    IMPLEMENTATION_NAME(OPatternControl);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OPatternControl"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 };
 
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index abe62f0d36c6..4a6ee60ef373 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -46,10 +46,11 @@ using namespace ::com::sun::star::form::binding;
 StringSequence SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(RuntimeException, std::exception)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString* pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_RADIOBUTTON;
+    pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_RADIOBUTTON;
+    pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_RADIOBUTTON;
     return aSupported;
 }
 
@@ -115,7 +116,7 @@ StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(Runt
     StringSequence aSupported = OReferenceValueComponent::getSupportedServiceNames();
 
     sal_Int32 nOldLen = aSupported.getLength();
-    aSupported.realloc( nOldLen + 8 );
+    aSupported.realloc( nOldLen + 9 );
     OUString* pStoreTo = aSupported.getArray() + nOldLen;
 
     *pStoreTo++ = BINDABLE_CONTROL_MODEL;
@@ -129,6 +130,8 @@ StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(Runt
     *pStoreTo++ = FRM_SUN_COMPONENT_DATABASE_RADIOBUTTON;
     *pStoreTo++ = BINDABLE_DATABASE_RADIO_BUTTON;
 
+    *pStoreTo++ = FRM_COMPONENT_RADIOBUTTON;
+
     return aSupported;
 }
 
diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx
index 62e8246e7f3e..d8660c0e7b8a 100644
--- a/forms/source/component/RadioButton.hxx
+++ b/forms/source/component/RadioButton.hxx
@@ -32,7 +32,10 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( ORadioButtonModel );
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(ORadioButtonModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.ORadioButtonModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // OPropertySetHelper
@@ -83,7 +86,10 @@ public:
     ORadioButtonControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory);
 
     // XServiceInfo
-    IMPLEMENTATION_NAME(ORadioButtonControl);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.ORadioButtonControl"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 protected:
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index 7c03a518fd63..e09359a36a2d 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -59,10 +59,11 @@ Sequence<Type> OTimeControl::_getTypes()
 StringSequence SAL_CALL OTimeControl::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_TIMEFIELD;
+    pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_TIMEFIELD;
+    pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_TIMEFIELD;
     return aSupported;
 }
 
@@ -76,7 +77,7 @@ StringSequence SAL_CALL OTimeModel::getSupportedServiceNames() throw(std::except
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
 
     sal_Int32 nOldLen = aSupported.getLength();
-    aSupported.realloc( nOldLen + 8 );
+    aSupported.realloc( nOldLen + 9 );
     OUString* pStoreTo = aSupported.getArray() + nOldLen;
 
     *pStoreTo++ = BINDABLE_CONTROL_MODEL;
@@ -90,6 +91,8 @@ StringSequence SAL_CALL OTimeModel::getSupportedServiceNames() throw(std::except
     *pStoreTo++ = FRM_SUN_COMPONENT_DATABASE_TIMEFIELD;
     *pStoreTo++ = BINDABLE_DATABASE_TIME_FIELD;
 
+    *pStoreTo++ = FRM_COMPONENT_TIMEFIELD;
+
     return aSupported;
 }
 
diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx
index dfef239d93fb..329b65fda26e 100644
--- a/forms/source/component/Time.hxx
+++ b/forms/source/component/Time.hxx
@@ -52,7 +52,10 @@ public:
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
 
     // ::com::sun::star::lang::XServiceInfo
-    IMPLEMENTATION_NAME(OTimeModel);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OTimeModel"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 
     // OControlModel's property handling
@@ -106,7 +109,10 @@ public:
     DECLARE_UNO3_AGG_DEFAULTS(OTimeControl, OBoundControl)
 
     // ::com::sun::star::lang::XServiceInfo
-    IMPLEMENTATION_NAME(OTimeControl);
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.OTimeControl"); }
+
     virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
 };
 
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 91ecc23f7efb..abf8956ae772 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -84,12 +84,7 @@ namespace frm
     #define DECLARE_XPERSISTOBJECT() \
     virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;    \
     virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;    \
-    virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;   \
-
-    // old macro for quickly implementing XServiceInfo::getImplementationName
-    #define IMPLEMENTATION_NAME(ImplName)                                       \
-    virtual OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \
-        { return OUString("com.sun.star.comp.forms." #ImplName); }
+    virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     class OControlModel;
 
diff --git a/forms/source/inc/forms_module.hxx b/forms/source/inc/forms_module.hxx
index cf72d01cb0e6..98bdf7344438 100644
--- a/forms/source/inc/forms_module.hxx
+++ b/forms/source/inc/forms_module.hxx
@@ -198,7 +198,7 @@ namespace FORMS_MODULE_NAMESPACE
         \
         Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  ) throw (RuntimeException, std::exception) \
         { \
-            return ::comphelper::concatSequences( \
+            return ::comphelper::combineSequences( \
                 getAggregateServiceNames(), \
                 getSupportedServiceNames_Static() \
             ); \
@@ -273,7 +273,7 @@ namespace FORMS_MODULE_NAMESPACE
                    aOwnNames[ 4 ] = service5; \
                    aOwnNames[ 5 ] = service6; \
                    aOwnNames[ 6 ] = service7; \
-                   aOwnNames[ 6 ] = service8; \
+                   aOwnNames[ 7 ] = service8; \
             \
             return ::comphelper::concatSequences( \
                 baseclass::getSupportedServiceNames_Static(), \
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index e428d451fcd0..c6774ddc0488 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -36,6 +36,7 @@
 
 #include <comphelper/propertysetinfo.hxx>
 #include <comphelper/processfactory.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 
 #include <algorithm>
@@ -680,6 +681,23 @@ Sequence<sal_Int8> Model::getImplementationId()
     return css::uno::Sequence<sal_Int8>();
 }
 
+OUString Model::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("com.sun.star.form.Model");
+}
+
+sal_Bool Model::supportsService(OUString const & ServiceName)
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return cppu::supportsService(this, ServiceName);
+}
+
+css::uno::Sequence<OUString> Model::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return css::uno::Sequence<OUString>{"com.sun.star.xforms.Model"};
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
 com_sun_star_form_Model_get_implementation(::com::sun::star::uno::XComponentContext*,
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index 0d8b962414e5..2ae00816a163 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -20,11 +20,12 @@
 #ifndef INCLUDED_FORMS_SOURCE_XFORMS_MODEL_HXX
 #define INCLUDED_FORMS_SOURCE_XFORMS_MODEL_HXX
 
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <propertysetbase.hxx>
 #include <com/sun/star/xforms/XModel2.hpp>
 #include <com/sun/star/xforms/XFormsUIHelper1.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
 #include <com/sun/star/uno/Reference.hxx>
@@ -65,12 +66,13 @@ namespace xforms
  *
  * See http://www.w3.org/TR/xforms/ for more information.
  */
-typedef cppu::ImplInheritanceHelper4<
+typedef cppu::ImplInheritanceHelper<
     PropertySetBase,
     com::sun::star::xforms::XModel2,
     com::sun::star::xforms::XFormsUIHelper1,
     com::sun::star::util::XUpdatable,
-    com::sun::star::lang::XUnoTunnel
+    com::sun::star::lang::XUnoTunnel,
+    css::lang::XServiceInfo
 > Model_t;
 class Model : public Model_t
 {
@@ -439,6 +441,14 @@ public:
     virtual IntSequence_t SAL_CALL getImplementationId()
         throw( RuntimeException_t ) SAL_OVERRIDE;
 
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
 } // namespace
diff --git a/forms/source/xforms/xforms_services.cxx b/forms/source/xforms/xforms_services.cxx
index 9637ae1ae97c..7e88ab115db5 100644
--- a/forms/source/xforms/xforms_services.cxx
+++ b/forms/source/xforms/xforms_services.cxx
@@ -24,14 +24,39 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
+#include <cppuhelper/supportsservice.hxx>
 
 using namespace ::com::sun::star;
 
+namespace {
+
+class Implementation:
+    public cppu::ImplInheritanceHelper<
+        NameContainer<css::uno::Reference<css::beans::XPropertySet>>,
+        css::lang::XServiceInfo>
+{
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("com.sun.star.form.XForms"); }
+
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return cppu::supportsService(this, ServiceName); }
+
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    {
+        return css::uno::Sequence<OUString>{"com.sun.star.xforms.XForms"};
+    }
+};
+
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL
 com_sun_star_form_XForms_get_implementation(uno::XComponentContext*,
         uno::Sequence<uno::Any> const &)
 {
-    return cppu::acquire(new NameContainer<uno::Reference<beans::XPropertySet> >());
+    return cppu::acquire(new Implementation);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */