Fix various XServiceInfo implementations

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

Change-Id: Ie548cd37872d3b8540222201afaac73040e65c8f

16 files changed, 832 insertions, 51 deletions

diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 38842b089213..639cc594e588 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -188,13 +188,14 @@ throw (css::uno::RuntimeException, std::exception)
     const bool bIsPopupMenu = IsPopupMenu();
     aGuard.clear();
 
-    css::uno::Sequence< OUString > aNames( 1 );
     if ( bIsPopupMenu )
-        aNames[ 0 ] = OUString::createFromAscii( szServiceName2_PopupMenu );
+        return css::uno::Sequence<OUString>{
+            OUString::createFromAscii(szServiceName2_PopupMenu),
+            "stardiv.vcl.PopupMenu"};
     else
-        aNames[ 0 ] = OUString::createFromAscii( szServiceName2_MenuBar );
-
-    return aNames;
+        return css::uno::Sequence<OUString>{
+            OUString::createFromAscii(szServiceName2_MenuBar),
+            "stardiv.vcl.MenuBar"};
 }
 
 sal_Bool SAL_CALL VCLXMenu::supportsService(const OUString& rServiceName )
diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx
index 2ec98adf6f3c..c6560d8ae89b 100644
--- a/toolkit/source/awt/vclxpointer.cxx
+++ b/toolkit/source/awt/vclxpointer.cxx
@@ -20,11 +20,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <toolkit/awt/vclxpointer.hxx>
 #include <toolkit/helper/macros.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/queryinterface.hxx>
-
-
-//  class VCLXPointer
+#include <cppuhelper/supportsservice.hxx>
 
 VCLXPointer::VCLXPointer()
 {
@@ -34,24 +30,9 @@ VCLXPointer::~VCLXPointer()
 {
 }
 
-// ::com::sun::star::uno::XInterface
-::com::sun::star::uno::Any VCLXPointer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
-{
-    ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        (static_cast< ::com::sun::star::awt::XPointer* >(this)),
-                                        (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)),
-                                        (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
-    return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
-}
-
 // ::com::sun::star::lang::XUnoTunnel
 IMPL_XUNOTUNNEL( VCLXPointer )
 
-// ::com::sun::star::lang::XTypeProvider
-IMPL_XTYPEPROVIDER_START( VCLXPointer )
-    cppu::UnoType<com::sun::star::awt::XPointer>::get()
-IMPL_XTYPEPROVIDER_END
-
 void VCLXPointer::setType( sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -66,6 +47,25 @@ sal_Int32 VCLXPointer::getType() throw(::com::sun::star::uno::RuntimeException,
     return (sal_Int32)maPointer.GetStyle();
 }
 
+OUString VCLXPointer::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.VCLXPointer");
+}
+
+sal_Bool VCLXPointer::supportsService(OUString const & ServiceName)
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return cppu::supportsService(this, ServiceName);
+}
+
+css::uno::Sequence<OUString> VCLXPointer::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return css::uno::Sequence<OUString>{
+        "com.sun.star.awt.Pointer", "stardiv.vcl.Pointer"};
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_VCLXPointer_get_implementation(
     css::uno::XComponentContext *,
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index c80caae2b3b9..3080148f78a5 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <toolkit/awt/vclxprinter.hxx>
 #include <toolkit/helper/macros.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <rtl/uuid.h>
 
@@ -381,6 +382,25 @@ VCLXInfoPrinter::~VCLXInfoPrinter()
     return xP;
 }
 
