[Libreoffice-commits] core.git: 2 commits - dbaccess/inc dbaccess/Library_dbaxml.mk dbaccess/Library_dbu.mk dbaccess/Library_sdbt.mk dbaccess/source dbaccess/util solenv/bin svgio/Library_svgio.mk svgio/source svgio/svgio.component

Wed, 08 Jul 2020 11:27:13 -0700 

 dbaccess/Library_dbaxml.mk                               |    2 
 dbaccess/Library_dbu.mk                                  |    2 
 dbaccess/Library_sdbt.mk                                 |    1 
 dbaccess/inc/pch/precompiled_dbaxml.hxx                  |    1 
 dbaccess/inc/pch/precompiled_dbu.hxx                     |    2 
 dbaccess/source/filter/xml/dbaxml.component              |   20 +-
 dbaccess/source/filter/xml/dbloader2.cxx                 |   61 +-------
 dbaccess/source/filter/xml/xmlExport.cxx                 |   99 ++-----------
 dbaccess/source/filter/xml/xmlfilter.cxx                 |    8 -
 dbaccess/source/filter/xml/xmlservices.cxx               |   69 ---------
 dbaccess/source/filter/xml/xmlservices.hxx               |   37 ----
 dbaccess/source/inc/apitools.hxx                         |   37 ----
 dbaccess/source/inc/dbu_reghelper.hxx                    |   39 -----
 dbaccess/source/inc/flt_reghelper.hxx                    |   39 -----
 dbaccess/source/inc/registrationhelper.hxx               |  112 ---------------
 dbaccess/source/sdbtools/connection/connectiontools.cxx  |   26 +--
 dbaccess/source/sdbtools/inc/connectiontools.hxx         |    6 
 dbaccess/source/sdbtools/misc/sdbt_services.cxx          |   46 ------
 dbaccess/source/shared/dbu_reghelper.cxx                 |   34 ----
 dbaccess/source/shared/flt_reghelper.cxx                 |   34 ----
 dbaccess/source/ui/app/AppController.cxx                 |   26 ---
 dbaccess/source/ui/app/AppController.hxx                 |    7 
 dbaccess/source/ui/browser/dbloader.cxx                  |   33 ----
 dbaccess/source/ui/browser/exsrcbrw.cxx                  |   29 ---
 dbaccess/source/ui/browser/sbagrid.cxx                   |   26 ---
 dbaccess/source/ui/browser/unodatbr.cxx                  |   28 ---
 dbaccess/source/ui/inc/RelationController.hxx            |    7 
 dbaccess/source/ui/inc/TableController.hxx               |    7 
 dbaccess/source/ui/inc/exsrcbrw.hxx                      |    7 
 dbaccess/source/ui/inc/querycontroller.hxx               |    7 
 dbaccess/source/ui/inc/sbagrid.hxx                       |    7 
 dbaccess/source/ui/inc/uiservices.hxx                    |   55 -------
 dbaccess/source/ui/inc/unodatbr.hxx                      |    8 -
 dbaccess/source/ui/inc/unosqlmessage.hxx                 |   10 -
 dbaccess/source/ui/misc/uiservices.cxx                   |   87 -----------
 dbaccess/source/ui/querydesign/limitboxcontroller.cxx    |   20 +-
 dbaccess/source/ui/querydesign/limitboxcontroller.hxx    |    6 
 dbaccess/source/ui/querydesign/querycontroller.cxx       |   54 +------
 dbaccess/source/ui/relationdesign/RelationController.cxx |   26 ---
 dbaccess/source/ui/tabledesign/TableController.cxx       |   25 ---
 dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx           |   34 ----
 dbaccess/source/ui/uno/ColumnControl.cxx                 |   19 +-
 dbaccess/source/ui/uno/ColumnControl.hxx                 |    6 
 dbaccess/source/ui/uno/ColumnModel.cxx                   |   19 +-
 dbaccess/source/ui/uno/ColumnModel.hxx                   |    6 
 dbaccess/source/ui/uno/DBTypeWizDlg.cxx                  |   23 ---
 dbaccess/source/ui/uno/DBTypeWizDlg.hxx                  |   10 -
 dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx             |   27 ---
 dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx             |   10 -
 dbaccess/source/ui/uno/TableFilterDlg.cxx                |   23 ---
 dbaccess/source/ui/uno/TableFilterDlg.hxx                |   10 -
 dbaccess/source/ui/uno/UserSettingsDlg.cxx               |   23 ---
 dbaccess/source/ui/uno/UserSettingsDlg.hxx               |   10 -
 dbaccess/source/ui/uno/admindlg.cxx                      |   23 ---
 dbaccess/source/ui/uno/admindlg.hxx                      |   10 -
 dbaccess/source/ui/uno/composerdialogs.cxx               |   39 ++---
 dbaccess/source/ui/uno/composerdialogs.hxx               |   12 -
 dbaccess/source/ui/uno/copytablewizard.cxx               |   32 ----
 dbaccess/source/ui/uno/dbinteraction.cxx                 |   40 +++--
 dbaccess/source/ui/uno/dbinteraction.hxx                 |   12 -
 dbaccess/source/ui/uno/textconnectionsettings_uno.cxx    |   34 +---
 dbaccess/source/ui/uno/unoDirectSql.cxx                  |   20 +-
 dbaccess/source/ui/uno/unoDirectSql.hxx                  |    9 -
 dbaccess/source/ui/uno/unosqlmessage.cxx                 |   23 ---
 dbaccess/util/dbu.component                              |   80 +++++++---
 dbaccess/util/sdbt.component                             |    5 
 solenv/bin/native-code.py                                |   11 +
 svgio/Library_svgio.mk                                   |    1 
 svgio/source/svguno/svguno.cxx                           |   46 ------
 svgio/source/svguno/xsvgparser.cxx                       |   35 +---
 svgio/source/svguno/xsvgparser.hxx                       |   49 ------
 svgio/svgio.component                                    |    5 
 72 files changed, 321 insertions(+), 1535 deletions(-)

