Tag: cws_src680_mingwport03 User: vg Date: 2007/01/08 12:16:12 Modified: dba/connectivity/source/drivers/ado/APreparedStatement.cxx
Log: RESYNC: (1.20-1.22); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: APreparedStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/APreparedStatement.cxx?r1=1.19.60.2&r2=1.19.60.3 Delta lines: +2 -3 ------------------- --- APreparedStatement.cxx 7 Nov 2006 12:30:53 -0000 1.19.60.2 +++ APreparedStatement.cxx 8 Jan 2007 20:16:10 -0000 1.19.60.3 @@ -101,7 +101,7 @@ sal_Int32 nParameterCount = 0; ::rtl::OUString sDefaultName = ::rtl::OUString::createFromAscii("parame"); replaceParameterNodeName(pNode,sDefaultName,nParameterCount); - pNode->parseNodeToStr(sNewSql,_pConnection->getMetaData()); + pNode->parseNodeToStr( sNewSql, _pConnection ); delete pNode; } else @@ -151,7 +151,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException) { - if(!m_xMetaData.is()) + if(!m_xMetaData.is() && m_RecordSet.IsValid()) m_xMetaData = new OResultSetMetaData(m_RecordSet); return m_xMetaData; } @@ -334,7 +334,6 @@ CHECK_RETURN(m_RecordSet.put_CacheSize(m_nFetchSize)) CHECK_RETURN(m_RecordSet.put_MaxRecords(m_nMaxRows)) CHECK_RETURN(m_RecordSet.Open(aCmd,aCon,m_eCursorType,m_eLockType,adOpenUnspecified)) - CHECK_RETURN(m_RecordSet.get_CacheSize(m_nFetchSize)) CHECK_RETURN(m_RecordSet.get_MaxRecords(m_nMaxRows)) CHECK_RETURN(m_RecordSet.get_CursorType(m_eCursorType)) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
