summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/relationdesign
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-07-08 11:06:03 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-07-08 20:26:10 +0200
commitd29a314300d523d29ed894f1822227497fcb68f8 (patch)
tree98eaa8e88ee29a030f34610d7bd62f7a6b037a9e /dbaccess/source/ui/relationdesign
parentcf389f2c242b82417c3c746b6a68e38d637b5101 (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/relationdesign')
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx26
1 files changed, 5 insertions, 21 deletions
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;
@@ -77,28 +77,12 @@ 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)