diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-08 11:06:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-08 20:26:10 +0200 |
| commit | d29a314300d523d29ed894f1822227497fcb68f8 (patch) | |
| tree | 98eaa8e88ee29a030f34610d7bd62f7a6b037a9e /dbaccess/source/ui/app/AppController.cxx | |
| parent | cf389f2c242b82417c3c746b6a68e38d637b5101 (diff) | |
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.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess/source/ui/app/AppController.cxx')
| -rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 26 |
1 files changed, 5 insertions, 21 deletions
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 @@ -139,28 +139,12 @@ namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::Database 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 { |