+OUString VCLXPrinterServer::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.VCLXPrinterServer");
+}
+
+sal_Bool VCLXPrinterServer::supportsService(OUString const & ServiceName)
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return cppu::supportsService(this, ServiceName);
+}
+
+css::uno::Sequence<OUString> VCLXPrinterServer::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return css::uno::Sequence<OUString>{
+        "com.sun.star.awt.PrinterServer", "stardiv.vcl.PrinterServer"};
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_VCLXPrinterServer_get_implementation(
     css::uno::XComponentContext *,
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 006a216fa634..bbcd62aa0e24 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1509,8 +1509,8 @@ sal_Bool VCLXToolkit::supportsService( const OUString& rServiceName ) throw(::co
 
 ::com::sun::star::uno::Sequence< OUString > VCLXToolkit::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
-    OUString aServiceName("com.sun.star.awt.Toolkit");
-    return ::com::sun::star::uno::Sequence< OUString >( &aServiceName, 1);
+    return css::uno::Sequence<OUString>{
+        "com.sun.star.awt.Toolkit", "stardiv.vcl.VclToolkit"};
 }
 
 // css::awt::XExtendedToolkit:
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index af8f6d55a28d..afce8f36d903 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/resource/XStringResourceResolver.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <tools/debug.hxx>
@@ -167,7 +168,19 @@ public:
     OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XServiceInfo
-    DECLIMPL_SERVICEINFO_DERIVED( UnoControlDialogModel, ControlModelContainerBase, "com.sun.star.awt.UnoControlDialogModel" )
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("stardiv.Toolkit.UnoControlDialogModel"); }
+
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    {
+        auto s(ControlModelContainerBase::getSupportedServiceNames());
+        s.realloc(s.getLength() + 2);
+        s[s.getLength() - 2] = "com.sun.star.awt.UnoControlDialogModel";
+        s[s.getLength() - 1] = "stardiv.vcl.controlmodel.Dialog";
+        return s;
+    }
 };
 
 UnoControlDialogModel::UnoControlDialogModel( const Reference< XComponentContext >& rxContext )
@@ -385,6 +398,26 @@ void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, cons
     }
 }
 
+OUString UnoDialogControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoDialogControl");
+}
+
+sal_Bool UnoDialogControl::supportsService(OUString const & ServiceName)
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return cppu::supportsService(this, ServiceName);
+}
+
+css::uno::Sequence<OUString> UnoDialogControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return css::uno::Sequence<OUString>{
+        OUString::createFromAscii(szServiceName2_UnoControlDialog),
+        "stardiv.vcl.control.Dialog"};
+}
+
 void UnoDialogControl::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc )
 {
     UnoControlContainer::PrepareWindowDescriptor( rDesc );
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index ba3374ffcfa0..0f8ab776dce5 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -418,6 +418,22 @@ namespace toolkit
         return xInfo;
     }
 
+    OUString UnoControlFormattedFieldModel::getImplementationName()
+        throw (css::uno::RuntimeException, std::exception)
+    {
+        return OUString("stardiv.Toolkit.UnoControlFormattedFieldModel");
+    }
+
+    css::uno::Sequence<OUString>
+    UnoControlFormattedFieldModel::getSupportedServiceNames()
+        throw (css::uno::RuntimeException, std::exception)
+    {
+        auto s(UnoControlModel::getSupportedServiceNames());
+        s.realloc(s.getLength() + 2);
+        s[s.getLength() - 2] = "com.sun.star.awt.UnoControlFormattedFieldModel";
+        s[s.getLength() - 1] = "stardiv.vcl.controlmodel.FormattedField";
+        return s;
+    }
 
     // = UnoFormattedFieldControl
 
@@ -453,7 +469,22 @@ namespace toolkit
             GetTextListeners().textChanged( e );
     }
 
+    OUString UnoFormattedFieldControl::getImplementationName()
+        throw (css::uno::RuntimeException, std::exception)
+    {
+        return OUString("stardiv.Toolkit.UnoFormattedFieldControl");
+    }
 
+    css::uno::Sequence<OUString>
+    UnoFormattedFieldControl::getSupportedServiceNames()
+        throw (css::uno::RuntimeException, std::exception)
+    {
+        auto s(UnoEditControl::getSupportedServiceNames());
+        s.realloc(s.getLength() + 2);
+        s[s.getLength() - 2] = "com.sun.star.awt.UnoControlFormattedField";
+        s[s.getLength() - 1] = "stardiv.vcl.control.FormattedField";
+        return s;
+    }
 }   // namespace toolkit
 
 
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index 432b93e47073..a19d63192753 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -65,7 +65,18 @@ public:
     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
-    DECLIMPL_SERVICEINFO_DERIVED( UnoGridModel, UnoControlModel, "com.sun.star.awt.grid.UnoControlGridModel" )
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("stardiv.Toolkit.GridControlModel"); }
+
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    {
+        auto s(UnoControlModel::getSupportedServiceNames());
+        s.realloc(s.getLength() + 1);
+        s[s.getLength() - 1] = "com.sun.star.awt.grid.UnoControlGridModel";
+        return s;
+    }
 };
 
 
@@ -108,7 +119,18 @@ public:
     virtual void SAL_CALL removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // ::com::sun::star::lang::XServiceInfo
