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/tabledesign/TableController.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/tabledesign/TableController.cxx')
| -rw-r--r-- | dbaccess/source/ui/tabledesign/TableController.cxx | 25 |
1 files changed, 5 insertions, 20 deletions
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; @@ -100,29 +100,14 @@ 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() |