tk: Ctor feature for UnoControlContainer(Model).

Change-Id: I7f0e457eaf5057d325226633936e544ace1f1620

4 files changed, 19 insertions, 8 deletions

diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 6927e98792b0..8c3d99ae8a5f 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -841,4 +841,12 @@ void UnoControlContainer::PrepareWindowDescriptor( ::com::sun::star::awt::Window
     }
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlContainer_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlContainer());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index 316d4980ab7d..1f505023a6a9 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -75,7 +75,12 @@ OUString UnoControlContainerModel::getServiceName() throw(::com::sun::star::uno:
     return *pHelper;
 }
 
-
-
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_UnoControlContainerModel_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new UnoControlContainerModel(context));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index d7e6e2a5c6d9..ebf938496039 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/registerservices.cxx
@@ -99,8 +99,6 @@ namespace toolkit
 
 using namespace toolkit;
 
-IMPL_CREATEINSTANCE( UnoControlContainer )
-IMPL_CREATEINSTANCE_CTX( UnoControlContainerModel )
 IMPL_CREATEINSTANCE_CTX( UnoControlFormattedFieldModel )
 IMPL_CREATEINSTANCE_CTX( UnoMultiPageModel )
 IMPL_CREATEINSTANCE_CTX( UnoPageModel )
@@ -130,8 +128,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL tk_component_getFactory( const sal_Char* sImple
         GET_FACTORY( VCLXPopupMenu, szServiceName_PopupMenu, szServiceName2_PopupMenu )
         GET_FACTORY( VCLXMenuBar, szServiceName_MenuBar, szServiceName2_MenuBar )
         GET_FACTORY( VCLXPointer, szServiceName_Pointer, szServiceName2_Pointer )
-        GET_FACTORY( UnoControlContainer, szServiceName_UnoControlContainer, szServiceName2_UnoControlContainer )
-        GET_FACTORY( UnoControlContainerModel, szServiceName_UnoControlContainerModel, szServiceName2_UnoControlContainerModel )
         GET_FACTORY( UnoDialogControl, szServiceName_UnoControlDialog, szServiceName2_UnoControlDialog )
         GET_FACTORY( UnoFormattedFieldControl, szServiceName_UnoControlFormattedField, szServiceName2_UnoControlFormattedField )
         GET_FACTORY( UnoControlFormattedFieldModel, szServiceName_UnoControlFormattedFieldModel, szServiceName2_UnoControlFormattedFieldModel )
diff --git a/toolkit/util/tk.component b/toolkit/util/tk.component
index 6448268c4e0b..9d5b21c757f4 100644
--- a/toolkit/util/tk.component
+++ b/toolkit/util/tk.component
@@ -119,11 +119,13 @@
     <service name="com.sun.star.awt.UnoControlComboBoxModel"/>
     <service name="stardiv.vcl.controlmodel.ComboBox"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlContainer">
+  <implementation name="stardiv.Toolkit.UnoControlContainer"
+      constructor="stardiv_Toolkit_UnoControlContainer_get_implementation">
     <service name="com.sun.star.awt.UnoControlContainer"/>
     <service name="stardiv.vcl.control.ControlContainer"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.UnoControlContainerModel">
+  <implementation name="stardiv.Toolkit.UnoControlContainerModel"
+      constructor="stardiv_Toolkit_UnoControlContainerModel_get_implementation">
     <service name="com.sun.star.awt.UnoControlContainerModel"/>
     <service name="stardiv.vcl.controlmodel.ControlContainer"/>
   </implementation>