-    DECLIMPL_SERVICEINFO_DERIVED( UnoGridControl, UnoControlBase, "com.sun.star.awt.grid.UnoControlGrid" )
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("stardiv.Toolkit.GridControl"); }
+
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    {
+        auto s(UnoControlBase::getSupportedServiceNames());
+        s.realloc(s.getLength() + 1);
+        s[s.getLength() - 1] = "com.sun.star.awt.grid.UnoControlGrid";
+        return s;
+    }
 
     using UnoControl::getPeer;
 
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 6976acddadde..b63b72bf68cd 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -81,7 +81,22 @@ static void lcl_throwIndexOutOfBoundsException( )
         return OUString::createFromAscii( szServiceName_UnoControlRoadmapModel );
     }
 
+    OUString UnoControlRoadmapModel::getImplementationName()
+        throw (css::uno::RuntimeException, std::exception)
+    {
+        return OUString("stardiv.Toolkit.UnoControlRoadmapModel");
+    }
 
+    css::uno::Sequence<OUString>
+    UnoControlRoadmapModel::getSupportedServiceNames()
+        throw (css::uno::RuntimeException, std::exception)
+    {
+        auto s(UnoControlRoadmapModel_Base::getSupportedServiceNames());
+        s.realloc(s.getLength() + 2);
+        s[s.getLength() - 2] = "com.sun.star.awt.UnoControlRoadmapModel";
+        s[s.getLength() - 1] = "stardiv.vcl.controlmodel.Roadmap";
+        return s;
+    }
 
     Any UnoControlRoadmapModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     {
@@ -487,6 +502,22 @@ void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt
         xPeer->propertyChange( evt );
 }
 
+OUString UnoRoadmapControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoRoadmapControl");
+}
+
+css::uno::Sequence<OUString> UnoRoadmapControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlBase::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlRoadmap";
+    s[s.getLength() - 1] = "stardiv.vcl.control.Roadmap";
+    return s;
+}
+
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index ced5b7691cc4..65ced01f3ee4 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -25,6 +25,7 @@
 #include <toolkit/controls/stdtabcontrollermodel.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/macros.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <rtl/uuid.h>
@@ -365,6 +366,25 @@ void StdTabController::activateLast(  ) throw(RuntimeException, std::exception)
     ImplActivateControl( false );
 }
 
+OUString StdTabController::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.StdTabController");
+}
+
+sal_Bool StdTabController::supportsService(OUString const & ServiceName)
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return cppu::supportsService(this, ServiceName);
+}
+
+css::uno::Sequence<OUString> StdTabController::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return css::uno::Sequence<OUString>{
+        OUString::createFromAscii(szServiceName2_TabController),
+        "stardiv.vcl.control.TabController"};
+}
 
 Reference< XControl >  StdTabController::FindControl( Sequence< Reference< XControl > >& rCtrls,
  const Reference< XControlModel > & rxCtrlModel )
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index 8bac30c7f019..8b95155001bf 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@@ -24,6 +24,7 @@
 #include <toolkit/helper/macros.hxx>
 #include <toolkit/helper/servicenames.hxx>
 #include <toolkit/helper/property.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <rtl/uuid.h>
@@ -414,6 +415,26 @@ void StdTabControllerModel::read( const ::com::sun::star::uno::Reference< ::com:
     }
 }
 
+OUString StdTabControllerModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.StdTabControllerModel");
+}
+
+sal_Bool StdTabControllerModel::supportsService(OUString const & ServiceName)
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return cppu::supportsService(this, ServiceName);
+}
+
+css::uno::Sequence<OUString> StdTabControllerModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return css::uno::Sequence<OUString>{
+        OUString::createFromAscii(szServiceName2_TabControllerModel),
+        "stardiv.vcl.controlmodel.TabController"};
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_StdTabControllerModel_get_implementation(
     css::uno::XComponentContext *,
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index 3b293a53bf00..52fc7cd7beed 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -49,6 +49,22 @@ namespace toolkit
         return OUString::createFromAscii( szServiceName_UnoControlScrollBarModel );
     }
 
+    OUString UnoControlScrollBarModel::getImplementationName()
+        throw (css::uno::RuntimeException, std::exception)
+    {
+        return OUString("stardiv.Toolkit.UnoControlScrollBarModel");
+    }
+
+    css::uno::Sequence<OUString>
+    UnoControlScrollBarModel::getSupportedServiceNames()
+        throw (css::uno::RuntimeException, std::exception)
+    {
+        auto s(UnoControlModel::getSupportedServiceNames());
+        s.realloc(s.getLength() + 2);
+        s[s.getLength() - 2] = "com.sun.star.awt.UnoControlScrollBarModel";
+        s[s.getLength() - 1] = "stardiv.vcl.controlmodel.ScrollBar";
+        return s;
+    }
 
     uno::Any UnoControlScrollBarModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     {
@@ -278,8 +294,21 @@ namespace toolkit
         return n;
     }
 