New commits:
commit d29a314300d523d29ed894f1822227497fcb68f8
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Jul 8 11:06:03 2020 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jul 8 20:26:10 2020 +0200

    dbaccess: create instances with uno constructors
    
    See tdf#74608 for motivation
    
    Change-Id: Ib03014444d8176417cbd00b56764ee45fdad557c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98322
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index 0b9cb7666bf2..a9f2d96991c0 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -63,12 +63,10 @@ $(eval $(call gb_Library_add_exception_objects,dbaxml,\
     dbaccess/source/filter/xml/xmlLogin \
     dbaccess/source/filter/xml/xmlQuery \
     dbaccess/source/filter/xml/xmlServerDatabase \
-    dbaccess/source/filter/xml/xmlservices \
     dbaccess/source/filter/xml/xmlStyleImport \
     dbaccess/source/filter/xml/xmlTable \
     dbaccess/source/filter/xml/xmlTableFilterList \
     dbaccess/source/filter/xml/xmlTableFilterPattern \
-    dbaccess/source/shared/flt_reghelper \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 56e839029642..f75bece8d2bc 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -69,7 +69,6 @@ endif
 $(eval $(call gb_Library_set_componentfile,dbu,dbaccess/util/dbu))
 
 $(eval $(call gb_Library_add_exception_objects,dbu,\
-    dbaccess/source/shared/dbu_reghelper \
     dbaccess/source/ui/app/AppController \
     dbaccess/source/ui/app/AppControllerDnD \
     dbaccess/source/ui/app/AppControllerGen \
@@ -172,7 +171,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
     dbaccess/source/ui/misc/stringlistitem \
     dbaccess/source/ui/misc/TableCopyHelper \
     dbaccess/source/ui/misc/TokenWriter \
-    dbaccess/source/ui/misc/uiservices \
     dbaccess/source/ui/misc/UITools \
     dbaccess/source/ui/misc/WColumnSelect \
     dbaccess/source/ui/misc/WCopyTable \
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 6021be9d9751..d941cc05fc97 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Library_add_exception_objects,sdbt,\
     dbaccess/source/sdbtools/connection/datasourcemetadata \
     dbaccess/source/sdbtools/connection/objectnames \
     dbaccess/source/sdbtools/connection/tablename \
-    dbaccess/source/sdbtools/misc/sdbt_services \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/inc/pch/precompiled_dbaxml.hxx 
b/dbaccess/inc/pch/precompiled_dbaxml.hxx
index 3e41685ba191..1f39c1940eaf 100644
--- a/dbaccess/inc/pch/precompiled_dbaxml.hxx
+++ b/dbaccess/inc/pch/precompiled_dbaxml.hxx
@@ -102,7 +102,6 @@
 #include <xmloff/xmluconv.hxx>
 #endif // PCH_LEVEL >= 3
 #if PCH_LEVEL >= 4
-#include <flt_reghelper.hxx>
 #endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx 
b/dbaccess/inc/pch/precompiled_dbu.hxx
index 6a7aa8f6022d..a721e9a7e921 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -214,11 +214,9 @@
 #include <callbacks.hxx>
 #include <dbaccess/dataview.hxx>
 #include <dbaccess/dbaccessdllapi.h>
-#include <dbu_reghelper.hxx>
 #include <dsitems.hxx>
 #include <sqlmessage.hxx>
 #include <stringconstants.hxx>
-#include <uiservices.hxx>
 #endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/dbaxml.component 
b/dbaccess/source/filter/xml/dbaxml.component
index 51a4182e4524..4842eb4ad32f 100644
--- a/dbaccess/source/filter/xml/dbaxml.component
+++ b/dbaccess/source/filter/xml/dbaxml.component
@@ -18,23 +18,29 @@
  -->
 
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="dbaxml" xmlns="http://openoffice.org/2010/uno-components";>
-  <implementation name="com.sun.star.comp.sdb.DBExportFilter">
+    xmlns="http://openoffice.org/2010/uno-components";>
+  <implementation name="com.sun.star.comp.sdb.DBExportFilter"
+    constructor="com_sun_star_comp_sdb_DBExportFilter_get_implementation">
     <service name="com.sun.star.document.ExportFilter"/>
   </implementation>
-  <implementation name="com.sun.star.comp.sdb.DBFilter">
+  <implementation name="com.sun.star.comp.sdb.DBFilter"
+    constructor="com_sun_star_comp_sdb_DBFilter_get_implementation">
     <service name="com.sun.star.document.ImportFilter"/>
   </implementation>
-  <implementation name="com.sun.star.comp.sdb.XMLFullExporter">
+  <implementation name="com.sun.star.comp.sdb.XMLFullExporter"
+    constructor="com_sun_star_comp_sdb_XMLFullExporter_get_implementation">
     <service name="com.sun.star.document.ExportFilter"/>
   </implementation>
-  <implementation name="com.sun.star.comp.sdb.XMLSettingsExporter">
+  <implementation name="com.sun.star.comp.sdb.XMLSettingsExporter"
+    constructor="com_sun_star_comp_sdb_XMLSettingsExporter_get_implementation">
     <service name="com.sun.star.document.ExportFilter"/>
   </implementation>
-  <implementation name="org.openoffice.comp.dbflt.DBContentLoader2">
+  <implementation name="org.openoffice.comp.dbflt.DBContentLoader2"
+    
constructor="org_openoffice_comp_dbflt_DBContentLoader2_get_implementation">
     <service name="com.sun.star.frame.FrameLoader"/>
   </implementation>
-  <implementation name="org.openoffice.comp.dbflt.DBTypeDetection">
+  <implementation name="org.openoffice.comp.dbflt.DBTypeDetection"
+    constructor="org_openoffice_comp_dbflt_DBTypeDetection_get_implementation">
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
   </implementation>
 </component>
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx 
b/dbaccess/source/filter/xml/dbloader2.cxx
index 13ea50a900b9..9587647a38ff 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <flt_reghelper.hxx>
-#include "xmlservices.hxx"
 #include <strings.hxx>
 
 #include <com/sun/star/beans/NamedValue.hpp>
@@ -71,7 +69,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::embed;
 using namespace ::com::sun::star::ui::dialogs;
@@ -95,15 +92,6 @@ public:
     sal_Bool                        SAL_CALL supportsService(const OUString& 
ServiceName) override;
     Sequence< OUString >            SAL_CALL getSupportedServiceNames() 
override;
 
-    // static methods
-    static OUString                 getImplementationName_Static() throw(  )
-    {
-        return "org.openoffice.comp.dbflt.DBTypeDetection";
-    }
-    static Sequence< OUString> getSupportedServiceNames_Static() throw(  );
-    static css::uno::Reference< css::uno::XInterface >
-            Create(const css::uno::Reference< css::lang::XMultiServiceFactory 
>&);
-
     virtual OUString SAL_CALL detect( css::uno::Sequence< 
css::beans::PropertyValue >& Descriptor ) override;
 };
 
@@ -175,15 +163,10 @@ OUString SAL_CALL DBTypeDetection::detect( 
css::uno::Sequence< css::beans::Prope
     return OUString();
 }
 
-Reference< XInterface > DBTypeDetection::Create( const Reference< 
XMultiServiceFactory >  & rSMgr )
-{
-    return *(new DBTypeDetection( comphelper::getComponentContext(rSMgr) ));
-}
-
 // XServiceInfo
 OUString SAL_CALL DBTypeDetection::getImplementationName()
 {
-    return getImplementationName_Static();
+    return "org.openoffice.comp.dbflt.DBTypeDetection";
 }
 
 // XServiceInfo
@@ -194,21 +177,17 @@ sal_Bool SAL_CALL DBTypeDetection::supportsService(const 
OUString& ServiceName)
 
 // XServiceInfo
 Sequence< OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames()
-{
-    return getSupportedServiceNames_Static();
-}
-
-// ORegistryServiceManager_Static
-Sequence< OUString > DBTypeDetection::getSupportedServiceNames_Static() throw( 
 )
 {
     return { "com.sun.star.document.ExtendedTypeDetection" };
 }
 
 } // namespace dbaxml
 
-extern "C" void createRegistryInfo_DBTypeDetection()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbflt_DBTypeDetection_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::DBTypeDetection 
> aAutoRegistration;
+    return cppu::acquire(new ::dbaxml::DBTypeDetection(context));
 }
 
 namespace dbaxml
@@ -233,15 +212,6 @@ public:
     sal_Bool                        SAL_CALL supportsService(const OUString& 
ServiceName) override;
     Sequence< OUString >            SAL_CALL getSupportedServiceNames() 
override;
 
-    // static methods
-    static OUString                 getImplementationName_Static() throw(  )
-    {
-        return "org.openoffice.comp.dbflt.DBContentLoader2";
-    }
-    static Sequence< OUString > getSupportedServiceNames_Static() throw(  );
-    static css::uno::Reference< css::uno::XInterface >
-            Create(const css::uno::Reference< css::lang::XMultiServiceFactory 
>&);
-
     // XLoader
     virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const 
OUString& _rURL,
                                 const Sequence< PropertyValue >& _rArgs,
@@ -261,15 +231,10 @@ DBContentLoader::DBContentLoader(const Reference< 
XComponentContext >& _rxFactor
 
 }
 
-Reference< XInterface > DBContentLoader::Create( const Reference< 
XMultiServiceFactory >  & rSMgr )
-{
-    return *(new DBContentLoader( comphelper::getComponentContext(rSMgr) ));
-}
-
 // XServiceInfo
 OUString SAL_CALL DBContentLoader::getImplementationName()
 {
-    return getImplementationName_Static();
+    return "org.openoffice.comp.dbflt.DBContentLoader2";
 }
 
 // XServiceInfo
@@ -281,15 +246,9 @@ sal_Bool SAL_CALL DBContentLoader::supportsService(const 
OUString& ServiceName)
 // XServiceInfo
 Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames()
 {
-    return getSupportedServiceNames_Static();
+    return { "com.sun.star.frame.FrameLoader" };
 }
 
-// ORegistryServiceManager_Static
-Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static() throw( 
 )
-{
-    Sequence<OUString> aSNS { "com.sun.star.frame.FrameLoader" };
-    return aSNS;
-}
 
 namespace
 {
@@ -565,9 +524,11 @@ IMPL_LINK_NOARG( DBContentLoader, OnStartTableWizard, 
void*, void )
 
 }
 
-extern "C" void createRegistryInfo_DBContentLoader2()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbflt_DBContentLoader2_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::DBContentLoader 
> aAutoRegistration;
+    return cppu::acquire(new ::dbaxml::DBContentLoader(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx 
b/dbaccess/source/filter/xml/xmlExport.cxx
index 49e7f04a3c76..323e51bd3579 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -19,8 +19,6 @@
 
 #include "xmlExport.hxx"
 #include "xmlAutoStyle.hxx"
-#include "xmlservices.hxx"
-#include <flt_reghelper.hxx>
 #include <sax/tools/converter.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
@@ -61,80 +59,34 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star;
 
-namespace dbaxml
-{
-    namespace {
-
-    class ODBExportHelper
-    {
-    public:
-        /// @throws RuntimeException
-        static OUString getImplementationName_Static(  );
-        /// @throws RuntimeException
-        static Sequence< OUString > getSupportedServiceNames_Static(  );
-        static Reference< XInterface > Create(const Reference< 
css::lang::XMultiServiceFactory >&);
-    };
-    class ODBFullExportHelper
-    {
-    public:
-        /// @throws RuntimeException
-        static OUString getImplementationName_Static(  );
-        /// @throws RuntimeException
-        static Sequence< OUString > getSupportedServiceNames_Static(  );
-        static Reference< XInterface > Create(const Reference< 
css::lang::XMultiServiceFactory >&);
-    };
-
-    }
-}
-
-extern "C" void createRegistryInfo_ODBFilterExport( )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+com_sun_star_comp_sdb_DBExportFilter_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const&)
 {
-    static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBExport > 
aAutoRegistration;
+    return cppu::acquire(new ::dbaxml::ODBExport(context,
+        "com.sun.star.comp.sdb.DBExportFilter"));
 }
 
-extern "C" void createRegistryInfo_OSettingsExport( )
-
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+com_sun_star_comp_sdb_XMLSettingsExporter_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const&)
 {
-    static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBExportHelper 
> aAutoRegistration;
+    return cppu::acquire(new ::dbaxml::ODBExport(context,
+        "com.sun.star.comp.sdb.XMLSettingsExporter",
+        SvXMLExportFlags::SETTINGS | SvXMLExportFlags::PRETTY ));
 }
 
-extern "C" void createRegistryInfo_OFullExport( )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+com_sun_star_comp_sdb_XMLFullExporter_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const&)
 {
-    static ::dbaxml::OMultiInstanceAutoRegistration< 
::dbaxml::ODBFullExportHelper > aAutoRegistration;
+    return cppu::acquire(new ::dbaxml::ODBExport(context,
+        "com.sun.star.comp.sdb.XMLFullExporter",
+        SvXMLExportFlags::ALL));
 }
 
 namespace dbaxml
 {
-    Reference< XInterface > ODBExportHelper::Create(const Reference< 
XMultiServiceFactory >& _rxORB)
-    {
-        return static_cast< XServiceInfo* >(new 
ODBExport(comphelper::getComponentContext(_rxORB), 
getImplementationName_Static(), SvXMLExportFlags::SETTINGS | 
SvXMLExportFlags::PRETTY ));
-    }
-
-    OUString ODBExportHelper::getImplementationName_Static(  )
-    {
-        return "com.sun.star.comp.sdb.XMLSettingsExporter";
-    }
-
-    Sequence< OUString > ODBExportHelper::getSupportedServiceNames_Static(  )
-    {
-        Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" 
};
-        return aSupported;
-    }
-
-    Reference< XInterface > ODBFullExportHelper::Create(const Reference< 
XMultiServiceFactory >& _rxORB)
-    {
-        return static_cast< XServiceInfo* >(new 
ODBExport(comphelper::getComponentContext(_rxORB), 
getImplementationName_Static(), SvXMLExportFlags::ALL));
-    }
-    OUString ODBFullExportHelper::getImplementationName_Static(  )
-    {
-        return "com.sun.star.comp.sdb.XMLFullExporter";
-    }
-    Sequence< OUString > ODBFullExportHelper::getSupportedServiceNames_Static( 
 )
-    {
-        Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" 
};
-        return aSupported;
-    }
-
     static OUString lcl_implGetPropertyXMLType(const Type& _rType)
     {
         // possible types we can write (either because we recognize them 
directly or because we convert _rValue
@@ -255,23 +207,6 @@ ODBExport::ODBExport(const Reference< XComponentContext >& 
_rxContext, OUString
         OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX ));
 }
 
