[Libreoffice-commits] core.git: dbaccess/source offapi/com

[Noel Grandin]

 dbaccess/source/core/dataaccess/connection.cxx    |    7 +------
 offapi/com/sun/star/sdb/tools/ConnectionTools.idl |    9 ++++++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 3abe867790a1a896e30e9887546aef8b9e651b53
Author: Noel Grandin <noel at peralex.com>
Date:   Tue May 14 09:12:06 2013 +0200

    fdo#46808, fix call to sdb::tools::ConnectionTools
    
    In my previous conversion to new style I forgot to pass arguments
    into the service constructor.
    
    Change-Id: Ibbf750315b3e62869b1eb4c520808327002f2dcc

diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 72fe401..8691098 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -754,13 +754,8 @@ Reference< XNameAccess > SAL_CALL OConnection::getGroups(  ) throw(RuntimeExcept
 void OConnection::impl_loadConnectionTools_throw()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "OConnection::impl_loadConnectionTools_throw" );
-    Sequence< Any > aArguments( 1 );
-    aArguments[0] <<= NamedValue( "Connection" , makeAny( Reference< XConnection >( this ) ) );
 
-    m_xConnectionTools = css::sdb::tools::ConnectionTools::create( m_aContext );
-    assert(Reference< XInitialization >(m_xConnectionTools, UNO_QUERY).is());
-    Reference< XInitialization > xInit(m_xConnectionTools, UNO_QUERY_THROW );
-    xInit->initialize(aArguments);
+    m_xConnectionTools = css::sdb::tools::ConnectionTools::createWithConnection( m_aContext, this );
 }
 
 Reference< XTableName > SAL_CALL OConnection::createTableName(  ) throw (RuntimeException)
diff --git a/offapi/com/sun/star/sdb/tools/ConnectionTools.idl b/offapi/com/sun/star/sdb/tools/ConnectionTools.idl
index 741a469..3fc03a1 100644
--- a/offapi/com/sun/star/sdb/tools/ConnectionTools.idl
+++ b/offapi/com/sun/star/sdb/tools/ConnectionTools.idl
@@ -22,12 +22,19 @@
 
 #include <com/sun/star/sdb/tools/XConnectionTools.idl>
 
+module com {  module sun {  module star {  module sdbc {
+ published interface XConnection;
+};};};};
+
 module com {  module sun {  module star {  module sdb {  module tools {
 
 /**
      @since LibreOffice 4.1
 */
-service ConnectionTools : XConnectionTools;
+service ConnectionTools : XConnectionTools
+{
+    createWithConnection([in] com::sun::star::sdbc::XConnection Connection);
+};
 
 }; }; }; }; };