diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-01-28 11:27:10 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-09 08:09:27 +0100 |
| commit | 671bf2330a741b70c55b58db7ee438db5d5b858b (patch) | |
| tree | e012d45258e727b15d91be804eceaed1880dfd37 /dbaccess | |
| parent | d720330c917fe88208c11e4504e0ea02d12c4036 (diff) | |
dbaccess: use constructor feature for ORowSet
Change-Id: Iabb04fde096e8d0bb92b3d796310354df5985e9a
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/api/RowSet.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/core/inc/services.hxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/core/misc/services.cxx | 1 | ||||
| -rw-r--r-- | dbaccess/util/dba.component | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index c28763ff12a3..a1918d5bd737 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -96,9 +96,11 @@ using namespace ::com::sun::star::util; using namespace ::cppu; using namespace ::osl; -extern "C" void SAL_CALL createRegistryInfo_ORowSet() +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_dba_ORowSet_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { - static ::dba::OAutoRegistration< ORowSet > aAutoRegistration; + return cppu::acquire(new ORowSet(context)); } #define NOTIFY_LISTERNERS_CHECK(_rListeners,T,method) \ diff --git a/dbaccess/source/core/inc/services.hxx b/dbaccess/source/core/inc/services.hxx index 46673bdbd39e..d93b5057b5af 100644 --- a/dbaccess/source/core/inc/services.hxx +++ b/dbaccess/source/core/inc/services.hxx @@ -29,7 +29,6 @@ extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition(); extern "C" void SAL_CALL createRegistryInfo_OComponentDefinition(); extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument(); extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource(); -extern "C" void SAL_CALL createRegistryInfo_ORowSet(); #endif diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 232bd54819f8..81612146978d 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -60,7 +60,6 @@ extern "C" void SAL_CALL createRegistryInfo_DBA() { createRegistryInfo_OCommandDefinition(); createRegistryInfo_OComponentDefinition(); - createRegistryInfo_ORowSet(); createRegistryInfo_ODatabaseDocument(); createRegistryInfo_ODatabaseSource(); createRegistryInfo_DataAccessDescriptorFactory(); diff --git a/dbaccess/util/dba.component b/dbaccess/util/dba.component index fd688552d10e..8c85a8d30d0e 100644 --- a/dbaccess/util/dba.component +++ b/dbaccess/util/dba.component @@ -43,7 +43,8 @@ <service name="com.sun.star.sdb.DataSource"/> <service name="com.sun.star.sdb.DocumentDataSource"/> </implementation> - <implementation name="com.sun.star.comp.dba.ORowSet"> + <implementation name="com.sun.star.comp.dba.ORowSet" + constructor="com_sun_star_comp_dba_ORowSet_get_implementation"> <service name="com.sun.star.sdb.ResultSet"/> <service name="com.sun.star.sdb.RowSet"/> <service name="com.sun.star.sdbc.ResultSet"/> |