-OUString ODBExport::getImplementationName_Static()
-{
-    return "com.sun.star.comp.sdb.DBExportFilter";
-}
-
-css::uno::Sequence<OUString> ODBExport::getSupportedServiceNames_Static()
-{
-    css::uno::Sequence<OUString> s { "com.sun.star.document.ExportFilter" };
-    return s;
-}
-
-css::uno::Reference< css::uno::XInterface >
-    ODBExport::Create(const css::uno::Reference< 
css::lang::XMultiServiceFactory >& _rxORB)
-{
-    return static_cast< XServiceInfo* >(new ODBExport( 
comphelper::getComponentContext(_rxORB), getImplementationName_Static()));
-}
-
 void ODBExport::exportDataSource()
 {
     try
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx 
b/dbaccess/source/filter/xml/xmlfilter.cxx
index 50acc7bcf7b5..bafe618bacc9 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -30,8 +30,6 @@
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
 #include "xmlfilter.hxx"
-#include "xmlservices.hxx"
-#include <flt_reghelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <xmloff/xmlnmspe.hxx>
@@ -65,9 +63,11 @@
 
 using namespace ::com::sun::star;
 
-extern "C" void createRegistryInfo_ODBFilter( )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+com_sun_star_comp_sdb_DBFilter_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const&)
 {
-    static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBFilter > 
aAutoRegistration;
+    return cppu::acquire(new ::dbaxml::ODBFilter(context));
 }
 
 
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx 
b/dbaccess/source/filter/xml/xmlservices.cxx
deleted file mode 100644
index c4b7987a203f..000000000000
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cppuhelper/factory.hxx>
-#include <flt_reghelper.hxx>
-#include "xmlservices.hxx"
-#include <mutex>
-
-using namespace ::dbaxml;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-
-extern "C" {
-
-static void createRegistryInfo_dbaxml()
-{
-    static std::once_flag aInit;
-    std::call_once(aInit, [&]()
-    {
-        createRegistryInfo_DBTypeDetection();
-        createRegistryInfo_ODBFilter();
-        createRegistryInfo_ODBFilterExport();
-        createRegistryInfo_OSettingsExport();
-        createRegistryInfo_OFullExport();
-        createRegistryInfo_DBContentLoader2();
-        return true;
-    });
-}
-
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void* dbaxml_component_getFactory(
-                    const char* pImplementationName,
-                    void* pServiceManager,
-                    void* /*pRegistryKey*/)
-{
-    createRegistryInfo_dbaxml();
-
-    Reference< XInterface > xRet;
-    if (pServiceManager && pImplementationName)
-    {
-        xRet = ::dbaxml::OModuleRegistration::getComponentFactory(
-            OUString::createFromAscii(pImplementationName),
-            static_cast< XMultiServiceFactory* >(pServiceManager));
-    }
-
-    if (xRet.is())
-        xRet->acquire();
-    return xRet.get();
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlservices.hxx 
b/dbaccess/source/filter/xml/xmlservices.hxx
deleted file mode 100644
index 3691c472c5f8..000000000000
--- a/dbaccess/source/filter/xml/xmlservices.hxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLSERVICES_HXX
-#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLSERVICES_HXX
-
-#include <sal/config.h>
-
-extern "C" {
-
-void createRegistryInfo_DBContentLoader2();
-void createRegistryInfo_DBTypeDetection();
-void createRegistryInfo_ODBFilter();
-void createRegistryInfo_ODBFilterExport();
-void createRegistryInfo_OFullExport();
-void createRegistryInfo_OSettingsExport();
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index 725cebd0b3db..d8e2be8cec8f 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -64,15 +64,6 @@ public:
         return implasciiname; \
     }   \
 
-#define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname)    \
-    OUString SAL_CALL classname::getImplementationName(  )   \
-    {   \
-        return getImplementationName_Static();  \
-    }   \
-    OUString classname::getImplementationName_Static(  )    \
-    {   \
-        return implasciiname; \
-    }   \
 
 #define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname)  \
     sal_Bool SAL_CALL classname::supportsService( const OUString& 
_rServiceName ) \
@@ -85,25 +76,7 @@ public:
         return false;   \
     }   \
 
-#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, 
serviceasciiname)    \
-    css::uno::Sequence< OUString > SAL_CALL 
classname::getSupportedServiceNames(  )  \
-    {   \
-        return getSupportedServiceNames_Static();   \
-    }   \
-    css::uno::Sequence< OUString > classname::getSupportedServiceNames_Static( 
 )   \
-    {   \
-        return { serviceasciiname }; \
-    }   \
 
-#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, 
serviceasciiname1, serviceasciiname2)    \
-    css::uno::Sequence< OUString > SAL_CALL 
classname::getSupportedServiceNames(  )  \
-    {   \
-        return getSupportedServiceNames_Static();   \
-    }   \
-    css::uno::Sequence< OUString > classname::getSupportedServiceNames_Static( 
 )   \
-    {   \
-        return { serviceasciiname1, serviceasciiname2 };    \
-    }   \
 
 #define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \
     IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname)   \
@@ -123,16 +96,6 @@ public:
     }
 
 
-#define IMPLEMENT_SERVICE_INFO2_STATIC(classname, implasciiname, 
serviceasciiname1, serviceasciiname2)  \
-    IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname)    \
-    IMPLEMENT_SERVICE_INFO_SUPPORTS(classname)  \
-    IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, 
serviceasciiname1,serviceasciiname2) \
-    css::uno::Reference< css::uno::XInterface >   \
-        classname::Create(const css::uno::Reference< 
css::lang::XMultiServiceFactory >& _rxORB)  \
-    {   \
-        return static_cast< XServiceInfo* >(new classname(_rxORB)); \
-    }
-
 
 #define IMPLEMENT_SERVICE_INFO3(classname, implasciiname, serviceasciiname1, 
serviceasciiname2, serviceasciiname3)  \
     IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname)   \