+    OUString UnoScrollBarControl::getImplementationName()
+        throw (css::uno::RuntimeException, std::exception)
+    {
+        return OUString("stardiv.Toolkit.UnoScrollBarControl");
+    }
 
-
+    css::uno::Sequence<OUString> UnoScrollBarControl::getSupportedServiceNames()
+        throw (css::uno::RuntimeException, std::exception)
+    {
+        auto s(UnoControlBase::getSupportedServiceNames());
+        s.realloc(s.getLength() + 2);
+        s[s.getLength() - 2] = "com.sun.star.awt.UnoControlScrollBar";
+        s[s.getLength() - 1] = "stardiv.vcl.control.ScrollBar";
+        return s;
+    }
 
 }  // namespace toolkit
 
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index 7d2312535a9c..95e61961b64a 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -189,7 +189,7 @@ public:
 
     OUString SAL_CALL UnoSpinButtonModel::getImplementationName(  ) throw(RuntimeException, std::exception)
     {
-        return OUString( "com.sun.star.comp.toolkit.UnoSpinButtonModel" );
+        return OUString( "stardiv.Toolkit.UnoSpinButtonModel" );
     }
 
 
@@ -252,7 +252,7 @@ public:
 
     OUString SAL_CALL UnoSpinButtonControl::getImplementationName(  ) throw(RuntimeException, std::exception)
     {
-        return OUString( "com.sun.star.comp.toolkit.UnoSpinButtonControl" );
+        return OUString( "stardiv.Toolkit.UnoSpinButtonControl" );
     }
 
 
diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx
index f6bed0357c9b..dbf2e0c1d64b 100644
--- a/toolkit/source/controls/tree/treecontrol.hxx
+++ b/toolkit/source/controls/tree/treecontrol.hxx
@@ -51,7 +51,18 @@ public:
     OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XServiceInfo
-    DECLIMPL_SERVICEINFO_DERIVED( UnoTreeModel, UnoControlModel, "com.sun.star.awt.tree.TreeControlModel" )
+    OUString SAL_CALL getImplementationName()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    { return OUString("stardiv.Toolkit.TreeControlModel"); }
+
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
+        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    {
+        auto s(UnoControlModel::getSupportedServiceNames());
+        s.realloc(s.getLength() + 1);
+        s[s.getLength() - 1] = "com.sun.star.awt.tree.TreeControlModel";
+        return s;
+    }
 };
 
 } // toolkit
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 6d121ac706ea..675ed753079b 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -817,6 +817,22 @@ void UnoControlContainer::setVisible( sal_Bool bVisible ) throw(uno::RuntimeExce
         createPeer( uno::Reference< awt::XToolkit > (), uno::Reference< awt::XWindowPeer > () );
 }
 
+OUString UnoControlContainer::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlContainer");
+}
+
+css::uno::Sequence<OUString> UnoControlContainer::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlBase::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlContainer";
+    s[s.getLength() - 1] = "stardiv.vcl.control.ControlContainer";
+    return s;
+}
+
 void UnoControlContainer::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc )
 {
     // HACK due to the fact that we can't really use VSCROLL & HSCROLL
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index eabc7467c4d3..f1c23d9c006a 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -45,6 +45,23 @@ OUString UnoControlContainerModel::getServiceName() throw(::com::sun::star::uno:
     return OUString::createFromAscii( szServiceName_UnoControlContainerModel );
 }
 
+OUString UnoControlContainerModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlContainerModel");
+}
+
+css::uno::Sequence<OUString>
+UnoControlContainerModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlContainerModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.ControlContainer";
+    return s;
+}
+
 ::com::sun::star::uno::Any UnoControlContainerModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 {
     ::com::sun::star::uno::Any aDefault;
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 8c8ec5f51553..820322d986e8 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -71,17 +71,6 @@ using ::com::sun::star::graphic::XGraphic;
 using ::com::sun::star::uno::Reference;
 using namespace ::toolkit;
 
-#define IMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \
-    OUString SAL_CALL ImplName::getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString( "stardiv.Toolkit." #ImplName ); } \
-    ::com::sun::star::uno::Sequence< OUString > SAL_CALL ImplName::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) \
-                            { \
-                                ::com::sun::star::uno::Sequence< OUString > aNames = BaseClass::getSupportedServiceNames( ); \
-                                aNames.realloc( aNames.getLength() + 1 ); \
-                                aNames[ aNames.getLength() - 1 ] = ServiceName; \
-                                return aNames; \
-                            } \
-
-
 uno::Reference< graphic::XGraphic >
 ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( uno::Reference< graphic::XGraphicObject >& xOutGraphicObj, const OUString& _rURL )
 {
@@ -171,6 +160,22 @@ uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInf
     return xInfo;
 }
 
+OUString UnoControlEditModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlEditModel");
+}
+
+css::uno::Sequence<OUString> UnoControlEditModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlEditModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.Edit";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoControlEditModel_get_implementation(
     css::uno::XComponentContext *context,
