Tag: cws_src680_dba201b User: fs Date: 05/07/11 06:27:09 Modified: /dba/connectivity/inc/connectivity/ FValue.hxx /dba/connectivity/source/commontools/ FValue.cxx /dba/connectivity/source/drivers/file/ FPreparedStatement.cxx, FResultSet.cxx, FStatement.cxx /dba/connectivity/source/drivers/jdbc/ Timestamp.cxx
Log: merging CWS dba201 into dba201b File Changes: Directory: /dba/connectivity/inc/connectivity/ ============================================== File [changed]: FValue.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/FValue.hxx?r1=1.10&r2=1.10.124.1 Delta lines: +16 -3 -------------------- --- FValue.hxx 1 Jun 2004 10:05:55 -0000 1.10 +++ FValue.hxx 11 Jul 2005 13:27:03 -0000 1.10.124.1 @@ -2,9 +2,9 @@ * * $RCSfile: FValue.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.124.1 $ * - * last change: $Author: obo $ $Date: 2004/06/01 10:05:55 $ + * last change: $Author: fs $ $Date: 2005/07/11 13:27:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,6 +95,9 @@ #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> #endif +#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ +#include <com/sun/star/sdbc/XRow.hpp> +#endif namespace connectivity { @@ -370,6 +373,16 @@ // only use for anys ::com::sun::star::uno::Any getAny() const { return *(::com::sun::star::uno::Any*)m_aValue.m_pValue; } ::com::sun::star::uno::Any makeAny() const; + + /** + fetches a single value out of the row + @param _nPos the current column position + @param _nType the type of the current column + @param _xRow the row where to fetch the data from + */ + void fill(sal_Int32 _nPos, + sal_Int32 _nType, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow>& _xRow); }; /// ORowSetValueDecorator decorates a ORowSetValue so the value is "refcounted" Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: FValue.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/FValue.cxx?r1=1.27&r2=1.27.46.1 Delta lines: +82 -4 -------------------- --- FValue.cxx 18 Mar 2005 09:56:41 -0000 1.27 +++ FValue.cxx 11 Jul 2005 13:27:04 -0000 1.27.46.1 @@ -2,9 +2,9 @@ * * $RCSfile: FValue.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.27.46.1 $ * - * last change: $Author: obo $ $Date: 2005/03/18 09:56:41 $ + * last change: $Author: fs $ $Date: 2005/07/11 13:27:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1787,5 +1787,83 @@ } } // ----------------------------------------------------------------------------- - +void ORowSetValue::fill(sal_Int32 _nPos, + sal_Int32 _nType, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow>& _xRow) +{ + sal_Bool bReadData = sal_True; + switch(_nType) + { + case DataType::CHAR: + case DataType::VARCHAR: + case DataType::DECIMAL: + case DataType::NUMERIC: + case DataType::LONGVARCHAR: + (*this) = _xRow->getString(_nPos); + break; + case DataType::BIGINT: + if ( isSigned() ) + (*this) = _xRow->getLong(_nPos); + else + (*this) = _xRow->getString(_nPos); + break; + case DataType::FLOAT: + (*this) = _xRow->getFloat(_nPos); + break; + case DataType::DOUBLE: + case DataType::REAL: + (*this) = _xRow->getDouble(_nPos); + break; + case DataType::DATE: + (*this) = _xRow->getDate(_nPos); + break; + case DataType::TIME: + (*this) = _xRow->getTime(_nPos); + break; + case DataType::TIMESTAMP: + (*this) = _xRow->getTimestamp(_nPos); + break; + case DataType::BINARY: + case DataType::VARBINARY: + case DataType::LONGVARBINARY: + (*this) = _xRow->getBytes(_nPos); + break; + case DataType::BIT: + case DataType::BOOLEAN: + (*this) = _xRow->getBoolean(_nPos); + break; + case DataType::TINYINT: + if ( isSigned() ) + (*this) = _xRow->getByte(_nPos); + else + (*this) = _xRow->getShort(_nPos); + break; + case DataType::SMALLINT: + if ( isSigned() ) + (*this) = _xRow->getShort(_nPos); + else + (*this) = _xRow->getInt(_nPos); + break; + case DataType::INTEGER: + if ( isSigned() ) + (*this) = _xRow->getInt(_nPos); + else + (*this) = _xRow->getLong(_nPos); + break; + case DataType::CLOB: + (*this) = ::com::sun::star::uno::makeAny(_xRow->getCharacterStream(_nPos)); + setTypeKind(DataType::CLOB); + break; + case DataType::BLOB: + (*this) = ::com::sun::star::uno::makeAny(_xRow->getBinaryStream(_nPos)); + setTypeKind(DataType::BLOB); + break; + default: + bReadData = sal_False; + break; + } + if ( bReadData && _xRow->wasNull() ) + setNull(); + setTypeKind(_nType); +} Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FPreparedStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FPreparedStatement.cxx?r1=1.34&r2=1.34.58.1 Delta lines: +9 -8 ------------------- --- FPreparedStatement.cxx 16 Feb 2005 17:25:37 -0000 1.34 +++ FPreparedStatement.cxx 11 Jul 2005 13:27:05 -0000 1.34.58.1 @@ -2,9 +2,9 @@ * * $RCSfile: FPreparedStatement.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.34.58.1 $ * - * last change: $Author: vg $ $Date: 2005/02/16 17:25:37 $ + * last change: $Author: fs $ $Date: 2005/07/11 13:27:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -141,16 +141,17 @@ { ::osl::MutexGuard aGuard(m_aMutex); + clearMyResultSet(); + OStatement_BASE2::disposing(); + if(m_pResultSet) { m_pResultSet->release(); m_pResultSet = NULL; } - clearMyResultSet(); m_xParamColumns = NULL; - OStatement_BASE2::disposing(); m_xMetaData = NULL; if(m_aParameterRow.isValid()) File [changed]: FResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FResultSet.cxx?r1=1.92&r2=1.92.58.1 Delta lines: +7 -11 -------------------- --- FResultSet.cxx 16 Feb 2005 17:25:50 -0000 1.92 +++ FResultSet.cxx 11 Jul 2005 13:27:06 -0000 1.92.58.1 @@ -2,9 +2,9 @@ * * $RCSfile: FResultSet.cxx,v $ * - * $Revision: 1.92 $ + * $Revision: 1.92.58.1 $ * - * last change: $Author: vg $ $Date: 2005/02/16 17:25:50 $ + * last change: $Author: fs $ $Date: 2005/07/11 13:27:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -229,6 +229,9 @@ m_xParamColumns = NULL; m_xColsIdx = NULL; + Reference<XComponent> xComp = m_pTable; + if ( xComp.is() ) + xComp->removeEventListener(this); if(m_pTable) { m_pTable->release(); @@ -486,14 +489,7 @@ void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) { -// { -// ::osl::MutexGuard aGuard( m_aMutex ); -// checkDisposed(OResultSet_BASE::rBHelper.bDisposed); -// -// } -// dispose(); - ::osl::MutexGuard aGuard( m_aMutex ); - clear(); + dispose(); } // ------------------------------------------------------------------------- File [changed]: FStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FStatement.cxx?r1=1.36&r2=1.36.46.1 Delta lines: +4 -3 ------------------- --- FStatement.cxx 18 Mar 2005 09:57:10 -0000 1.36 +++ FStatement.cxx 11 Jul 2005 13:27:06 -0000 1.36.46.1 @@ -2,9 +2,9 @@ * * $RCSfile: FStatement.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.36.46.1 $ * - * last change: $Author: obo $ $Date: 2005/03/18 09:57:10 $ + * last change: $Author: fs $ $Date: 2005/07/11 13:27:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -377,6 +377,7 @@ OResultSet* pResult = createResultSet(); xRS = pResult; initializeResultSet(pResult); + m_xResultSet = Reference<XResultSet>(pResult); pResult->OpenImpl(); Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: Timestamp.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/Timestamp.cxx?r1=1.11&r2=1.11.58.1 Delta lines: +4 -4 ------------------- --- Timestamp.cxx 16 Feb 2005 17:30:27 -0000 1.11 +++ Timestamp.cxx 11 Jul 2005 13:27:06 -0000 1.11.58.1 @@ -2,9 +2,9 @@ * * $RCSfile: Timestamp.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.58.1 $ * - * last change: $Author: vg $ $Date: 2005/02/16 17:30:27 $ + * last change: $Author: fs $ $Date: 2005/07/11 13:27:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -238,7 +238,7 @@ if ( _rOut.HundredthSeconds ) { sDateStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); - sDateStr += ::rtl::OUString::valueOf(_rOut.HundredthSeconds); + sDateStr += ::rtl::OUString::valueOf(static_cast<sal_Int32>(_rOut.HundredthSeconds)); } args[0].l = convertwchar_tToJavaString(t.pEnv,sDateStr); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