diff --git a/dbaccess/source/inc/dbu_reghelper.hxx 
b/dbaccess/source/inc/dbu_reghelper.hxx
deleted file mode 100644
index 1e105b25dddd..000000000000
--- a/dbaccess/source/inc/dbu_reghelper.hxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_DBACCESS_SOURCE_INC_DBU_REGHELPER_HXX
-#define INCLUDED_DBACCESS_SOURCE_INC_DBU_REGHELPER_HXX
-
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <rtl/ustring.hxx>
-#include <cppuhelper/factory.hxx>
-
-namespace dbaui
-{
-
-    #define REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
-    #include "registrationhelper.hxx"
-    #undef REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
-
-}
-
-#endif // INCLUDED_DBACCESS_SOURCE_INC_DBU_REGHELPER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/inc/flt_reghelper.hxx 
b/dbaccess/source/inc/flt_reghelper.hxx
deleted file mode 100644
index df43de320be7..000000000000
--- a/dbaccess/source/inc/flt_reghelper.hxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_DBACCESS_SOURCE_INC_FLT_REGHELPER_HXX
-#define INCLUDED_DBACCESS_SOURCE_INC_FLT_REGHELPER_HXX
-
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <rtl/ustring.hxx>
-#include <cppuhelper/factory.hxx>
-
-namespace dbaxml
-{
-
-    #define REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
-    #include "registrationhelper.hxx"
-    #undef REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
-
-}
-
-#endif // INCLUDED_DBACCESS_SOURCE_INC_FLT_REGHELPER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/inc/registrationhelper.hxx 
b/dbaccess/source/inc/registrationhelper.hxx
deleted file mode 100644
index a90781887ace..000000000000
--- a/dbaccess/source/inc/registrationhelper.hxx
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef REGISTRATIONHELPER_INCLUDED_INDIRECTLY_
-#error "don't include this file directly! use dbu_reghelper.hxx instead!"
-#endif
-
-typedef css::uno::Reference< css::lang::XSingleServiceFactory > 
(*FactoryInstantiation)
-        (
-            const css::uno::Reference< css::lang::XMultiServiceFactory >& 
_rServiceManager,
-            const OUString & _rComponentName,
-            ::cppu::ComponentInstantiation _pCreateFunction,
-            const css::uno::Sequence< OUString > & _rServiceNames,
-            rtl_ModuleCount*
-        );
-
-class OModuleRegistration
-{
-    static  css::uno::Sequence< OUString >*
-        s_pImplementationNames;
-    static  css::uno::Sequence< css::uno::Sequence< OUString > >*
-        s_pSupportedServices;
-    static  css::uno::Sequence< sal_Int64 >*
-        s_pCreationFunctionPointers;
-    static  css::uno::Sequence< sal_Int64 >*
-        s_pFactoryFunctionPointers;
-
-    // no direct instantiation, only static members/methods
-    OModuleRegistration() = delete;
-
-public:
-    /** register a component implementing a service with the given data.
-        @param      _rImplementationName        the implementation name of the 
component
-        @param      _rServiceNames              the services the component 
supports
-        @param      _pCreateFunction            a function for creating an 
instance of the component
-        @param      _pFactoryFunction           a function for creating a 
factory for that component
-        @see revokeComponent
-    */
-    static void registerComponent(
-        const OUString& _rImplementationName,
-        const css::uno::Sequence< OUString >& _rServiceNames,
-        ::cppu::ComponentInstantiation _pCreateFunction,
-        FactoryInstantiation _pFactoryFunction);
-
-    /** revoke the registration for the specified component
-        @param      _rImplementationName        the implementation name of the 
component
-    */
-    static void revokeComponent(
-        const OUString& _rImplementationName);
-
-    /** creates a Factory for the component with the given implementation 
name. Usually used from within component_getFactory.
-        @param      _rxServiceManager       a pointer to an 
XMultiServiceFactory interface as got in component_getFactory
-        @param      _pImplementationName    the implementation name of the 
component
-        @return                             the XInterface access to a factory 
for the component
-    */
-    static css::uno::Reference< css::uno::XInterface > getComponentFactory(
-        const OUString& _rImplementationName,
-        const css::uno::Reference< css::lang::XMultiServiceFactory >& 
_rxServiceManager
-        );
-};
-
-template <class TYPE>
-class OMultiInstanceAutoRegistration
-{
-public:
-    /** assumed that the template argument has the three methods<BR>
-        <code>static OUString getImplementationName_Static()</code><BR>
-        <code>static css::uno::Sequence< OUString > 
getSupportedServiceNames_Static()</code><BR>
-        and<BR>
-        <code>static css::uno::Reference< css::uno::XInterface >
-            Create(const css::uno::Reference< css::lang::XMultiServiceFactory 
>&)</code><BR>
-        the instantiation of this object will automatically register the class 
via <code>OModuleRegistration::registerComponent</code>.
-        The factory creation function used is 
<code>::cppu::createSingleFactory</code>.<BR>
-    */
-    OMultiInstanceAutoRegistration();
-    ~OMultiInstanceAutoRegistration();
-};
-
-template <class TYPE>
-OMultiInstanceAutoRegistration<TYPE>::OMultiInstanceAutoRegistration()
-{
-    OModuleRegistration::registerComponent(
-        TYPE::getImplementationName_Static(),
-        TYPE::getSupportedServiceNames_Static(),
-        TYPE::Create,
-        ::cppu::createSingleFactory
-        );
-}
-
-template <class TYPE>
-OMultiInstanceAutoRegistration<TYPE>::~OMultiInstanceAutoRegistration()
-{
-    OModuleRegistration::revokeComponent(TYPE::getImplementationName_Static());
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx 
b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index 2bc8bfd33cfa..65db1c64907a 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -89,7 +89,7 @@ namespace sdbtools
 
     OUString SAL_CALL ConnectionTools::getImplementationName()
     {
-        return getImplementationName_static();
+        return "com.sun.star.comp.dbaccess.ConnectionTools";
     }
 
     sal_Bool SAL_CALL ConnectionTools::supportsService(const OUString & 
ServiceName)
@@ -99,23 +99,7 @@ namespace sdbtools
 
     Sequence< OUString > SAL_CALL ConnectionTools::getSupportedServiceNames()
     {
-        return getSupportedServiceNames_static();
-    }
-
-    OUString ConnectionTools::getImplementationName_static()
-    {
-        return "com.sun.star.comp.dbaccess.ConnectionTools";
-    }
-
-    Sequence< OUString > ConnectionTools::getSupportedServiceNames_static()
-    {
-        Sequence<OUString> aSupported { 
"com.sun.star.sdb.tools.ConnectionTools" };
-        return aSupported;
-    }
-
-    Reference< XInterface > ConnectionTools::Create(const Reference< 
XComponentContext >& _rxContext )
-    {
-        return *( new ConnectionTools( _rxContext ) );
+        return  { "com.sun.star.sdb.tools.ConnectionTools" };
     }
 
     void SAL_CALL ConnectionTools::initialize(const Sequence< Any > & 
_rArguments)
@@ -139,4 +123,10 @@ namespace sdbtools
 
 } // namespace sdbtools
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+com_sun_star_comp_dbaccess_ConnectionTools_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
+{
+    return cppu::acquire(static_cast<cppu::OWeakObject*>(new 
sdbtools::ConnectionTools(context)));
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/inc/connectiontools.hxx 
b/dbaccess/source/sdbtools/inc/connectiontools.hxx
index a3dd610f861e..876f713afa0f 100644
--- a/dbaccess/source/sdbtools/inc/connectiontools.hxx
+++ b/dbaccess/source/sdbtools/inc/connectiontools.hxx
@@ -61,12 +61,6 @@ namespace sdbtools
         virtual sal_Bool SAL_CALL supportsService(const OUString & 
ServiceName) override;
         virtual css::uno::Sequence< OUString > SAL_CALL 
getSupportedServiceNames() override;
 
-        // XServiceInfo - static versions
-        static OUString getImplementationName_static();
-        static css::uno::Sequence< OUString > 
getSupportedServiceNames_static();
-        static css::uno::Reference< css::uno::XInterface >
-                        Create(const css::uno::Reference< 
css::uno::XComponentContext >&);
-
         // XInitialization
         virtual void SAL_CALL initialize(const css::uno::Sequence< 
css::uno::Any > & aArguments) override;
 
diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx 
b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
deleted file mode 100644
index 5023e9fcc2db..000000000000
--- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sal/config.h>
-
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include <connectiontools.hxx>
-#include <cppuhelper/factory.hxx>
-
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::XInterface;
-
-extern "C" SAL_DLLPUBLIC_EXPORT void* sdbt_component_getFactory(
-                    const char* pImplementationName, SAL_UNUSED_PARAMETER 
void*, SAL_UNUSED_PARAMETER void*)
-{
-    Reference< XInterface > xRet;
-
-    if (sdbtools::ConnectionTools::getImplementationName_static() == 
OUString::createFromAscii(pImplementationName))
-    {
-        xRet = 
::cppu::createSingleComponentFactory(sdbtools::ConnectionTools::Create,
-                    sdbtools::ConnectionTools::getImplementationName_static(),
-                    
sdbtools::ConnectionTools::getSupportedServiceNames_static(), nullptr);
-    }
-
-    if (xRet.is())
-        xRet->acquire();
-    return xRet.get();
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/shared/dbu_reghelper.cxx 
b/dbaccess/source/shared/dbu_reghelper.cxx
deleted file mode 100644
index c70793936b0b..000000000000
--- a/dbaccess/source/shared/dbu_reghelper.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <dbu_reghelper.hxx>
-
-#include <comphelper/sequence.hxx>
-
-namespace dbaui
-{
-
-    #define REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
-    #include "registrationhelper.cxx"
-    #undef REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/shared/flt_reghelper.cxx 
b/dbaccess/source/shared/flt_reghelper.cxx
deleted file mode 100644
index c41947f82537..000000000000
--- a/dbaccess/source/shared/flt_reghelper.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <flt_reghelper.hxx>
-
-#include <comphelper/sequence.hxx>
-
-namespace dbaxml
-{
-
-    #define REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
-    #include "registrationhelper.cxx"
-    #undef REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppController.cxx 
b/dbaccess/source/ui/app/AppController.cxx
index 37cb8e2cbc61..b7036d149e25 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -23,7 +23,6 @@
 #include <strings.hxx>
 #include <advancedsettingsdlg.hxx>
 #include "subcomponentmanager.hxx"
-#include <uiservices.hxx>
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/container/XChild.hpp>
@@ -95,7 +94,6 @@
 #include <osl/mutex.hxx>
 #include "AppView.hxx"
 #include <browserids.hxx>
-#include <dbu_reghelper.hxx>
 #include <strings.hrc>
 #include <defaultobjectnamecheck.hxx>
 #include <databaseobjectview.hxx>
@@ -106,9 +104,11 @@
 #include <dlgsave.hxx>
 #include <dbaccess_slotid.hrc>
 
-extern "C" void createRegistryInfo_ODBApplication()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbu_OApplicationController_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static ::dbaui::OMultiInstanceAutoRegistration< 
::dbaui::OApplicationController > aAutoRegistration;
+    return cppu::acquire(new ::dbaui::OApplicationController(context));
 }
 
 namespace dbaui
@@ -138,29 +138,13 @@ namespace DatabaseObject = 
::com::sun::star::sdb::application::DatabaseObject;
 namespace DatabaseObjectContainer = 
::com::sun::star::sdb::application::DatabaseObjectContainer;
 
 OUString SAL_CALL OApplicationController::getImplementationName()
-{
-    return getImplementationName_Static();
-}
-
-OUString OApplicationController::getImplementationName_Static()
 {
     return SERVICE_SDB_APPLICATIONCONTROLLER;
 }
 
-Sequence< OUString> OApplicationController::getSupportedServiceNames_Static()
-{
-    Sequence<OUString> aSupported { 
"com.sun.star.sdb.application.DefaultViewController" };
-    return aSupported;
-}
-
 Sequence< OUString> SAL_CALL OApplicationController::getSupportedServiceNames()
 {
-    return getSupportedServiceNames_Static();
-}
-
-Reference< XInterface > OApplicationController::Create(const 
Reference<XMultiServiceFactory >& _rxFactory)
-{
-    return *(new OApplicationController( 
comphelper::getComponentContext(_rxFactory)));
+    return { "com.sun.star.sdb.application.DefaultViewController" };
 }
 
 namespace {
diff --git a/dbaccess/source/ui/app/AppController.hxx 
b/dbaccess/source/ui/app/AppController.hxx
index 2edda8efd485..6f7c1f658545 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -375,13 +375,6 @@ namespace dbaui
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName() override;
         virtual css::uno::Sequence< OUString> SAL_CALL 
getSupportedServiceNames() override;
-        // need by registration
-        /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static();
-        /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > 
getSupportedServiceNames_Static();
-        static css::uno::Reference< css::uno::XInterface >
-                Create(const css::uno::Reference< 
css::lang::XMultiServiceFactory >&);
 
         // css::frame::XController
         virtual void SAL_CALL attachFrame(const css::uno::Reference< 
css::frame::XFrame > & xFrame) override;
diff --git a/dbaccess/source/ui/browser/dbloader.cxx 
b/dbaccess/source/ui/browser/dbloader.cxx
index 62a3c14b13fc..4f85ca5bc2bc 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -17,9 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <dbu_reghelper.hxx>
 #include <strings.hxx>
-#include <uiservices.hxx>
 #include <UITools.hxx>
 
 #include <com/sun/star/container/XChild.hpp>
@@ -53,7 +51,6 @@ using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
 using namespace dbaui;
 
 namespace {
@@ -69,18 +66,9 @@ public:
 
     // XServiceInfo
     OUString                 SAL_CALL getImplementationName() override;
-    sal_Bool                        SAL_CALL supportsService(const OUString& 
ServiceName) override;
+    sal_Bool                 SAL_CALL supportsService(const OUString& 
ServiceName) override;
     Sequence< OUString >     SAL_CALL getSupportedServiceNames() override;
 
-    // static methods
-    static OUString          getImplementationName_Static() throw(  )
-    {
-        return "org.openoffice.comp.dbu.DBContentLoader";
-    }
-    static Sequence< OUString> getSupportedServiceNames_Static() throw(  );
-    static css::uno::Reference< css::uno::XInterface >
-            Create(const css::uno::Reference< css::lang::XMultiServiceFactory 
>&);
-
     // XLoader
     virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const 
OUString& _rURL,
                                 const Sequence< PropertyValue >& _rArgs,
@@ -96,20 +84,17 @@ DBContentLoader::DBContentLoader(const Reference< 
XComponentContext >& _rxContex
 
 }
 
-extern "C" void createRegistryInfo_DBContentLoader()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbu_DBContentLoader_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static ::dbaui::OMultiInstanceAutoRegistration< DBContentLoader > 
aAutoRegistration;
-}
-
-Reference< XInterface > DBContentLoader::Create( const Reference< 
XMultiServiceFactory >  & rSMgr )
-{
-    return *(new DBContentLoader(comphelper::getComponentContext(rSMgr)));
+    return cppu::acquire(new DBContentLoader(context));
 }
 
 // XServiceInfo
 OUString SAL_CALL DBContentLoader::getImplementationName()
 {
-    return getImplementationName_Static();
+    return "org.openoffice.comp.dbu.DBContentLoader";
 }
 
 // XServiceInfo
@@ -120,12 +105,6 @@ sal_Bool SAL_CALL DBContentLoader::supportsService(const 
OUString& ServiceName)
 
 // XServiceInfo
 Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames()
-{
-    return getSupportedServiceNames_Static();
-}
-
-// ORegistryServiceManager_Static
-Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static() throw( 
 )
 {
     return { "com.sun.star.frame.FrameLoader", 
"com.sun.star.sdb.ContentLoader" };
 }
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx 
b/dbaccess/source/ui/browser/exsrcbrw.cxx
index e468f9a5aa28..966ab8b90859 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <exsrcbrw.hxx>
-#include <uiservices.hxx>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/form/XGridColumnFactory.hpp>
 #include <com/sun/star/form/XLoadable.hpp>
@@ -26,7 +25,6 @@
 #include <formadapter.hxx>
 #include <comphelper/processfactory.hxx>
 #include <strings.hxx>
-#include <dbu_reghelper.hxx>
 #include <o3tl/any.hxx>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
@@ -43,9 +41,11 @@ using namespace ::com::sun::star::frame;
 using namespace dbaui;
 
 // SbaExternalSourceBrowser
-extern "C" void createRegistryInfo_OFormGridView()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbu_OFormGridView_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static OMultiInstanceAutoRegistration< SbaExternalSourceBrowser > 
aAutoRegistration;
+    return cppu::acquire(new SbaExternalSourceBrowser(context));
 }
 
 Any SAL_CALL SbaExternalSourceBrowser::queryInterface(const Type& _rType)
@@ -70,33 +70,16 @@ SbaExternalSourceBrowser::SbaExternalSourceBrowser(const 
Reference< css::uno::XC
 
 SbaExternalSourceBrowser::~SbaExternalSourceBrowser()
 {
-
 }
 
 css::uno::Sequence<OUString> SAL_CALL 
SbaExternalSourceBrowser::getSupportedServiceNames()
 {
-    return getSupportedServiceNames_Static();
-}
-
-OUString SbaExternalSourceBrowser::getImplementationName_Static()
-{
-    return "org.openoffice.comp.dbu.OFormGridView";
-}
-
-css::uno::Sequence<OUString> 
SbaExternalSourceBrowser::getSupportedServiceNames_Static()
-{
-    css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.FormGridView" 
};
-    return aSupported;
-}
-
-Reference< XInterface > SbaExternalSourceBrowser::Create(const 
Reference<XMultiServiceFactory >& _rxFactory)
-{
-    return *(new SbaExternalSourceBrowser( 
comphelper::getComponentContext(_rxFactory)));
+    return { "com.sun.star.sdb.FormGridView" };
 }
 
 OUString SAL_CALL SbaExternalSourceBrowser::getImplementationName()
 {
-    return getImplementationName_Static();
+    return "org.openoffice.comp.dbu.OFormGridView";
 }
 
 Reference< XRowSet >  SbaExternalSourceBrowser::CreateForm()
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx 
b/dbaccess/source/ui/browser/sbagrid.cxx
index b3f442eeb2fa..4c88ec938766 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -19,7 +19,6 @@
 
 #include <core_resource.hxx>
 #include <helpids.h>
-#include <uiservices.hxx>
 
 #include <sot/exchange.hxx>
 
@@ -52,7 +51,6 @@
 #include <browserids.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
-#include <dbu_reghelper.hxx>
 #include <dbexchange.hxx>
 #include <TableRowExchange.hxx>
 #include <TableRow.hxx>
@@ -80,39 +78,27 @@ using namespace ::dbtools;
 using namespace ::svx;
 using namespace ::svt;
 
-extern "C" void createRegistryInfo_SbaXGridControl()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+com_sun_star_comp_dbu_SbaXGridControl_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static OMultiInstanceAutoRegistration< SbaXGridControl > aAutoRegistration;
+    return cppu::acquire(new SbaXGridControl(context));
 }
 
 css::uno::Sequence<OUString> SAL_CALL 
SbaXGridControl::getSupportedServiceNames()
 {
-    return getSupportedServiceNames_Static();
+    return { "com.sun.star.form.control.InteractionGridControl", 
"com.sun.star.form.control.GridControl",
+         "com.sun.star.awt.UnoControl" };
 }
 
-Reference< XInterface > SbaXGridControl::Create(const 
Reference<XMultiServiceFactory >& _rxFactory)
-{
-    return *(new SbaXGridControl( comphelper::getComponentContext(_rxFactory) 
));
-}
 
 // SbaXGridControl
 
 OUString SAL_CALL SbaXGridControl::getImplementationName()
-{
-    return getImplementationName_Static();
-}
-
-OUString SbaXGridControl::getImplementationName_Static()
 {
     return "com.sun.star.comp.dbu.SbaXGridControl";
 }
 
-Sequence< OUString> SbaXGridControl::getSupportedServiceNames_Static()
-{
-    return { "com.sun.star.form.control.InteractionGridControl", 
"com.sun.star.form.control.GridControl",
-         "com.sun.star.awt.UnoControl" };
-}
-
 SbaXGridControl::SbaXGridControl(const Reference< XComponentContext >& _rM)
     : FmXGridControl(_rM)
 {
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx 
b/dbaccess/source/ui/browser/unodatbr.cxx
index cd0aed665a7f..43a7006fe40e 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -23,9 +23,7 @@
 #include <dbtreelistbox.hxx>
 #include "dbtreemodel.hxx"
 #include "dbtreeview.hxx"
-#include <dbu_reghelper.hxx>
 #include <strings.hrc>
-#include <uiservices.hxx>
 #include <imageprovider.hxx>
 #include <sbagrid.hxx>
 #include <strings.hxx>
@@ -46,6 +44,7 @@
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/i18n/Collator.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
@@ -127,9 +126,12 @@ using namespace ::comphelper;
 using namespace ::svx;
 
 // SbaTableQueryBrowser
-extern "C" void createRegistryInfo_OBrowser()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbu_ODatasourceBrowser_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static ::dbaui::OMultiInstanceAutoRegistration< 
::dbaui::SbaTableQueryBrowser > aAutoRegistration;
+    SolarMutexGuard aGuard;
+    return cppu::acquire(new ::dbaui::SbaTableQueryBrowser(context));
 }
 
 namespace dbaui
@@ -153,31 +155,15 @@ static void SafeRemovePropertyListener(const Reference< 
XPropertySet > & xSet, c
 }
 
 OUString SAL_CALL SbaTableQueryBrowser::getImplementationName()
-{
-    return getImplementationName_Static();
-}
-
-css::uno::Sequence<OUString> SAL_CALL 
SbaTableQueryBrowser::getSupportedServiceNames()
-{
-    return getSupportedServiceNames_Static();
-}
-
-OUString SbaTableQueryBrowser::getImplementationName_Static()
 {
     return "org.openoffice.comp.dbu.ODatasourceBrowser";
 }
 
-css::uno::Sequence<OUString> 
SbaTableQueryBrowser::getSupportedServiceNames_Static()
+css::uno::Sequence<OUString> SAL_CALL 
SbaTableQueryBrowser::getSupportedServiceNames()
 {
     return { "com.sun.star.sdb.DataSourceBrowser" };
 }
 
-Reference< XInterface > SbaTableQueryBrowser::Create(const 
Reference<XMultiServiceFactory >& _rxFactory)
-{
-    SolarMutexGuard aGuard;
-    return *(new 
SbaTableQueryBrowser(comphelper::getComponentContext(_rxFactory)));
-}
-
 SbaTableQueryBrowser::SbaTableQueryBrowser(const Reference< XComponentContext 
>& _rM)
     :SbaXDataBrowserController(_rM)
     ,m_aSelectionListeners( getMutex() )
diff --git a/dbaccess/source/ui/inc/RelationController.hxx 
b/dbaccess/source/ui/inc/RelationController.hxx
index d8901f8e91a1..b358da57541c 100644
--- a/dbaccess/source/ui/inc/RelationController.hxx
+++ b/dbaccess/source/ui/inc/RelationController.hxx
@@ -61,13 +61,6 @@ namespace dbaui
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName() override;
         virtual css::uno::Sequence< OUString> SAL_CALL 
getSupportedServiceNames() override;
-        // need by registration
-        /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static();
-        /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > 
getSupportedServiceNames_Static();
-        static css::uno::Reference< css::uno::XInterface >
-                Create(const css::uno::Reference< 
css::lang::XMultiServiceFactory >&);
 
         // OJoinController overridables
         virtual bool allowViews() const override;
diff --git a/dbaccess/source/ui/inc/TableController.hxx 
b/dbaccess/source/ui/inc/TableController.hxx
index 6e3192b6cd1a..41643d95b240 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -119,13 +119,6 @@ namespace dbaui
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName() override;
         virtual css::uno::Sequence< OUString> SAL_CALL 
getSupportedServiceNames() override;
-        // need by registration
-        /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static();
-        /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > 
getSupportedServiceNames_Static();
-        static css::uno::Reference< css::uno::XInterface >
-                Create(const css::uno::Reference< 
css::lang::XMultiServiceFactory >&);
 
     private:
         void startTableListening();
diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx 
b/dbaccess/source/ui/inc/exsrcbrw.hxx
index 12333d3ef434..6a480d7238b1 100644
--- a/dbaccess/source/ui/inc/exsrcbrw.hxx
+++ b/dbaccess/source/ui/inc/exsrcbrw.hxx
@@ -43,13 +43,6 @@ namespace dbaui
     public:
         SbaExternalSourceBrowser(const css::uno::Reference< 
css::uno::XComponentContext >& _rM);
 
-        /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static();
-        /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > 
getSupportedServiceNames_Static();
-        static css::uno::Reference< css::uno::XInterface >
-                Create(const css::uno::Reference< 
css::lang::XMultiServiceFactory >&);
-
         // UNO
         DECLARE_UNO3_DEFAULTS(SbaExternalSourceBrowser, 
SbaXDataBrowserController)
         virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& 
_rType) override;
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx 
b/dbaccess/source/ui/inc/querycontroller.hxx
index c3988baac8ae..dae1bffe9013 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -169,13 +169,6 @@ namespace dbaui
 
         virtual OUString SAL_CALL getImplementationName() override;
         virtual css::uno::Sequence< OUString> SAL_CALL 
getSupportedServiceNames() override;
-        // need by registration
-        /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static();
-        /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > 
getSupportedServiceNames_Static();
-        static css::uno::Reference< css::uno::XInterface >
-                Create(const css::uno::Reference< 
css::lang::XMultiServiceFactory >&);
 
         // XController
         virtual css::uno::Any SAL_CALL getViewData() override;
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx 
b/dbaccess/source/ui/inc/sbagrid.hxx
index 30fb9fa73112..4e6e30e3cfef 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -72,13 +72,6 @@ namespace dbaui
         // css::lang::XServiceInfo
         OUString SAL_CALL getImplementationName() override;
         virtual css::uno::Sequence<OUString> SAL_CALL 
getSupportedServiceNames() override;
-        // need by registration
-        /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static();
-        /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > 
getSupportedServiceNames_Static();
-        static css::uno::Reference< css::uno::XInterface >
-                Create(const css::uno::Reference< 
css::lang::XMultiServiceFactory >&);
 
         // css::frame::XDispatch
         virtual void SAL_CALL dispatch(const css::util::URL& aURL, const 
css::uno::Sequence< css::beans::PropertyValue >& aArgs) override;
diff --git a/dbaccess/source/ui/inc/uiservices.hxx 
b/dbaccess/source/ui/inc/uiservices.hxx
deleted file mode 100644
index da225602a0d4..000000000000
--- a/dbaccess/source/ui/inc/uiservices.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_UISERVICES_HXX
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_UISERVICES_HXX
-
-#include <sal/config.h>
-
-extern "C" {
-
-void createRegistryInfo_ComposerDialogs();
-void createRegistryInfo_CopyTableWizard();
-void createRegistryInfo_DBContentLoader();
-void createRegistryInfo_LimitBoxController();
-void createRegistryInfo_OAdvancedSettingsDialog();
-void createRegistryInfo_OBrowser();
-void createRegistryInfo_OColumnControl();
-void createRegistryInfo_OColumnControlModel();
-void createRegistryInfo_ODBApplication();
-void createRegistryInfo_ODBTypeWizDialog();
-void createRegistryInfo_ODBTypeWizDialogSetup();
-void createRegistryInfo_ODataSourcePropertyDialog();
-void createRegistryInfo_ODirectSQLDialog();
-void createRegistryInfo_OFormGridView();
-void createRegistryInfo_OInteractionHandler();
-void createRegistryInfo_OQueryControl();
-void createRegistryInfo_ORelationControl();
-void createRegistryInfo_OSQLMessageDialog();
-void createRegistryInfo_OTableControl();
-void createRegistryInfo_OTableFilterDialog();
-void createRegistryInfo_OTextConnectionSettingsDialog();
-void createRegistryInfo_OUserSettingsDialog();
-void createRegistryInfo_OViewControl();
-void createRegistryInfo_SbaXGridControl();
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx 
b/dbaccess/source/ui/inc/unodatbr.hxx
index 6ea21d08b52c..498b634f2575 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -131,14 +131,6 @@ namespace dbaui
         */
         static sal_Int32    getDatabaseObjectType( EntryType _eType );
 
-        // need by registration
-        /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static();
-        /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > 
getSupportedServiceNames_Static();
-        static css::uno::Reference< css::uno::XInterface >
-                Create(const css::uno::Reference< 
css::lang::XMultiServiceFactory >&);
-
         DECLARE_UNO3_DEFAULTS(SbaTableQueryBrowser,SbaXDataBrowserController)
         // late construction
         virtual bool Construct(vcl::Window* pParent) override;
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx 
b/dbaccess/source/ui/inc/unosqlmessage.hxx
index b4d9fd279d83..bda4cbf23b90 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -37,9 +37,9 @@ class OSQLMessageDialog final
     OUString             m_sHelpURL;
     // </properties>
 
+public:
     OSQLMessageDialog(const css::uno::Reference< css::uno::XComponentContext 
>& _rxORB);
 
-public:
     // XTypeProvider
     virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) 
override;
 
@@ -47,14 +47,6 @@ public:
     virtual OUString SAL_CALL getImplementationName() override;
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() 
override;
 
-    // XServiceInfo - static methods
-    /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-    /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static();
-    static css::uno::Reference< css::uno::XInterface >
-            Create(const css::uno::Reference< css::lang::XMultiServiceFactory 
>&);
-
     // XPropertySet
     virtual css::uno::Reference<css::beans::XPropertySetInfo>  SAL_CALL 
getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
diff --git a/dbaccess/source/ui/misc/uiservices.cxx 
b/dbaccess/source/ui/misc/uiservices.cxx
deleted file mode 100644
index 4d8a020e3631..000000000000
--- a/dbaccess/source/ui/misc/uiservices.cxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cppuhelper/factory.hxx>
-#include <dbu_reghelper.hxx>
-#include <uiservices.hxx>
-#include <mutex>
-
-using namespace ::dbaui;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-
-extern "C" {
-
-static void createRegistryInfo_DBU()
-{
-    static std::once_flag aInit;
-    std::call_once(aInit, [&]()
-    {
-        createRegistryInfo_OTableFilterDialog();
-        createRegistryInfo_ODataSourcePropertyDialog();
-        createRegistryInfo_OSQLMessageDialog();
-        createRegistryInfo_OBrowser();
-        createRegistryInfo_OFormGridView();
-        createRegistryInfo_DBContentLoader();
-        createRegistryInfo_OInteractionHandler();
-        createRegistryInfo_SbaXGridControl();
-        createRegistryInfo_OQueryControl();
-        createRegistryInfo_OViewControl();
-        createRegistryInfo_OTableControl();
-        createRegistryInfo_ORelationControl();
-        createRegistryInfo_ComposerDialogs();
-        createRegistryInfo_ODBApplication();
-        createRegistryInfo_ODirectSQLDialog();
-        createRegistryInfo_OAdvancedSettingsDialog();
-        createRegistryInfo_ODBTypeWizDialog();
-        createRegistryInfo_ODBTypeWizDialogSetup();
-        createRegistryInfo_OUserSettingsDialog();
-        createRegistryInfo_OColumnControlModel();
-        createRegistryInfo_OColumnControl();
-        createRegistryInfo_CopyTableWizard();
-        createRegistryInfo_OTextConnectionSettingsDialog();
-        createRegistryInfo_LimitBoxController();
-        return true;
-    });
-}
-
-}
-
-extern "C"  SAL_DLLPUBLIC_EXPORT void* dbu_component_getFactory(
-                    const char* pImplementationName,
-                    void* pServiceManager,
-                    void* /*pRegistryKey*/)
-{
-    createRegistryInfo_DBU();
-
-    Reference< XInterface > xRet;
-    if (pServiceManager && pImplementationName)
-    {
-        xRet = ::dbaui::OModuleRegistration::getComponentFactory(
-            OUString::createFromAscii(pImplementationName),
-            static_cast< XMultiServiceFactory* >(pServiceManager));
-    }
-
-    if (xRet.is())
-        xRet->acquire();
-    return xRet.get();
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx 
b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 47aa5c98c7e3..74d01b71134c 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -9,7 +9,6 @@
 
 #include "limitboxcontroller.hxx"
 #include <apitools.hxx>
-#include <uiservices.hxx>
 
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
@@ -25,7 +24,6 @@
 #include <comphelper/processfactory.hxx>
 
 #include <core_resource.hxx>
-#include <dbu_reghelper.hxx>
 #include <strings.hrc>
 
 using namespace ::com::sun::star;
@@ -218,14 +216,16 @@ void SAL_CALL LimitBoxController::release() throw ()
 
 
 /// XServiceInfo
-IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(LimitBoxController, 
"org.libreoffice.comp.dbu.LimitBoxController")
+OUString SAL_CALL LimitBoxController::getImplementationName()
+{
+    return "org.libreoffice.comp.dbu.LimitBoxController";
+}
+
 IMPLEMENT_SERVICE_INFO_SUPPORTS(LimitBoxController)
-IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(LimitBoxController, 
"com.sun.star.frame.ToolbarController")
 
-uno::Reference< uno::XInterface >
-    LimitBoxController::Create(const uno::Reference< 
css::lang::XMultiServiceFactory >& _rxORB)
+css::uno::Sequence< OUString > SAL_CALL 
LimitBoxController::getSupportedServiceNames()
 {
-    return static_cast< XServiceInfo* >(new LimitBoxController( 
comphelper::getComponentContext(_rxORB) ));
+    return { "com.sun.star.frame.ToolbarController" };
 }
 
 /// XComponent
@@ -313,9 +313,11 @@ void LimitBoxController::dispatchCommand(
 
 } // dbaui namespace
 
-extern "C" void createRegistryInfo_LimitBoxController()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_libreoffice_comp_dbu_LimitBoxController_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static ::dbaui::OMultiInstanceAutoRegistration< 
::dbaui::LimitBoxController > aAutoRegistration;
+    return cppu::acquire(new ::dbaui::LimitBoxController(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx 
b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
index cf37276254e1..9899c3bb7855 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
@@ -42,12 +42,6 @@ class LimitBoxController: public svt::ToolboxController,
 
         /// XServiceInfo
         DECLARE_SERVICE_INFO();
-        /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static(  );
-        /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static( 
 );
-        static css::uno::Reference< css::uno::XInterface >
-        Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         /// XComponent
         virtual void SAL_CALL dispose() override;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx 
b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 2a99356757ad..17c8f1933354 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -22,11 +22,9 @@
 #include <strings.hrc>
 #include <strings.hxx>
 #include <query.hrc>
-#include <dbu_reghelper.hxx>
 #include <stringconstants.hxx>
 #include <defaultobjectnamecheck.hxx>
 #include <dlgsave.hxx>
-#include <uiservices.hxx>
 #include <querycontainerwindow.hxx>
 #include <querycontroller.hxx>
 #include <QueryDesignView.hxx>
@@ -40,6 +38,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
@@ -73,9 +72,11 @@
 #include <memory>
 #include <vector>
 
-extern "C" void createRegistryInfo_OQueryControl()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbu_OQueryDesign_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OQueryController 
> aAutoRegistration;
+    return cppu::acquire(new ::dbaui::OQueryController(context));
 }
 
 namespace dbaui
@@ -92,40 +93,25 @@ namespace dbaui
     {
         virtual OUString SAL_CALL getImplementationName() override
         {
-            return getImplementationName_Static();
+            return "org.openoffice.comp.dbu.OViewDesign";
         }
         virtual Sequence< OUString> SAL_CALL getSupportedServiceNames() 
override
         {
-            return getSupportedServiceNames_Static();
+            return { "com.sun.star.sdb.ViewDesign" };
         }
 
     public:
         explicit OViewController(const Reference< XComponentContext >& _rM) : 
OQueryController(_rM){}
-
-        // need by registration
-        /// @throws RuntimeException
-        static OUString getImplementationName_Static()
-        {
-            return "org.openoffice.comp.dbu.OViewDesign";
-        }
-        /// @throws RuntimeException
-        static Sequence< OUString > getSupportedServiceNames_Static()
-        {
-            Sequence<OUString> aSupported { "com.sun.star.sdb.ViewDesign" };
-            return aSupported;
-        }
-        static Reference< XInterface > Create(const Reference< 
XMultiServiceFactory >& _rM)
-        {
-            return *(new 
OViewController(comphelper::getComponentContext(_rM)));
-        }
     };
 
     }
 }
 
-extern "C" void createRegistryInfo_OViewControl()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbu_OViewDesign_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OViewController > 
aAutoRegistration;
+    return cppu::acquire(new ::dbaui::OViewController(context));
 }
 
 namespace dbaui
