User: obo Date: 05/03/18 02:12:11 Modified: /dba/dbaccess/source/ui/uno/ unoDirectSql.cxx
Log: INTEGRATION: CWS dba25 (1.2.102); FILE MERGED 2005/03/04 07:19:46 oj 1.2.102.1: #i43912# use set connection as activeconnection File Changes: Directory: /dba/dbaccess/source/ui/uno/ ======================================= File [changed]: unoDirectSql.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/unoDirectSql.cxx?r1=1.2&r2=1.3 Delta lines: +20 -14 --------------------- --- unoDirectSql.cxx 2 Aug 2004 16:24:12 -0000 1.2 +++ unoDirectSql.cxx 18 Mar 2005 10:12:08 -0000 1.3 @@ -133,7 +133,9 @@ Dialog* ODirectSQLDialog::createDialog(Window* _pParent) { // obtain all the objects needed for the dialog - Reference< XConnection > xConnection; + Reference< XConnection > xConnection = m_xActiveConnection; + if ( !xConnection.is() ) + { try { // the connection the row set is working with @@ -144,7 +146,7 @@ { OSL_ENSURE( sal_False, "ODirectSQLDialog::createDialog: caught an exception!" ); } - + } if ( !xConnection.is() ) // can't create the dialog if I have improper settings return NULL; @@ -160,6 +162,10 @@ if (0 == aProperty.Name.compareToAscii("InitialSelection")) { aProperty.Value >>= m_sInitialSelection; + } + else if (0 == aProperty.Name.compareToAscii("ActiveConnection")) + { + m_xActiveConnection.set(aProperty.Value,UNO_QUERY); } } ODirectSQLDialog_BASE::implInitialize(_rValue); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