@@ -492,8 +497,9 @@ OUString UnoEditControl::getImplementationName(  ) throw(uno::RuntimeException,
 uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aNames = UnoControlBase::getSupportedServiceNames( );
-    aNames.realloc( aNames.getLength() + 1 );
-    aNames[ aNames.getLength() - 1 ] = OUString::createFromAscii( szServiceName2_UnoControlEdit );
+    aNames.realloc( aNames.getLength() + 2 );
+    aNames[ aNames.getLength() - 2 ] = OUString::createFromAscii( szServiceName2_UnoControlEdit );
+    aNames[ aNames.getLength() - 1 ] = "stardiv.vcl.control.Edit";
     return aNames;
 }
 
@@ -565,6 +571,23 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropert
     return xInfo;
 }
 
+OUString UnoControlFileControlModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlFileControlModel");
+}
+
+css::uno::Sequence<OUString>
+UnoControlFileControlModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlFileControlModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.FileControl";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoControlFileControlModel_get_implementation(
     css::uno::XComponentContext *context,
@@ -586,6 +609,22 @@ OUString UnoFileControl::GetComponentServiceName()
     return OUString("filecontrol");
 }
 
+OUString UnoFileControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoFileControl");
+}
+
+css::uno::Sequence<OUString> UnoFileControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoEditControl::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlFileControl";
+    s[s.getLength() - 1] = "stardiv.vcl.control.FileControl";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoFileControl_get_implementation(
     css::uno::XComponentContext *,
@@ -722,6 +761,22 @@ uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetI
     return xInfo;
 }
 
+OUString UnoControlButtonModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlButtonModel");
+}
+
+css::uno::Sequence<OUString> UnoControlButtonModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(GraphicControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlButtonModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.Button";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoControlButtonModel_get_implementation(
     css::uno::XComponentContext *context,
@@ -870,6 +925,22 @@ awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(
     return Impl_calcAdjustedSize( rNewSize );
 }
 
+OUString UnoButtonControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoButtonControl");
+}
+
+css::uno::Sequence<OUString> UnoButtonControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlBase::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlButton";
+    s[s.getLength() - 1] = "stardiv.vcl.control.Button";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoButtonControl_get_implementation(
     css::uno::XComponentContext *,
@@ -893,6 +964,25 @@ OUString UnoControlImageControlModel::getServiceName() throw(::com::sun::star::u
     return OUString::createFromAscii( szServiceName_UnoControlImageControlModel );
 }
 
+OUString UnoControlImageControlModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlImageControlModel");
+}
+
+css::uno::Sequence<OUString>
+UnoControlImageControlModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(GraphicControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 4);
+    s[s.getLength() - 4] = "com.sun.star.awt.UnoControlImageButtonModel";
+    s[s.getLength() - 3] = "com.sun.star.awt.UnoControlImageControlModel";
+    s[s.getLength() - 2] = "stardiv.vcl.controlmodel.ImageButton";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.ImageControl";
+    return s;
+}
+
 uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 {
     if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
@@ -1013,6 +1103,24 @@ awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize )
     return Impl_calcAdjustedSize( rNewSize );
 }
 
+OUString UnoImageControlControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoImageControlControl");
+}
+
+css::uno::Sequence<OUString> UnoImageControlControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlBase::getSupportedServiceNames());
+    s.realloc(s.getLength() + 4);
+    s[s.getLength() - 4] = "com.sun.star.awt.UnoControlImageButton";
+    s[s.getLength() - 3] = "com.sun.star.awt.UnoControlImageControl";
+    s[s.getLength() - 2] = "stardiv.vcl.control.ImageButton";
+    s[s.getLength() - 1] = "stardiv.vcl.control.ImageControl";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoImageControlControl_get_implementation(
     css::uno::XComponentContext *,
@@ -1067,6 +1175,23 @@ uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropert
     return xInfo;
 }
 
