diff options
| author | Noel Grandin <noel@peralex.com> | 2013-01-16 15:16:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-11 08:02:10 +0200 |
| commit | 9a36294079a13d713490ed754be441d9dbc214ce (patch) | |
| tree | 6bd7c23e2cdfba1d03dedf689646e67bae0cca54 /connectivity/source/drivers/jdbc/JConnection.cxx | |
| parent | 7841fd1536e018defaf9cbeb283cb82b687f95e1 (diff) | |
fdo#46808, Adapt java::JavaVirtualMachine UNO service to new style
Change-Id: Ib0329b9cdc4290ce98c4182e8466c1b44b408341
Diffstat (limited to 'connectivity/source/drivers/jdbc/JConnection.cxx')
| -rw-r--r-- | connectivity/source/drivers/jdbc/JConnection.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index 3ef5f0c60361..4eb02fc13cf5 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -257,8 +257,9 @@ IMPLEMENT_SERVICE_INFO(java_sql_Connection,"com.sun.star.sdbcx.JConnection","com jclass java_sql_Connection::theClass = 0; java_sql_Connection::java_sql_Connection( const java_sql_Driver& _rDriver ) - :java_lang_Object( _rDriver.getContext().getLegacyServiceFactory() ) + :java_lang_Object() ,OSubComponent<java_sql_Connection, java_sql_Connection_BASE>((::cppu::OWeakObject*)(&_rDriver), this) + ,m_xContext( _rDriver.getContext().getUNOContext() ) ,m_pDriver( &_rDriver ) ,m_pDriverobject(NULL) ,m_pDriverClassLoader() @@ -772,7 +773,7 @@ sal_Bool java_sql_Connection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info) { { // initialize the java vm - ::rtl::Reference< jvmaccess::VirtualMachine > xTest = java_lang_Object::getVM(getORB()); + ::rtl::Reference< jvmaccess::VirtualMachine > xTest = java_lang_Object::getVM(m_xContext); if ( !xTest.is() ) throwGenericSQLException(STR_NO_JAVA,*this); } |