tk: Ctor feature for StdTabController(Model).

Change-Id: I3792b8b4d240c212d332c676d53eaa1f5dca3902

4 files changed, 20 insertions, 9 deletions

diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index e5c9dfb72020..b0bece51a0e8 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -384,4 +384,12 @@ Reference< XControl >  StdTabController::FindControl( Sequence< Reference< XCont
     return Reference< XControl > ();
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_StdTabController_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new StdTabController());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index 6857ae317bd5..377c5fbdb879 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/io/XMarkableStream.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <toolkit/controls/stdtabcontrollermodel.hxx>
 #include <toolkit/helper/macros.hxx>
@@ -412,8 +413,12 @@ void StdTabControllerModel::read( const ::com::sun::star::uno::Reference< ::com:
     }
 }
 
-
-
-
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+stardiv_Toolkit_StdTabControllerModel_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new StdTabControllerModel());
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index 18c91ad11ebe..5c7853382d6b 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/registerservices.cxx
@@ -99,8 +99,6 @@ namespace toolkit
 
 using namespace toolkit;
 
-IMPL_CREATEINSTANCE( StdTabController )
-IMPL_CREATEINSTANCE( StdTabControllerModel )
 IMPL_CREATEINSTANCE( UnoControlContainer )
 IMPL_CREATEINSTANCE_CTX( UnoControlContainerModel )
 IMPL_CREATEINSTANCE_CTX( UnoControlFormattedFieldModel )
@@ -136,8 +134,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL tk_component_getFactory( const sal_Char* sImple
         GET_FACTORY( VCLXPointer, szServiceName_Pointer, szServiceName2_Pointer )
         GET_FACTORY( UnoControlContainer, szServiceName_UnoControlContainer, szServiceName2_UnoControlContainer )
         GET_FACTORY( UnoControlContainerModel, szServiceName_UnoControlContainerModel, szServiceName2_UnoControlContainerModel )
-        GET_FACTORY( StdTabController, szServiceName_TabController, szServiceName2_TabController )
-        GET_FACTORY( StdTabControllerModel, szServiceName_TabControllerModel, szServiceName2_TabControllerModel )
         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 e157bcded087..32a490090f0c 100644
--- a/toolkit/util/tk.component
+++ b/toolkit/util/tk.component
@@ -71,11 +71,13 @@
       constructor="stardiv_Toolkit_MutableTreeDataModel_get_implementation">
     <service name="com.sun.star.awt.tree.MutableTreeDataModel"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.StdTabController">
+  <implementation name="stardiv.Toolkit.StdTabController"
+      constructor="stardiv_Toolkit_StdTabController_get_implementation">
     <service name="com.sun.star.awt.TabController"/>
     <service name="stardiv.vcl.control.TabController"/>
   </implementation>
-  <implementation name="stardiv.Toolkit.StdTabControllerModel">
+  <implementation name="stardiv.Toolkit.StdTabControllerModel"
+      constructor="stardiv_Toolkit_StdTabControllerModel_get_implementation">
     <service name="com.sun.star.awt.TabControllerModel"/>
     <service name="stardiv.vcl.controlmodel.TabController"/>
   </implementation>