+OUString UnoControlRadioButtonModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlRadioButtonModel");
+}
+
+css::uno::Sequence<OUString>
+UnoControlRadioButtonModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(GraphicControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlRadioButtonModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.RadioButton";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoControlRadioButtonModel_get_implementation(
     css::uno::XComponentContext *context,
@@ -1237,6 +1362,22 @@ awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) t
     return Impl_calcAdjustedSize( rNewSize );
 }
 
+OUString UnoRadioButtonControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoRadioButtonControl");
+}
+
+css::uno::Sequence<OUString> UnoRadioButtonControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlBase::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlRadioButton";
+    s[s.getLength() - 1] = "stardiv.vcl.control.RadioButton";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoRadioButtonControl_get_implementation(
     css::uno::XComponentContext *,
@@ -1291,6 +1432,22 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySe
     return xInfo;
 }
 
+OUString UnoControlCheckBoxModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString( "stardiv.Toolkit.UnoControlCheckBoxModel");
+}
+
+css::uno::Sequence<OUString> UnoControlCheckBoxModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(GraphicControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlCheckBoxModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.CheckBox";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoControlCheckBoxModel_get_implementation(
     css::uno::XComponentContext *context,
@@ -1436,6 +1593,22 @@ awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) thro
     return Impl_calcAdjustedSize( rNewSize );
 }
 
+OUString UnoCheckBoxControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoCheckBoxControl");
+}
+
+css::uno::Sequence<OUString> UnoCheckBoxControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlBase::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlCheckBox";
+    s[s.getLength() - 1] = "stardiv.vcl.control.CheckBox";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoCheckBoxControl_get_implementation(
     css::uno::XComponentContext *,
@@ -1697,6 +1870,23 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedTextModel::getPropertyS
     return xInfo;
 }
 
+OUString UnoControlFixedTextModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlFixedTextModel");
+}
+
+css::uno::Sequence<OUString>
+UnoControlFixedTextModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlFixedTextModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.FixedText";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoControlFixedTextModel_get_implementation(
     css::uno::XComponentContext *context,
@@ -1786,6 +1976,22 @@ awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize ) thr
     return Impl_calcAdjustedSize( rNewSize );
 }
 
+OUString UnoFixedTextControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoFixedTextControl");
+}
+
+css::uno::Sequence<OUString> UnoFixedTextControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlBase::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlFixedText";
+    s[s.getLength() - 1] = "stardiv.vcl.control.FixedText";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoFixedTextControl_get_implementation(
     css::uno::XComponentContext *,
@@ -1846,6 +2052,22 @@ uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySe
     return xInfo;
 }
 
+OUString UnoControlGroupBoxModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlGroupBoxModel");
+}
+
+css::uno::Sequence<OUString> UnoControlGroupBoxModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlGroupBoxModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.GroupBox";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoControlGroupBoxModel_get_implementation(
     css::uno::XComponentContext *context,
@@ -1874,6 +2096,22 @@ sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException, std::e
     return sal_True;
 }
 
+OUString UnoGroupBoxControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoGroupBoxControl");
+}
+
+css::uno::Sequence<OUString> UnoGroupBoxControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlBase::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlGroupBox";
+    s[s.getLength() - 1] = "stardiv.vcl.control.GroupBox";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoGroupBoxControl_get_implementation(
     css::uno::XComponentContext *,
@@ -2009,7 +2247,22 @@ UnoControlListBoxModel::UnoControlListBoxModel( const UnoControlListBoxModel& i_
 UnoControlListBoxModel::~UnoControlListBoxModel()
 {
 }
-IMPL_SERVICEINFO_DERIVED( UnoControlListBoxModel, UnoControlModel, "com.sun.star.awt.UnoControlListBoxModel" )
+
+OUString UnoControlListBoxModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlListBoxModel");
+}
+
+css::uno::Sequence<OUString> UnoControlListBoxModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlListBoxModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.ListBox";
+    return s;
+}
 
 OUString UnoControlListBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
@@ -2452,7 +2705,22 @@ OUString UnoListBoxControl::GetComponentServiceName()
 {
     return OUString("listbox");
 }
