User: vg Date: 05/03/10 07:18:39 Modified: /dba/connectivity/source/commontools/ dbtools.cxx
Log: INTEGRATION: CWS dba24 (1.53.18); FILE MERGED 2005/02/21 11:04:43 oj 1.53.18.2: RESYNC: (1.53-1.54); FILE MERGED 2005/02/10 12:56:28 fs 1.53.18.1: #i42407# getComposedRowSetStatement: care for forms embedded in DB documents File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: dbtools.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbtools.cxx?r1=1.54&r2=1.55 Delta lines: +3 -1 ------------------- --- dbtools.cxx 17 Feb 2005 10:14:47 -0000 1.54 +++ dbtools.cxx 10 Mar 2005 15:18:36 -0000 1.55 @@ -1208,7 +1208,9 @@ ::rtl::OUString sStatement; try { - Reference< XConnection> xConn( connectRowset( Reference< XRowSet >( _rxRowSet, UNO_QUERY ), _rxFactory, sal_True ) ); + Reference< XConnection> xConn; + if ( !isEmbeddedInDatabase( _rxRowSet, xConn ) ) + xConn = connectRowset( Reference< XRowSet >( _rxRowSet, UNO_QUERY ), _rxFactory, sal_True ); if ( xConn.is() ) // implies _rxRowSet.is() { // build the statement the row set is based on (can't use the ActiveCommand property of the set --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
