tk: Ctor feature for toolkit::(UnoControlRoadmapModel|UnoRoadmapControl).

Change-Id: Ic748e90e96285c394a3a2ac30ad1090b91ede160

3 files changed, 20 insertions, 7 deletions

diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 8b2e8363309d..56bb561517bf 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -22,7 +22,6 @@
 #include <toolkit/helper/unopropertyarrayhelper.hxx>
 #include <toolkit/helper/property.hxx>
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
-#include <comphelper/processfactory.hxx>
 #include <osl/diagnose.h>
 
 //........................................................................
@@ -489,4 +488,20 @@ void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt
 
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlRoadmapModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new toolkit::UnoControlRoadmapModel(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoRoadmapControl_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new toolkit::UnoRoadmapControl());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index c6512caff30b..18c91ad11ebe 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/registerservices.cxx
@@ -118,8 +118,6 @@ IMPL_CREATEINSTANCE( VCLXMenuBar )
 IMPL_CREATEINSTANCE( VCLXPointer )
 IMPL_CREATEINSTANCE( VCLXPopupMenu )
 IMPL_CREATEINSTANCE( VCLXPrinterServer )
-IMPL_CREATEINSTANCE( UnoRoadmapControl )
-IMPL_CREATEINSTANCE_CTX( UnoControlRoadmapModel )
 
 extern "C"
 {
@@ -146,8 +144,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL tk_component_getFactory( const sal_Char* sImple
         GET_FACTORY( UnoScrollBarControl, szServiceName_UnoControlScrollBar, szServiceName2_UnoControlScrollBar )
         GET_FACTORY( UnoControlScrollBarModel, szServiceName_UnoControlScrollBarModel, szServiceName2_UnoControlScrollBarModel )
         GET_FACTORY( VCLXPrinterServer, szServiceName_PrinterServer, szServiceName2_PrinterServer )
-        GET_FACTORY( UnoRoadmapControl, szServiceName_UnoControlRoadmap, szServiceName2_UnoControlRoadmap )
-        GET_FACTORY( UnoControlRoadmapModel, szServiceName_UnoControlRoadmapModel, szServiceName2_UnoControlRoadmapModel )
         GET_FACTORY( UnoMultiPageModel, szServiceName_UnoMultiPageModel, NULL )
         GET_FACTORY( UnoMultiPageControl, szServiceName_UnoMultiPageControl, NULL )
         GET_FACTORY( UnoPageModel, szServiceName_UnoPageModel, NULL )
diff --git a/toolkit/util/tk.component b/toolkit/util/tk.component
index 896042b96d94..e157bcded087 100644
--- a/toolkit/util/tk.component
+++ b/toolkit/util/tk.component
@@ -205,7 +205,8 @@
     <service name="com.sun.star.awt.UnoControlRadioButtonModel"/>
     <service name="stardiv.vcl.controlmodel.RadioButton"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlRoadmapModel">
+  <implementation name="stardiv.Toolkit.UnoControlRoadmapModel"
+      constructor="stardiv_Toolkit_UnoControlRoadmapModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlRoadmapModel"/>
     <service name="stardiv.vcl.controlmodel.Roadmap"/>
   </implementation>
@@ -297,7 +298,8 @@
     <service name="com.sun.star.awt.UnoControlRadioButton"/>
     <service name="stardiv.vcl.control.RadioButton"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoRoadmapControl">
+  <implementation name="stardiv.Toolkit.UnoRoadmapControl"
+      constructor="stardiv_Toolkit_UnoRoadmapControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlRoadmap"/>
     <service name="stardiv.vcl.control.Roadmap"/>
   </implementation>