tk: Ctor feature for the rest of dialogcontrol.cxx classes.

Change-Id: Ic96abfe99112b78244e4318aed5b36b5af1dd679

3 files changed, 70 insertions, 21 deletions

diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 491ec62592f0..d8c0af404861 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -1237,4 +1237,60 @@ stardiv_Toolkit_UnoControlDialogModel_get_implementation(
     return cppu::acquire(new OGeometryControlModel<UnoControlDialogModel>(context));
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoDialogControl_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoDialogControl(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoMultiPageControl_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoMultiPageControl(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoMultiPageModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoMultiPageModel(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoPageControl_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoPageControl(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoPageModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoPageModel(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoFrameControl_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoFrameControl(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoFrameModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoFrameModel(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index 2662ebd4d311..a3a805a5cbfd 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/registerservices.cxx
@@ -100,14 +100,7 @@ namespace toolkit
 using namespace toolkit;
 
 IMPL_CREATEINSTANCE_CTX( UnoControlFormattedFieldModel )
-IMPL_CREATEINSTANCE_CTX( UnoMultiPageModel )
-IMPL_CREATEINSTANCE_CTX( UnoPageModel )
-IMPL_CREATEINSTANCE_CTX( UnoFrameModel )
-IMPL_CREATEINSTANCE_CTX( UnoDialogControl )
 IMPL_CREATEINSTANCE( UnoFormattedFieldControl )
-IMPL_CREATEINSTANCE_CTX( UnoMultiPageControl )
-IMPL_CREATEINSTANCE_CTX( UnoPageControl )
-IMPL_CREATEINSTANCE_CTX( UnoFrameControl )
 
 extern "C"
 {
@@ -121,15 +114,8 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL tk_component_getFactory( const sal_Char* sImple
     {
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory =
             static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( _pServiceManager );
-        GET_FACTORY( UnoDialogControl, szServiceName_UnoControlDialog, szServiceName2_UnoControlDialog )
         GET_FACTORY( UnoFormattedFieldControl, szServiceName_UnoControlFormattedField, szServiceName2_UnoControlFormattedField )
         GET_FACTORY( UnoControlFormattedFieldModel, szServiceName_UnoControlFormattedFieldModel, szServiceName2_UnoControlFormattedFieldModel )
-        GET_FACTORY( UnoMultiPageModel, szServiceName_UnoMultiPageModel, NULL )
-        GET_FACTORY( UnoMultiPageControl, szServiceName_UnoMultiPageControl, NULL )
-        GET_FACTORY( UnoPageModel, szServiceName_UnoPageModel, NULL )
-        GET_FACTORY( UnoPageControl, szServiceName_UnoPageControl, NULL )
-        GET_FACTORY( UnoFrameModel, szServiceName_UnoFrameModel, NULL )
-        GET_FACTORY( UnoFrameControl, szServiceName_UnoFrameControl, NULL )
     }
     return pRet;
 }
diff --git a/toolkit/util/tk.component b/toolkit/util/tk.component
index 8ca92f0d4ec3..1d34d5e66481 100644
--- a/toolkit/util/tk.component
+++ b/toolkit/util/tk.component
@@ -234,7 +234,8 @@
     <service name="com.sun.star.awt.UnoControlDateField"/>
     <service name="stardiv.vcl.control.DateField"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoDialogControl">
+  <implementation name="stardiv.Toolkit.UnoDialogControl"
+      constructor="stardiv_Toolkit_UnoDialogControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlDialog"/>
     <service name="stardiv.vcl.control.Dialog"/>
   </implementation>
@@ -363,22 +364,28 @@
     <service name="com.sun.star.awt.Toolkit"/>
     <service name="stardiv.vcl.VclToolkit"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoMultiPageModel">
+  <implementation name="stardiv.Toolkit.UnoMultiPageModel"
+      constructor="stardiv_Toolkit_UnoMultiPageModel_get_implementation">
     <service name="com.sun.star.awt.UnoMultiPageModel"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoMultiPageControl">
+  <implementation name="stardiv.Toolkit.UnoMultiPageControl"
+      constructor="stardiv_Toolkit_UnoMultiPageControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlMultiPage"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoPageModel">
+  <implementation name="stardiv.Toolkit.UnoPageModel"
+      constructor="stardiv_Toolkit_UnoPageModel_get_implementation">
     <service name="com.sun.star.awt.UnoPageModel"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoPageControl">
+  <implementation name="stardiv.Toolkit.UnoPageControl"
+      constructor="stardiv_Toolkit_UnoPageControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlPage"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoFrameModel">
+  <implementation name="stardiv.Toolkit.UnoFrameModel"
+      constructor="stardiv_Toolkit_UnoFrameModel_get_implementation">
     <service name="com.sun.star.awt.UnoFrameModel"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoFrameControl">
+  <implementation name="stardiv.Toolkit.UnoFrameControl"
+      constructor="stardiv_Toolkit_UnoFrameControl_get_implementation">
     <service name="com.sun.star.awt.UnoControlFrame"/>
   </implementation>
 </component>