@@ -202,29 +188,13 @@ namespace
 }
 
 OUString SAL_CALL OQueryController::getImplementationName()
-{
-    return getImplementationName_Static();
-}
-
-OUString OQueryController::getImplementationName_Static()
 {
     return "org.openoffice.comp.dbu.OQueryDesign";
 }
 
-Sequence< OUString> OQueryController::getSupportedServiceNames_Static()
-{
-    Sequence<OUString> aSupported { "com.sun.star.sdb.QueryDesign" };
-    return aSupported;
-}
-
 Sequence< OUString> SAL_CALL OQueryController::getSupportedServiceNames()
 {
-    return getSupportedServiceNames_Static();
-}
-
-Reference< XInterface > OQueryController::Create(const 
Reference<XMultiServiceFactory >& _rxFactory)
-{
-    return *(new 
OQueryController(comphelper::getComponentContext(_rxFactory)));
+    return { "com.sun.star.sdb.QueryDesign" };
 }
 
 OQueryController::OQueryController(const Reference< XComponentContext >& _rM)
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx 
b/dbaccess/source/ui/relationdesign/RelationController.cxx
index a5229aebf230..d6181459ca6f 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -22,8 +22,6 @@
 #include <iterator>
 #include <map>
 
-#include <dbu_reghelper.hxx>
-#include <uiservices.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <vcl/svapp.hxx>
@@ -54,9 +52,11 @@
 
 #define MAX_THREADS 10
 