-IMPL_SERVICEINFO_DERIVED( UnoListBoxControl, UnoControlBase, "com.sun.star.awt.UnoControlListBox" )
+
+OUString UnoListBoxControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoListBoxControl");
+}
+
+css::uno::Sequence<OUString> UnoListBoxControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlBase::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlListBox";
+    s[s.getLength() - 1] = "stardiv.vcl.control.ListBox";
+    return s;
+}
 
 void UnoListBoxControl::dispose() throw(uno::RuntimeException, std::exception)
 {
@@ -2877,7 +3145,21 @@ UnoControlComboBoxModel::UnoControlComboBoxModel( const Reference< XComponentCon
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXComboBox );
 }
 
-IMPL_SERVICEINFO_DERIVED( UnoControlComboBoxModel, UnoControlModel, "com.sun.star.awt.UnoControlComboBoxModel" )
+OUString UnoControlComboBoxModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlComboBoxModel");
+}
+
+css::uno::Sequence<OUString> UnoControlComboBoxModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlComboBoxModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.ComboBox";
+    return s;
+}
 
 uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
 {
@@ -2963,7 +3245,22 @@ UnoComboBoxControl::UnoComboBoxControl()
     maComponentInfos.nWidth = 100;
     maComponentInfos.nHeight = 12;
 }
-IMPL_SERVICEINFO_DERIVED( UnoComboBoxControl, UnoEditControl, "com.sun.star.awt.UnoControlComboBox" )
+
+OUString UnoComboBoxControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString( "stardiv.Toolkit.UnoComboBoxControl");
+}
+
+css::uno::Sequence<OUString> UnoComboBoxControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoEditControl::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlComboBox";
+    s[s.getLength() - 1] = "stardiv.vcl.control.ComboBox";
+    return s;
+}
 
 OUString UnoComboBoxControl::GetComponentServiceName()
 {
@@ -3409,6 +3706,23 @@ uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertyS
     return xInfo;
 }
 
+OUString UnoControlDateFieldModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlDateFieldModel");
+}
+
+css::uno::Sequence<OUString>
+UnoControlDateFieldModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlDateFieldModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.DateField";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoControlDateFieldModel_get_implementation(
     css::uno::XComponentContext *context,
@@ -3613,6 +3927,22 @@ sal_Bool UnoDateFieldControl::isStrictFormat() throw(uno::RuntimeException, std:
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
+OUString UnoDateFieldControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoDateFieldControl");
+}
+
+css::uno::Sequence<OUString> UnoDateFieldControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoSpinFieldControl::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlDateField";
+    s[s.getLength() - 1] = "stardiv.vcl.control.DateField";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoDateFieldControl_get_implementation(
     css::uno::XComponentContext *,
@@ -3665,6 +3995,23 @@ uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertyS
     return xInfo;
 }
 
+OUString UnoControlTimeFieldModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlTimeFieldModel");
+}
+
+css::uno::Sequence<OUString>
+UnoControlTimeFieldModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlTimeFieldModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.TimeField";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoControlTimeFieldModel_get_implementation(
     css::uno::XComponentContext *context,
@@ -3828,6 +4175,22 @@ sal_Bool UnoTimeFieldControl::isStrictFormat() throw(uno::RuntimeException, std:
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
+OUString UnoTimeFieldControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoTimeFieldControl");
+}
+
+css::uno::Sequence<OUString> UnoTimeFieldControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoSpinFieldControl::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlTimeField";
+    s[s.getLength() - 1] = "stardiv.vcl.control.TimeField";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoTimeFieldControl_get_implementation(
     css::uno::XComponentContext *,
@@ -3880,6 +4243,23 @@ uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getProper
     return xInfo;
 }
 
+OUString UnoControlNumericFieldModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlNumericFieldModel");
+}
+
+css::uno::Sequence<OUString>
+UnoControlNumericFieldModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlNumericFieldModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.NumericField";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoControlNumericFieldModel_get_implementation(
     css::uno::XComponentContext *context,
@@ -4016,6 +4396,22 @@ sal_Bool UnoNumericFieldControl::isStrictFormat() throw(uno::RuntimeException, s
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
+OUString UnoNumericFieldControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoNumericFieldControl");
+}
+
+css::uno::Sequence<OUString> UnoNumericFieldControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoSpinFieldControl::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlNumericField";
+    s[s.getLength() - 1] = "stardiv.vcl.control.NumericField";
+    return s;
+}
+
 void UnoNumericFieldControl::setSpinSize( double Digits ) throw(uno::RuntimeException, std::exception)
 {
     uno::Any aAny;
@@ -4098,6 +4494,23 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPrope
     return xInfo;
 }
 
+OUString UnoControlCurrencyFieldModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlCurrencyFieldModel");
+}
+
+css::uno::Sequence<OUString>
+UnoControlCurrencyFieldModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlCurrencyFieldModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.CurrencyField";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoControlCurrencyFieldModel_get_implementation(
     css::uno::XComponentContext *context,
@@ -4233,6 +4646,23 @@ sal_Bool UnoCurrencyFieldControl::isStrictFormat() throw(uno::RuntimeException,
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
+OUString UnoCurrencyFieldControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoCurrencyFieldControl");
+}
+
+css::uno::Sequence<OUString>
+UnoCurrencyFieldControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoSpinFieldControl::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlCurrencyField";
+    s[s.getLength() - 1] = "stardiv.vcl.control.CurrencyField";
+    return s;
+}
+
 void UnoCurrencyFieldControl::setSpinSize( double Digits ) throw(uno::RuntimeException, std::exception)
 {
     uno::Any aAny;
@@ -4308,6 +4738,23 @@ uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getProper
     return xInfo;
 }
 
+OUString UnoControlPatternFieldModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlPatternFieldModel");
+}
+
+css::uno::Sequence<OUString>
+UnoControlPatternFieldModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlPatternFieldModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.PatternField";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoControlPatternFieldModel_get_implementation(
     css::uno::XComponentContext *context,
@@ -4405,6 +4852,22 @@ sal_Bool UnoPatternFieldControl::isStrictFormat() throw(uno::RuntimeException, s
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
+OUString UnoPatternFieldControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoPatternFieldControl");
+}
+
+css::uno::Sequence<OUString> UnoPatternFieldControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoSpinFieldControl::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlPatternField";
+    s[s.getLength() - 1] = "stardiv.vcl.control.PatternField";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoPatternFieldControl_get_implementation(
     css::uno::XComponentContext *,
@@ -4469,6 +4932,23 @@ uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropert
     return xInfo;
 }
 
+OUString UnoControlProgressBarModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlProgressBarModel");
+}
+
+css::uno::Sequence<OUString>
+UnoControlProgressBarModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlProgressBarModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.ProgressBar";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoControlProgressBarModel_get_implementation(
     css::uno::XComponentContext *context,
@@ -4553,6 +5033,22 @@ sal_Int32 UnoProgressBarControl::getValue() throw(::com::sun::star::uno::Runtime
     return ImplGetPropertyValue_INT32( BASEPROPERTY_PROGRESSVALUE );
 }
 
+OUString UnoProgressBarControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoProgressBarControl");
+}
+
+css::uno::Sequence<OUString> UnoProgressBarControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlBase::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlProgressBar";
+    s[s.getLength() - 1] = "stardiv.vcl.control.ProgressBar";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoProgressBarControl_get_implementation(
     css::uno::XComponentContext *,
@@ -4613,6 +5109,23 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertyS
     return xInfo;
 }
 
+OUString UnoControlFixedLineModel::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoControlFixedLineModel");
+}
+
+css::uno::Sequence<OUString>
+UnoControlFixedLineModel::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlModel::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlFixedLineModel";
+    s[s.getLength() - 1] = "stardiv.vcl.controlmodel.FixedLine";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoControlFixedLineModel_get_implementation(
     css::uno::XComponentContext *context,
@@ -4641,6 +5154,22 @@ sal_Bool UnoFixedLineControl::isTransparent() throw(uno::RuntimeException, std::
     return sal_True;
 }
 
+OUString UnoFixedLineControl::getImplementationName()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    return OUString("stardiv.Toolkit.UnoFixedLineControl");
+}
+
+css::uno::Sequence<OUString> UnoFixedLineControl::getSupportedServiceNames()
+    throw (css::uno::RuntimeException, std::exception)
+{
+    auto s(UnoControlBase::getSupportedServiceNames());
+    s.realloc(s.getLength() + 2);
+    s[s.getLength() - 2] = "com.sun.star.awt.UnoControlFixedLine";
+    s[s.getLength() - 1] = "stardiv.vcl.control.FixedLine";
+    return s;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
 stardiv_Toolkit_UnoFixedLineControl_get_implementation(
     css::uno::XComponentContext *,