Tag: cws_src680_sb83 User: sb Date: 2008-02-01 13:25:27+0000 Modified: dba/connectivity/source/drivers/hsqldb/HDriver.cxx dba/connectivity/source/drivers/mozab/MResultSet.cxx
Log: RESYNC: (1.26-1.27); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HDriver.cxx?r1=1.24.36.2&r2=1.24.36.3 Delta lines: +2 -2 ------------------- --- HDriver.cxx 2007-12-03 14:00:01+0000 1.24.36.2 +++ HDriver.cxx 2008-02-01 13:25:04+0000 1.24.36.3 @@ -258,8 +258,8 @@ ::rtl::OUString sSystemPath; osl_getSystemPathFromFileURL( sURL.pData, &sSystemPath.pData ); sal_Int32 nIndex = sSystemPath.lastIndexOf('.'); - if ( !sURL.getLength() ) - throw SQLException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("File URL is not correct.")) + if ( !sURL.getLength() || !sSystemPath.getLength() ) + throw SQLException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The file URL is not correct.")) ,*this ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HY0000")) ,1000,Any()); Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MResultSet.cxx?r1=1.29.156.1&r2=1.29.156.2 Delta lines: +7 -11 -------------------- --- MResultSet.cxx 2008-01-10 16:54:55+0000 1.29.156.1 +++ MResultSet.cxx 2008-02-01 13:25:07+0000 1.29.156.2 @@ -1544,16 +1544,11 @@ if (m_CurrentRowCount < nMaxCardNumber) { sal_Int32 nKeyValue; - sal_Int32 nKeyPos; if ( (sal_Int32)m_pKeySet->capacity() < nMaxCardNumber ) m_pKeySet->reserve(nMaxCardNumber + 20 ); for (nKeyValue = m_CurrentRowCount+1; nKeyValue <= nMaxCardNumber; nKeyValue ++) - { - nKeyPos = m_pKeySet->size(); - m_pKeySet->insert( m_pKeySet->end(), sal_Int32() ); - (*m_pKeySet)[nKeyPos] = nKeyValue; - } + m_pKeySet->push_back( nKeyValue ); m_CurrentRowCount = nMaxCardNumber; } return sal_True; @@ -1862,9 +1857,10 @@ } // ------------------------------------------------------------------------- -void SAL_CALL OResultSet::updateNumericObject( sal_Int32 /*columnIndex*/, const Any& /*x*/, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException) { - ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateNumericObject", *this ); + if (!::dbtools::implUpdateObject(this, columnIndex, x)) + ::dbtools::throwGenericSQLException(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Error updating object")),*this); } // XResultSetUpdate --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