-extern "C" void createRegistryInfo_ORelationControl()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbu_ORelationDesign_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static ::dbaui::OMultiInstanceAutoRegistration< 
::dbaui::ORelationController > aAutoRegistration;
+    return cppu::acquire(new ::dbaui::ORelationController(context));
 }
 
 using namespace ::com::sun::star::uno;
@@ -76,29 +76,13 @@ using namespace ::comphelper;
 using namespace ::osl;
 
 OUString SAL_CALL ORelationController::getImplementationName()
-{
-    return getImplementationName_Static();
-}
-
-OUString ORelationController::getImplementationName_Static()
 {
     return "org.openoffice.comp.dbu.ORelationDesign";
 }
 
-Sequence< OUString> ORelationController::getSupportedServiceNames_Static()
-{
-    Sequence<OUString> aSupported { "com.sun.star.sdb.RelationDesign" };
-    return aSupported;
-}
-
 Sequence< OUString> SAL_CALL ORelationController::getSupportedServiceNames()
 {
-    return getSupportedServiceNames_Static();
-}
-
-Reference< XInterface > ORelationController::Create(const 
Reference<XMultiServiceFactory >& _rxFactory)
-{
-    return *(new 
ORelationController(comphelper::getComponentContext(_rxFactory)));
+    return { "com.sun.star.sdb.RelationDesign" };
 }
 
 ORelationController::ORelationController(const Reference< XComponentContext >& 
_rM)
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx 
b/dbaccess/source/ui/tabledesign/TableController.cxx
index 670fc6ef5bdb..da86fb9c1393 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -26,14 +26,12 @@
 #include <UITools.hxx>
 #include <browserids.hxx>
 #include <core_resource.hxx>
