diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-09 08:51:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-31 08:41:02 +0200 |
| commit | 6362ebab298549e8616c32cafd75cb3959ba7d65 (patch) | |
| tree | 51c7b449beb1d120e5ec47d83683288133c53e52 /dbaccess/util | |
| parent | ASan/UBSan build still needs VCLXEdit RTTI (diff) | |
| download | core-6362ebab298549e8616c32cafd75cb3959ba7d65.tar.gz core-6362ebab298549e8616c32cafd75cb3959ba7d65.zip | |
dbaccess: create instances with uno constructors
See tdf#74608 for motivation
Change-Id: Icbce3ef3f77a19f9174f6aa39791dcf99e51f0c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98395
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess/util')
| -rw-r--r-- | dbaccess/util/dba.component | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/dbaccess/util/dba.component b/dbaccess/util/dba.component index 90ba9e3ba7e9..83795ff82f77 100644 --- a/dbaccess/util/dba.component +++ b/dbaccess/util/dba.component @@ -18,8 +18,9 @@ --> <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" - prefix="dba" xmlns="http://openoffice.org/2010/uno-components"> - <implementation name="com.sun.star.comp.dbaccess.DatabaseDataProvider"> + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.dbaccess.DatabaseDataProvider" + constructor="com_sun_star_comp_dbaccess_DatabaseDataProvider_get_implementation"> <service name="com.sun.star.chart2.data.DatabaseDataProvider"/> </implementation> <implementation name="com.sun.star.comp.dba.DataAccessDescriptorFactory" @@ -35,7 +36,10 @@ constructor="com_sun_star_comp_dba_OComponentDefinition"> <service name="com.sun.star.sdb.TableDefinition"/> </implementation> - <implementation name="com.sun.star.comp.dba.ODatabaseContext"> + <implementation name="com.sun.star.comp.dba.ODatabaseContext" + constructor="com_sun_star_comp_dba_ODatabaseContext_get_implementation"> + <!-- fake singleton so the servicemanager calls dispose() on us so we can clean up the global --> + <singleton name="com.sun.star.comp.dba.theODatabaseContext"/> <service name="com.sun.star.sdb.DatabaseContext"/> </implementation> <implementation name="com.sun.star.comp.dba.ODatabaseDocument" |