[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - dbaccess/source dbaccess/util

[Miklos Vajna]

 dbaccess/source/core/api/RowSet.cxx    |    6 ++++--
 dbaccess/source/core/inc/services.hxx  |    1 -
 dbaccess/source/core/misc/services.cxx |    1 -
 dbaccess/util/dba.component            |    3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit ad77ced54aec5bb730a8442007c8d661ad537051
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Jan 28 11:27:10 2015 +0100

    dbaccess: use constructor feature for ORowSet
    
    Change-Id: Iabb04fde096e8d0bb92b3d796310354df5985e9a

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index c28763f..a1918d5 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 46673bd..d93b505 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 232bd54..8161214 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 fd68855..8c85a8d 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"/>