Tag: cws_src680_dba202a User: oj Date: 05/11/24 23:51:21 Modified: /dba/connectivity/source/drivers/ado/ ADatabaseMetaData.cxx, ADatabaseMetaDataImpl.cxx, APreparedStatement.cxx, AResultSet.cxx, AStatement.cxx, Awrapado.cxx
Log: #127363# new public method for late ctor File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: ADatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/ADatabaseMetaData.cxx?r1=1.18&r2=1.18.28.1 Delta lines: +22 -16 --------------------- --- ADatabaseMetaData.cxx 23 Sep 2005 11:37:33 -0000 1.18 +++ ADatabaseMetaData.cxx 25 Nov 2005 07:51:17 -0000 1.18.28.1 @@ -4,9 +4,9 @@ * * $RCSfile: ADatabaseMetaData.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.18.28.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 11:37:33 $ + * last change: $Author: oj $ $Date: 2005/11/25 07:51:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -974,7 +974,10 @@ OLEVariant vtEmpty; vtEmpty.setNoArg(); m_pADOConnection->OpenSchema(adSchemaDBInfoKeywords,vtEmpty,vtEmpty,&pRecordset); + OSL_ENSURE(pRecordset,"getSQLKeywords: no resultset!"); ADOS::ThrowException(*m_pADOConnection,*this); + if ( pRecordset ) + { WpADORecordset aRecordset(pRecordset); aRecordset.MoveFirst(); @@ -989,7 +992,10 @@ aRecordset.MoveNext(); } aRecordset.Close(); + if ( aRet.getLength() ) return aRet.copy(0,aRet.lastIndexOf(',')); + } + return ::rtl::OUString(); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) File [changed]: ADatabaseMetaDataImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx?r1=1.5&r2=1.5.36.1 Delta lines: +27 -24 --------------------- --- ADatabaseMetaDataImpl.cxx 8 Sep 2005 05:27:31 -0000 1.5 +++ ADatabaseMetaDataImpl.cxx 25 Nov 2005 07:51:17 -0000 1.5.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: ADatabaseMetaDataImpl.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.36.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 05:27:31 $ + * last change: $Author: oj $ $Date: 2005/11/25 07:51:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -98,7 +98,9 @@ ADOS::ThrowException(*m_pADOConnection,*this); - OSL_ENSURE(pRecordset,"getMaxSize no resultset!"); + OSL_ENSURE(pRecordset,"fillLiterals: no resultset!"); + if ( pRecordset ) + { WpADORecordset aRecordset(pRecordset); aRecordset.MoveFirst(); @@ -122,6 +124,7 @@ aRecordset.MoveNext(); } aRecordset.Close(); + } } // ------------------------------------------------------------------------- sal_Int32 ODatabaseMetaData::getMaxSize(sal_uInt32 _nId) File [changed]: APreparedStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/APreparedStatement.cxx?r1=1.17&r2=1.17.20.1 Delta lines: +7 -6 ------------------- --- APreparedStatement.cxx 24 Oct 2005 08:20:35 -0000 1.17 +++ APreparedStatement.cxx 25 Nov 2005 07:51:18 -0000 1.17.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: APreparedStatement.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.17.20.1 $ * - * last change: $Author: rt $ $Date: 2005/10/24 08:20:35 $ + * last change: $Author: oj $ $Date: 2005/11/25 07:51:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -337,10 +337,11 @@ CHECK_RETURN(m_RecordSet.get_LockType(m_eLockType)) OResultSet* pSet = new OResultSet(m_RecordSet,this); - Reference< XResultSet > pRs = pSet; - m_xResultSet = WeakReference<XResultSet>(pRs); + Reference< XResultSet > xRs = pSet; + pSet->construct(); + m_xResultSet = WeakReference<XResultSet>(xRs); - return m_xResultSet; + return xRs; } // ------------------------------------------------------------------------- File [changed]: AResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AResultSet.cxx?r1=1.19&r2=1.19.36.1 Delta lines: +3 -5 ------------------- --- AResultSet.cxx 8 Sep 2005 05:30:40 -0000 1.19 +++ AResultSet.cxx 25 Nov 2005 07:51:18 -0000 1.19.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: AResultSet.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.19.36.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 05:30:40 $ + * last change: $Author: oj $ $Date: 2005/11/25 07:51:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -135,7 +135,6 @@ ,m_pRecordSet(_pRecordSet) ,m_bEOF(sal_False) { - construct(); } // ------------------------------------------------------------------------- OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex) @@ -145,7 +144,6 @@ ,m_pRecordSet(_pRecordSet) ,m_bEOF(sal_False) { - construct(); } // ----------------------------------------------------------------------------- void OResultSet::construct() File [changed]: AStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AStatement.cxx?r1=1.21&r2=1.21.36.1 Delta lines: +7 -6 ------------------- --- AStatement.cxx 8 Sep 2005 05:31:09 -0000 1.21 +++ AStatement.cxx 25 Nov 2005 07:51:18 -0000 1.21.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: AStatement.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.21.36.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 05:31:09 $ + * last change: $Author: oj $ $Date: 2005/11/25 07:51:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -347,11 +347,12 @@ CHECK_RETURN(aSet.get_LockType(m_eLockType)) OResultSet* pSet = new OResultSet(aSet,this); - Reference< XResultSet > pRs = pSet; + Reference< XResultSet > xRs = pSet; + pSet->construct(); - m_xResultSet = WeakReference<XResultSet>(pRs); + m_xResultSet = WeakReference<XResultSet>(xRs); - return m_xResultSet; + return xRs; } // ------------------------------------------------------------------------- File [changed]: Awrapado.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/Awrapado.cxx?r1=1.16&r2=1.16.28.1 Delta lines: +8 -8 ------------------- --- Awrapado.cxx 23 Sep 2005 11:38:15 -0000 1.16 +++ Awrapado.cxx 25 Nov 2005 07:51:19 -0000 1.16.28.1 @@ -4,9 +4,9 @@ * * $RCSfile: Awrapado.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.16.28.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 11:38:15 $ + * last change: $Author: oj $ $Date: 2005/11/25 07:51:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -848,11 +848,11 @@ } - sal_Bool WpADORecordset::Move(sal_Int32 nRows, VARIANT aBmk) {return SUCCEEDED(pInterface->Move(nRows, aBmk));} - sal_Bool WpADORecordset::MoveNext() {return SUCCEEDED(pInterface->MoveNext());} - sal_Bool WpADORecordset::MovePrevious() {return SUCCEEDED(pInterface->MovePrevious());} - sal_Bool WpADORecordset::MoveFirst() {return SUCCEEDED(pInterface->MoveFirst());} - sal_Bool WpADORecordset::MoveLast() {return SUCCEEDED(pInterface->MoveLast());} + sal_Bool WpADORecordset::Move(sal_Int32 nRows, VARIANT aBmk) {return pInterface && SUCCEEDED(pInterface->Move(nRows, aBmk));} + sal_Bool WpADORecordset::MoveNext() {return pInterface && SUCCEEDED(pInterface->MoveNext());} + sal_Bool WpADORecordset::MovePrevious() {return pInterface && SUCCEEDED(pInterface->MovePrevious());} + sal_Bool WpADORecordset::MoveFirst() {return pInterface && SUCCEEDED(pInterface->MoveFirst());} + sal_Bool WpADORecordset::MoveLast() {return pInterface && SUCCEEDED(pInterface->MoveLast());} sal_Bool WpADORecordset::IsAtBOF() const { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
