diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-03-22 15:01:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-03-23 09:46:53 +0100 |
| commit | 0748309838345f459e6812538294a2c56f6f5dd5 (patch) | |
| tree | 875af3ec8433681736d657b3a07d993ff97cdbc6 /dbaccess | |
| parent | 6472f8444717f0567c69ab62b93c7437d02b0226 (diff) | |
use single-use attribute for DataAccessDescriptorFactory
instead of rtl::Instance, which means it will get
cleaned up when UNO shuts down
Change-Id: Ibda8720952169c79c2456c0233b23223e85a3301
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112933
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx | 14 | ||||
| -rw-r--r-- | dbaccess/util/dba.component | 3 |
2 files changed, 3 insertions, 14 deletions
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx index d35d6ac00e55..e66af7fb4036 100644 --- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx +++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx @@ -236,18 +236,6 @@ namespace return new DataAccessDescriptor(); } -struct Instance { - explicit Instance(): - instance(new DataAccessDescriptorFactory()) - {} - - rtl::Reference<cppu::OWeakObject> instance; -}; - -struct Singleton: - public rtl::Static<Instance, Singleton> -{}; - } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * @@ -255,7 +243,7 @@ com_sun_star_comp_dba_DataAccessDescriptorFactory( css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { - return cppu::acquire(Singleton::get().instance.get()); + return cppu::acquire(new DataAccessDescriptorFactory()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/util/dba.component b/dbaccess/util/dba.component index 7fcf892bb489..e41165bf12dd 100644 --- a/dbaccess/util/dba.component +++ b/dbaccess/util/dba.component @@ -24,7 +24,8 @@ <service name="com.sun.star.chart2.data.DatabaseDataProvider"/> </implementation> <implementation name="com.sun.star.comp.dba.DataAccessDescriptorFactory" - constructor="com_sun_star_comp_dba_DataAccessDescriptorFactory"> + constructor="com_sun_star_comp_dba_DataAccessDescriptorFactory" + single-instance="true"> <singleton name="com.sun.star.sdb.DataAccessDescriptorFactory"/> </implementation> <implementation name="com.sun.star.comp.dba.OCommandDefinition" |