-#include <dbu_reghelper.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <defaultobjectnamecheck.hxx>
 #include <dlgsave.hxx>
 #include <indexdialog.hxx>
 #include <sqlmessage.hxx>
-#include <uiservices.hxx>
 
 #include <com/sun/star/frame/XTitleChangeListener.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
@@ -60,9 +58,11 @@
 #include <algorithm>
 #include <functional>
 
-extern "C" void createRegistryInfo_OTableControl()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbu_OTableDesign_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OTableController 
> aAutoRegistration;
+    return cppu::acquire(new ::dbaui::OTableController(context));
 }
 
 using namespace ::com::sun::star;
@@ -99,30 +99,15 @@ namespace
 }
 
 OUString SAL_CALL OTableController::getImplementationName()
-{
-    return getImplementationName_Static();
-}
-
-OUString OTableController::getImplementationName_Static()
 {
     return "org.openoffice.comp.dbu.OTableDesign";
 }
 
-Sequence< OUString> OTableController::getSupportedServiceNames_Static()
+Sequence< OUString> OTableController::getSupportedServiceNames()
 {
     return { "com.sun.star.sdb.TableDesign" };
 }
 
-Sequence< OUString> SAL_CALL OTableController::getSupportedServiceNames()
-{
-    return getSupportedServiceNames_Static();
-}
-
-Reference< XInterface > OTableController::Create(const 
Reference<XMultiServiceFactory >& _rxFactory)
-{
-    return *(new 
OTableController(comphelper::getComponentContext(_rxFactory)));
-}
-
 OTableController::OTableController(const Reference< XComponentContext >& _rM) 
: OTableController_BASE(_rM)
     ,m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES))
     ,m_pTypeInfo()
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx 
b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index 3debcbe3b661..a6ab43f483f7 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -19,9 +19,7 @@
 
 #include <sal/config.h>
 
-#include <uiservices.hxx>
 #include <unoadmin.hxx>
-#include <dbu_reghelper.hxx>
 #include <advancedsettingsdlg.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/proparrhlp.hxx>
@@ -42,10 +40,9 @@ namespace dbaui
             ,public ::comphelper::OPropertyArrayUsageHelper< 
OAdvancedSettingsDialog >
     {
 
-    protected:
+    public:
         explicit OAdvancedSettingsDialog(const css::uno::Reference< 
css::uno::XComponentContext >& _rxORB);
 
-    public:
         // XTypeProvider
         virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) 
override;
 
@@ -53,14 +50,6 @@ namespace dbaui
         virtual OUString SAL_CALL getImplementationName() override;
         virtual css::uno::Sequence<OUString> SAL_CALL 
getSupportedServiceNames() override;
 
-        // XServiceInfo - static methods
-        /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > 
getSupportedServiceNames_Static();
-        /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static();
-        static css::uno::Reference< css::uno::XInterface >
-                Create(const css::uno::Reference< 
css::lang::XMultiServiceFactory >&);
-
         // XPropertySet
         virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL 
getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() 
override;
@@ -83,27 +72,12 @@ namespace dbaui
         return css::uno::Sequence<sal_Int8>();
     }
 
-    Reference< XInterface > OAdvancedSettingsDialog::Create(const Reference< 
XMultiServiceFactory >& _rxFactory)
-    {
-        return *(new OAdvancedSettingsDialog( 
comphelper::getComponentContext(_rxFactory) ));
-    }
-
     OUString SAL_CALL OAdvancedSettingsDialog::getImplementationName()
-    {
-        return getImplementationName_Static();
-    }
-
-    OUString OAdvancedSettingsDialog::getImplementationName_Static()
     {
         return "org.openoffice.comp.dbu.OAdvancedSettingsDialog";
     }
 
     css::uno::Sequence<OUString> SAL_CALL 
OAdvancedSettingsDialog::getSupportedServiceNames()
-    {
-        return getSupportedServiceNames_Static();
-    }
-
-    css::uno::Sequence<OUString> 
OAdvancedSettingsDialog::getSupportedServiceNames_Static()
     {
         return { "com.sun.star.sdb.AdvancedDatabaseSettingsDialog" };
     }
@@ -134,9 +108,11 @@ namespace dbaui
 
 }   // namespace dbaui
 
-extern "C" void createRegistryInfo_OAdvancedSettingsDialog()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbu_OAdvancedSettingsDialog_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static ::dbaui::OMultiInstanceAutoRegistration< 
::dbaui::OAdvancedSettingsDialog > aAutoRegistration;
+    return cppu::acquire(new ::dbaui::OAdvancedSettingsDialog(context));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx 
b/dbaccess/source/ui/uno/ColumnControl.cxx
index 03c2c80bfe7b..781fdd351d74 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -19,15 +19,15 @@
 
 #include "ColumnControl.hxx"
 #include "ColumnPeer.hxx"
-#include <uiservices.hxx>
 #include <apitools.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
-#include <dbu_reghelper.hxx>
 #include <comphelper/processfactory.hxx>
 
-extern "C" void createRegistryInfo_OColumnControl()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+com_sun_star_comp_dbu_OColumnControl_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OColumnControl> 
aAutoRegistration;
+    return cppu::acquire(new ::dbaui::OColumnControl(context));
 }
 
 namespace dbaui
@@ -43,13 +43,14 @@ OColumnControl::OColumnControl(const 
Reference<XComponentContext>& rxContext)
 {
 }
 
-IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(OColumnControl, SERVICE_CONTROLDEFAULT)
+OUString SAL_CALL OColumnControl::getImplementationName()
+{
+        return SERVICE_CONTROLDEFAULT;
+}
 IMPLEMENT_SERVICE_INFO_SUPPORTS(OColumnControl)
-IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(OColumnControl, 
"com.sun.star.awt.UnoControl","com.sun.star.sdb.ColumnDescriptorControl")
-
-Reference< XInterface > OColumnControl::Create(const Reference< 
XMultiServiceFactory >& _rxORB)
+css::uno::Sequence< OUString > SAL_CALL 
OColumnControl::getSupportedServiceNames()
 {
-    return static_cast< XServiceInfo* >(new 
OColumnControl(comphelper::getComponentContext(_rxORB)));
+    return { 
"com.sun.star.awt.UnoControl","com.sun.star.sdb.ColumnDescriptorControl" };
 }
 
 OUString OColumnControl::GetComponentServiceName()
diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx 
b/dbaccess/source/ui/uno/ColumnControl.hxx
index 1d69e1ea2903..2b290cda9c78 100644
--- a/dbaccess/source/ui/uno/ColumnControl.hxx
+++ b/dbaccess/source/ui/uno/ColumnControl.hxx
@@ -39,12 +39,6 @@ namespace dbaui
 
         // XServiceInfo
         DECLARE_SERVICE_INFO();
-        /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static(  );
-        /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static( 
 );
-        static css::uno::Reference< css::uno::XInterface >
-        Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // css::awt::XControl
         virtual void SAL_CALL createPeer(const css::uno::Reference< 
css::awt::XToolkit >& _rToolkit, const css::uno::Reference< 
css::awt::XWindowPeer >& Parent) override;
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx 
b/dbaccess/source/ui/uno/ColumnModel.cxx
index b56fdcfbbcbd..cadc33075c9a 100644
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@@ -18,15 +18,15 @@
  */
 
 #include "ColumnModel.hxx"
-#include <uiservices.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <stringconstants.hxx>
-#include <dbu_reghelper.hxx>
 
-extern "C" void createRegistryInfo_OColumnControlModel()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+com_sun_star_comp_dbu_OColumnControlModel_get_implementation(
+    css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const& )
 {
-    static ::dbaui::OMultiInstanceAutoRegistration< 
::dbaui::OColumnControlModel> aAutoRegistration;
+    return cppu::acquire(new ::dbaui::OColumnControlModel());
 }
 
 namespace dbaui
@@ -106,13 +106,14 @@ css::uno::Sequence<sal_Int8> 
OColumnControlModel::getImplementationId()
 
 
IMPLEMENT_GETTYPES2(OColumnControlModel,OColumnControlModel_BASE,comphelper::OPropertyContainer)
 IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OColumnControlModel)
-IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(OColumnControlModel, 
"com.sun.star.comp.dbu.OColumnControlModel")
+OUString SAL_CALL OColumnControlModel::getImplementationName()
+{
+    return "com.sun.star.comp.dbu.OColumnControlModel";
+}
 IMPLEMENT_SERVICE_INFO_SUPPORTS(OColumnControlModel)
-IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(OColumnControlModel, 
"com.sun.star.awt.UnoControlModel","com.sun.star.sdb.ColumnDescriptorControlModel")
-css::uno::Reference< css::uno::XInterface >
-    OColumnControlModel::Create(const css::uno::Reference< 
css::lang::XMultiServiceFactory >& )
+css::uno::Sequence< OUString > SAL_CALL 
OColumnControlModel::getSupportedServiceNames()
 {
-    return static_cast< XServiceInfo* >(new OColumnControlModel());
+    return { 
"com.sun.star.awt.UnoControlModel","com.sun.star.sdb.ColumnDescriptorControlModel"
 };
 }
 IMPLEMENT_FORWARD_REFCOUNT( OColumnControlModel, OColumnControlModel_BASE )
 Any SAL_CALL OColumnControlModel::queryInterface( const Type& _rType )
diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx 
b/dbaccess/source/ui/uno/ColumnModel.hxx
index f89b26e91588..0cbdbd1b33f6 100644
--- a/dbaccess/source/ui/uno/ColumnModel.hxx
+++ b/dbaccess/source/ui/uno/ColumnModel.hxx
@@ -73,12 +73,6 @@ public:
 
 // css::lang::XServiceInfo
     DECLARE_SERVICE_INFO();
-    /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static(  );
-    /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
-    static css::uno::Reference< css::uno::XInterface >
-    Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override;
     virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() 
override;
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx 
b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
index 4906d080b8f6..3d07cd48d993 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <dbu_reghelper.hxx>
-#include <uiservices.hxx>
 #include "DBTypeWizDlg.hxx"
 #include <dbwiz.hxx>
 #include <comphelper/processfactory.hxx>
@@ -26,9 +24,11 @@
 
 using namespace dbaui;
 
-extern "C" void createRegistryInfo_ODBTypeWizDialog()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbu_ODBTypeWizDialog_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static OMultiInstanceAutoRegistration< ODBTypeWizDialog > 
aAutoRegistration;
+    return cppu::acquire(new ODBTypeWizDialog(context));
 }
 
 namespace dbaui
@@ -48,27 +48,12 @@ Sequence<sal_Int8> SAL_CALL 
ODBTypeWizDialog::getImplementationId(  )
     return css::uno::Sequence<sal_Int8>();
 }
 
-Reference< XInterface > ODBTypeWizDialog::Create(const Reference< 
XMultiServiceFactory >& _rxFactory)
-{
-    return *(new ODBTypeWizDialog( comphelper::getComponentContext(_rxFactory) 
));
-}
-
 OUString SAL_CALL ODBTypeWizDialog::getImplementationName()
-{
-    return getImplementationName_Static();
-}
-
-OUString ODBTypeWizDialog::getImplementationName_Static()
 {
     return "org.openoffice.comp.dbu.ODBTypeWizDialog";
 }
 
 css::uno::Sequence<OUString> SAL_CALL 
ODBTypeWizDialog::getSupportedServiceNames()
-{
-    return getSupportedServiceNames_Static();
-}
-
-css::uno::Sequence<OUString> 
ODBTypeWizDialog::getSupportedServiceNames_Static()
 {
     return { "com.sun.star.sdb.DataSourceTypeChangeDialog" };
 }
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx 
b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
index 1d134421f5b2..95f34bcbbd38 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
@@ -30,10 +30,10 @@ class ODBTypeWizDialog final
         :public ODatabaseAdministrationDialog
         ,public ::comphelper::OPropertyArrayUsageHelper< ODBTypeWizDialog >
 {
+public:
 
     explicit ODBTypeWizDialog(const css::uno::Reference< 
css::uno::XComponentContext >& _rxORB);
 
-public:
     // XTypeProvider
     virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) 
override;
 
@@ -41,14 +41,6 @@ public:
     virtual OUString SAL_CALL getImplementationName() override;
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() 
override;
 
-    // XServiceInfo - static methods
-    /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-    /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static();
-    static css::uno::Reference< css::uno::XInterface >
-            Create(const css::uno::Reference< css::lang::XMultiServiceFactory 
>&);
-
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL 
getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx 
b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index ebf4f0964b66..1408e4f0046f 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <dbu_reghelper.hxx>
-#include <uiservices.hxx>
 #include "DBTypeWizDlgSetup.hxx"
 #include <dbwizsetup.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -28,9 +26,11 @@
 
 using namespace dbaui;
 
-extern "C" void createRegistryInfo_ODBTypeWizDialogSetup()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbu_ODBTypeWizDialogSetup_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static OMultiInstanceAutoRegistration< ODBTypeWizDialogSetup > 
aAutoRegistration;
+    return cppu::acquire(new ODBTypeWizDialogSetup(context));
 }
 
 namespace dbaui
@@ -58,31 +58,14 @@ Sequence<sal_Int8> SAL_CALL 
ODBTypeWizDialogSetup::getImplementationId(  )
     return css::uno::Sequence<sal_Int8>();
 }
 
-Reference< XInterface > ODBTypeWizDialogSetup::Create(const Reference< 
XMultiServiceFactory >& _rxFactory)
-{
-    Reference < XInterface > xDBWizard = *(new ODBTypeWizDialogSetup( 
comphelper::getComponentContext(_rxFactory) ));
-    return xDBWizard;
-}
-
 OUString SAL_CALL ODBTypeWizDialogSetup::getImplementationName()
-{
-    return getImplementationName_Static();
-}
-
-OUString ODBTypeWizDialogSetup::getImplementationName_Static()
 {
     return "org.openoffice.comp.dbu.ODBTypeWizDialogSetup";
 }
 
 css::uno::Sequence<OUString> SAL_CALL 
ODBTypeWizDialogSetup::getSupportedServiceNames()
 {
-    return getSupportedServiceNames_Static();
-}
-
-css::uno::Sequence<OUString> 
ODBTypeWizDialogSetup::getSupportedServiceNames_Static()
-{
-    css::uno::Sequence<OUString> aSupported { 
"com.sun.star.sdb.DatabaseWizardDialog" };
-    return aSupported;
+    return { "com.sun.star.sdb.DatabaseWizardDialog" };
 }
 
 Reference<XPropertySetInfo>  SAL_CALL 
ODBTypeWizDialogSetup::getPropertySetInfo()
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx 
b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index 65a25b5f09c1..a532974550f1 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -33,9 +33,9 @@ class ODBTypeWizDialogSetup final
     bool        m_bOpenDatabase;
     bool        m_bStartTableWizard;
 
+public:
     explicit ODBTypeWizDialogSetup(const css::uno::Reference< 
css::uno::XComponentContext >& _rxORB);
 
-public:
     // XTypeProvider
     virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) 
override;
 
@@ -43,14 +43,6 @@ public:
     virtual OUString SAL_CALL getImplementationName() override;
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() 
override;
 
-    // XServiceInfo - static methods
-    /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-    /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static();
-    static css::uno::Reference< css::uno::XInterface >
-            Create(const css::uno::Reference< css::lang::XMultiServiceFactory 
>&);
-
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL 
getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx 
b/dbaccess/source/ui/uno/TableFilterDlg.cxx
index 17fb72660695..7d3a5a61a274 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.cxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <dbu_reghelper.hxx>
-#include <uiservices.hxx>
 #include "TableFilterDlg.hxx"
 #include <TablesSingleDlg.hxx>
 #include <comphelper/processfactory.hxx>
@@ -26,9 +24,11 @@
 
 using namespace dbaui;
 
-extern "C" void createRegistryInfo_OTableFilterDialog()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbu_OTableFilterDialog_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static OMultiInstanceAutoRegistration< OTableFilterDialog > 
aAutoRegistration;
+    return cppu::acquire(new OTableFilterDialog(context));
 }
 
 namespace dbaui
@@ -48,27 +48,12 @@ Sequence<sal_Int8> SAL_CALL 
OTableFilterDialog::getImplementationId(  )
     return css::uno::Sequence<sal_Int8>();
 }
 
-Reference< XInterface > OTableFilterDialog::Create(const Reference< 
XMultiServiceFactory >& _rxFactory)
-{
-    return *(new OTableFilterDialog( 
comphelper::getComponentContext(_rxFactory) ));
-}
-
 OUString SAL_CALL OTableFilterDialog::getImplementationName()
-{
-    return getImplementationName_Static();
-}
-
-OUString OTableFilterDialog::getImplementationName_Static()
 {
     return "org.openoffice.comp.dbu.OTableFilterDialog";
 }
 
 css::uno::Sequence<OUString> SAL_CALL 
OTableFilterDialog::getSupportedServiceNames()
-{
-    return getSupportedServiceNames_Static();
-}
-
-css::uno::Sequence<OUString> 
OTableFilterDialog::getSupportedServiceNames_Static()
 {
     return { "com.sun.star.sdb.TableFilterDialog" };
 }
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx 
b/dbaccess/source/ui/uno/TableFilterDlg.hxx
index 6e80a1d5c16a..558ee5175a47 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.hxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx
@@ -32,9 +32,9 @@ class OTableFilterDialog final
         ,public ::comphelper::OPropertyArrayUsageHelper< OTableFilterDialog >
 {
 
+public:
     explicit OTableFilterDialog(const css::uno::Reference< 
css::uno::XComponentContext >& _rxORB);
 
-public:
     // XTypeProvider
     virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) 
override;
 
@@ -42,14 +42,6 @@ public:
     virtual OUString SAL_CALL getImplementationName() override;
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() 
override;
 
-    // XServiceInfo - static methods
-    /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-    /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static();
-    static css::uno::Reference< css::uno::XInterface >
-            Create(const css::uno::Reference< css::lang::XMultiServiceFactory 
>&);
-
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL 
getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx 
b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index 88ab03961f8c..8000add8def5 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <dbu_reghelper.hxx>
-#include <uiservices.hxx>
 #include "UserSettingsDlg.hxx"
 #include <UserAdminDlg.hxx>
 #include <comphelper/processfactory.hxx>
@@ -26,9 +24,11 @@
 
 using namespace dbaui;
 
-extern "C" void createRegistryInfo_OUserSettingsDialog()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+org_openoffice_comp_dbu_OUserSettingsDialog_get_implementation(
+    css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> 
const& )
 {
-    static OMultiInstanceAutoRegistration< OUserSettingsDialog > 
aAutoRegistration;
+    return cppu::acquire(new OUserSettingsDialog(context));
 }
 
 namespace dbaui
@@ -48,27 +48,12 @@ Sequence<sal_Int8> SAL_CALL 
OUserSettingsDialog::getImplementationId(  )
     return css::uno::Sequence<sal_Int8>();
 }
 
-Reference< XInterface > OUserSettingsDialog::Create(const Reference< 
XMultiServiceFactory >& _rxFactory)
-{
-    return *(new OUserSettingsDialog( 
comphelper::getComponentContext(_rxFactory) ));
-}
-
 OUString SAL_CALL OUserSettingsDialog::getImplementationName()
-{
-    return getImplementationName_Static();
-}
-
-OUString OUserSettingsDialog::getImplementationName_Static()
 {
     return "org.openoffice.comp.dbu.OUserSettingsDialog";
 }
 
 css::uno::Sequence<OUString> SAL_CALL 
OUserSettingsDialog::getSupportedServiceNames()
-{
-    return getSupportedServiceNames_Static();
-}
-
-css::uno::Sequence<OUString> 
OUserSettingsDialog::getSupportedServiceNames_Static()
 {
     return { "com.sun.star.sdb.UserAdministrationDialog" };
 }
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx 
b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
index e70a57f60152..c29e9cf26a43 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
@@ -32,9 +32,9 @@ class OUserSettingsDialog final
         ,public ::comphelper::OPropertyArrayUsageHelper< OUserSettingsDialog >
 {
 
+public:
     explicit OUserSettingsDialog(const css::uno::Reference< 
css::uno::XComponentContext >& _rxORB);
 
-public:
     // XTypeProvider
     virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) 
override;
 
@@ -42,14 +42,6 @@ public:
     virtual OUString SAL_CALL getImplementationName() override;

... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to