Tag: cws_dev300_dba31b User: oj Date: 2008-08-20 07:27:33+0000 Modified: dba/connectivity/source/drivers/adabas/BDriver.cxx dba/connectivity/source/drivers/adabas/BUsers.cxx dba/connectivity/source/drivers/file/FConnection.cxx dba/connectivity/source/drivers/file/FDriver.cxx dba/connectivity/source/drivers/file/fcomp.cxx dba/connectivity/source/drivers/hsqldb/HConnection.cxx dba/connectivity/source/drivers/kab/KPreparedStatement.cxx dba/connectivity/source/drivers/kab/KResultSet.cxx dba/connectivity/source/drivers/macab/MacabDriver.cxx dba/connectivity/source/drivers/macab/MacabPreparedStatement.cxx dba/connectivity/source/drivers/macab/MacabResultSet.cxx dba/connectivity/source/drivers/macab/makefile.mk dba/connectivity/source/drivers/mozab/MResultSet.cxx
Log: #i53067# localize str File Changes: Directory: /dba/connectivity/source/drivers/adabas/ =================================================== File [changed]: BDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BDriver.cxx?r1=1.24.56.1&r2=1.24.56.2 Delta lines: +9 -3 ------------------- --- BDriver.cxx 2008-08-15 08:32:44+0000 1.24.56.1 +++ BDriver.cxx 2008-08-20 07:27:28+0000 1.24.56.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: BDriver.cxx,v $ - * $Revision: 1.24.56.1 $ + * $Revision: 1.24.56.2 $ * * This file is part of OpenOffice.org. * @@ -440,7 +440,9 @@ return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } - ::dbtools::throwGenericSQLException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid URL!")) ,*this); + SharedResources aResources; + const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + ::dbtools::throwGenericSQLException(sMessage ,*this); return Sequence< DriverPropertyInfo >(); } // -------------------------------------------------------------------------------- @@ -567,7 +569,11 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { if ( ! acceptsURL(url) ) - ::dbtools::throwGenericSQLException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid URL!")) ,*this); + { + SharedResources aResources; + const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + ::dbtools::throwGenericSQLException(sMessage ,*this); + } // if ( ! acceptsURL(url) ) return getDataDefinitionByConnection(connect(url,info)); } File [changed]: BUsers.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/adabas/BUsers.cxx?r1=1.19&r2=1.19.56.1 Delta lines: +4 -3 ------------------- --- BUsers.cxx 2008-04-10 08:15:54+0000 1.19 +++ BUsers.cxx 2008-08-20 07:27:28+0000 1.19.56.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: BUsers.cxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.19.56.1 $ * * This file is part of OpenOffice.org. * @@ -39,6 +39,7 @@ #include <comphelper/types.hxx> #include "connectivity/dbexception.hxx" #include "connectivity/dbtools.hxx" +#include "resource/adabas_res.hrc" using namespace ::comphelper; using namespace connectivity; @@ -108,7 +109,7 @@ if(xRow->getString(1) == sDbaUser) { ::comphelper::disposeComponent(xStmt); - ::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("This user couldn't be deleted. Otherwise the database stays in a inconsistent state."),static_cast<XTypeProvider*>(this)); + m_pConnection->throwGenericSQLException(STR_USER_NO_DELETE,static_cast< XDrop* >( this )); } } ::comphelper::disposeComponent(xStmt); Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FConnection.cxx?r1=1.51&r2=1.51.30.1 Delta lines: +56 -46 --------------------- --- FConnection.cxx 2008-06-06 13:20:40+0000 1.51 +++ FConnection.cxx 2008-08-20 07:27:28+0000 1.51.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: FConnection.cxx,v $ - * $Revision: 1.51 $ + * $Revision: 1.51.30.1 $ * * This file is part of OpenOffice.org. * @@ -50,6 +50,7 @@ #include <connectivity/dbexception.hxx> #include <osl/thread.h> #include <osl/nlsupport.h> +#include "resource/file_res.hrc" using namespace connectivity::file; using namespace dbtools; @@ -107,6 +108,44 @@ { osl_incrementInterlockedCount( &m_refCount ); + ::rtl::OUString aExt,sDocURL; + sal_Bool bUseRelativePath = sal_False; + const PropertyValue *pIter = info.getConstArray(); + const PropertyValue *pEnd = pIter + info.getLength(); + for(;pIter != pEnd;++pIter) + { + if(0 == pIter->Name.compareToAscii("Extension")) + OSL_VERIFY( pIter->Value >>= aExt ); + else if(0 == pIter->Name.compareToAscii("CharSet")) + { + ::rtl::OUString sIanaName; + OSL_VERIFY( pIter->Value >>= sIanaName ); + + ::dbtools::OCharsetMap aLookupIanaName; + ::dbtools::OCharsetMap::const_iterator aLookup = aLookupIanaName.find(sIanaName, ::dbtools::OCharsetMap::IANA()); + if (aLookup != aLookupIanaName.end()) + m_nTextEncoding = (*aLookup).getEncoding(); + else + m_nTextEncoding = RTL_TEXTENCODING_DONTKNOW; + } + else if (0 == pIter->Name.compareToAscii("ShowDeleted")) + { + OSL_VERIFY( pIter->Value >>= m_bShowDeleted ); + } + else if (0 == pIter->Name.compareToAscii("EnableSQL92Check")) + { + pIter->Value >>= m_bCheckSQL92; + } + else if (0 == pIter->Name.compareToAscii("URL")) + { + pIter->Value >>= sDocURL; + } + else if (0 == pIter->Name.compareToAscii("UseRelativePath")) + { + pIter->Value >>= bUseRelativePath; + } + } // for(;pIter != pEnd;++pIter) + { sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); @@ -119,39 +158,16 @@ SvtPathOptions aPathOptions; aFileName = aPathOptions.SubstituteVariable(aFileName); } - aURL.SetSmartURL(aFileName); - setURL(aURL.GetMainURL(INetURLObject::NO_DECODE)); + if ( bUseRelativePath && sDocURL.getLength() ) + { + aFileName = INetURLObject::GetAbsURL(sDocURL,aFileName); } - ::rtl::OUString aExt; - const PropertyValue *pBegin = info.getConstArray(); - const PropertyValue *pEnd = pBegin + info.getLength(); - for(;pBegin != pEnd;++pBegin) - { - if(0 == pBegin->Name.compareToAscii("Extension")) - OSL_VERIFY( pBegin->Value >>= aExt ); - else if(0 == pBegin->Name.compareToAscii("CharSet")) - { - ::rtl::OUString sIanaName; - OSL_VERIFY( pBegin->Value >>= sIanaName ); + aURL.SetSmartURL(aFileName); - ::dbtools::OCharsetMap aLookupIanaName; - ::dbtools::OCharsetMap::const_iterator aLookup = aLookupIanaName.find(sIanaName, ::dbtools::OCharsetMap::IANA()); - if (aLookup != aLookupIanaName.end()) - m_nTextEncoding = (*aLookup).getEncoding(); - else - m_nTextEncoding = RTL_TEXTENCODING_DONTKNOW; - } - else if (0 == pBegin->Name.compareToAscii("ShowDeleted")) - { - OSL_VERIFY( pBegin->Value >>= m_bShowDeleted ); - } - else if (0 == pBegin->Name.compareToAscii("EnableSQL92Check")) - { - pBegin->Value >>= m_bCheckSQL92; + setURL(aURL.GetMainURL(INetURLObject::NO_DECODE)); } - } // for(;pBegin != pEnd;++pBegin) if ( m_nTextEncoding == RTL_TEXTENCODING_DONTKNOW ) { @@ -443,22 +459,16 @@ void OConnection::throwUrlNotValid(const ::rtl::OUString & _rsUrl,const ::rtl::OUString & _rsMessage) { SQLException aError; - aError.Message = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to create a content for the URL given.")); + aError.Message = getResources().getResourceStringWithSubstitution( + STR_NO_VALID_FILE_URL, + "$URL$", _rsUrl + ); + aError.SQLState = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")); aError.ErrorCode = 0; aError.Context = static_cast< XConnection* >(this); - SQLException aUrlError; - if(_rsUrl.getLength()) - { - aUrlError.Message = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid URL: ")); - aUrlError.Message += _rsUrl; - } - else - aUrlError.Message = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No URL supplied!")); - - aError.NextException <<= aUrlError; if (_rsMessage.getLength()) - aUrlError.NextException <<= SQLException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UCB message: ")) += _rsMessage, aError.Context, ::rtl::OUString(), 0, Any()); + aError.NextException <<= SQLException(_rsMessage, aError.Context, ::rtl::OUString(), 0, Any()); throw aError; } File [changed]: FDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FDriver.cxx?r1=1.14.56.1&r2=1.14.56.2 Delta lines: +15 -1 -------------------- --- FDriver.cxx 2008-08-15 08:32:46+0000 1.14.56.1 +++ FDriver.cxx 2008-08-20 07:27:29+0000 1.14.56.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: FDriver.cxx,v $ - * $Revision: 1.14.56.1 $ + * $Revision: 1.14.56.2 $ * * This file is part of OpenOffice.org. * @@ -167,6 +167,20 @@ ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")) ,aBoolean) ); + aDriverInfo.push_back(DriverPropertyInfo( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseRelativePath")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Handle the connection url as relative path.")) + ,sal_False + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")) + ,aBoolean) + ); + aDriverInfo.push_back(DriverPropertyInfo( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The URL of the database document which is used to create an absolute path.")) + ,sal_False + ,::rtl::OUString() + ,Sequence< ::rtl::OUString >()) + ); return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size()); } // if ( acceptsURL(url) ) { File [changed]: fcomp.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/fcomp.cxx?r1=1.30.30.1&r2=1.30.30.2 Delta lines: +2 -40 -------------------- --- fcomp.cxx 2008-08-15 08:32:46+0000 1.30.30.1 +++ fcomp.cxx 2008-08-20 07:27:29+0000 1.30.30.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fcomp.cxx,v $ - * $Revision: 1.30.30.1 $ + * $Revision: 1.30.30.2 $ * * This file is part of OpenOffice.org. * @@ -254,7 +254,7 @@ // upper, lower etc. SQL_ISRULE(pPredicateNode->getChild(2),fold)) ) { - ::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Statement too complex"),NULL); + m_pAnalyzer->getConnection()->throwGenericSQLException(STR_QUERY_TOO_COMPLEX,NULL); return NULL; } @@ -280,44 +280,6 @@ execute(pPredicateNode->getChild(2)); m_aCodeList.push_back( new OOp_COMPARE(ePredicateType) ); - // wenn es sich um eine Vergleichsoperation auf datum/Zeit handelt, dann - // erfolgt jetzt bereits eine Umwandlung fuer die Konstante -// if (pOb) -// { -// switch (pPredicateNode->getChild(2)->getNodeType()) -// { -// case SQL_NODE_STRING: -// { -// OOperandConst* pConst = PTR_CAST(OOperandConst,m_aCodeList[m_aCodeList.size() - 2]); -// switch (pOb->getDBType()) -// { -// case DataType::DECIMAL: -// case DataType::NUMERIC: -// case DataType::REAL: -// case DataType::DOUBLE: -// case DataType::TIMESTAMP: -// case DataType::DATE: -// case DataType::TIME: -// { -// try -// { -// pConst->setValue(makeAny(pConst->getValue().getDouble())); -// } -// catch( Exception&) -// { -// ::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Datatype mismatch"),NULL); -// } -// } break; -// case DataType::TINYINT: -// case DataType::SMALLINT: -// case DataType::INTEGER: -// case DataType::BIT: -// ; -// ::dbtools::throwGenericSQLException(::rtl::OUString::createFromAscii("Datatype mismatch"),NULL); -// } -// } -// } -// } return NULL; } Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HConnection.cxx?r1=1.11&r2=1.11.56.1 Delta lines: +19 -11 --------------------- --- HConnection.cxx 2008-04-10 09:13:14+0000 1.11 +++ HConnection.cxx 2008-08-20 07:27:29+0000 1.11.56.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: HConnection.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.56.1 $ * * This file is part of OpenOffice.org. * @@ -56,6 +56,9 @@ #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> +#include "resource/sharedresources.hxx" +#include "resource/hsqldb_res.hrc" + /** === begin UNO using === **/ using ::com::sun::star::util::XFlushListener; using ::com::sun::star::lang::EventObject; @@ -266,9 +269,9 @@ catch( const RuntimeException& ) { throw; } catch( const Exception& ) { - throw WrappedTargetException( ::rtl::OUString::createFromAscii( "error while obtaining the connection's table container" ), - *this, ::cppu::getCaughtException() ); - // TODO: resource + ::connectivity::SharedResources aResources; + const ::rtl::OUString sError( aResources.getResourceString(STR_NO_TABLE_CONTAINER)); + throw WrappedTargetException( sError ,*this, ::cppu::getCaughtException() ); } OSL_POSTCOND( xTables.is(), "OHsqlConnection::impl_getTableContainer_throw: post condition not met!" ); @@ -304,9 +307,9 @@ catch( const RuntimeException& ) { throw; } catch( const Exception& ) { - throw WrappedTargetException( ::rtl::OUString::createFromAscii( "error while creating the table editor dialog" ), - *this, ::cppu::getCaughtException() ); - // TODO: resource + ::connectivity::SharedResources aResources; + const ::rtl::OUString sError( aResources.getResourceString(STR_NO_TABLE_EDITOR_DIALOG)); + throw WrappedTargetException( sError ,*this, ::cppu::getCaughtException() ); } return xDialog; } @@ -329,9 +332,14 @@ } if ( !bDoesExist ) - throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "There is no table named " ) ) + _rTableName, - *this, 0 ); - // TODO: resource + { + ::connectivity::SharedResources aResources; + const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution( + STR_NO_TABLENAME, + "$tablename$", _rTableName + )); + throw IllegalArgumentException( sError,*this, 0 ); + } // if ( !bDoesExist ) } // ------------------------------------------------------------------- Directory: /dba/connectivity/source/drivers/kab/ ================================================ File [changed]: KPreparedStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KPreparedStatement.cxx?r1=1.6.56.1&r2=1.6.56.2 Delta lines: +70 -70 --------------------- --- KPreparedStatement.cxx 2008-08-15 08:32:47+0000 1.6.56.1 +++ KPreparedStatement.cxx 2008-08-20 07:27:29+0000 1.6.56.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: KPreparedStatement.cxx,v $ - * $Revision: 1.6.56.1 $ + * $Revision: 1.6.56.2 $ * * This file is part of OpenOffice.org. * @@ -51,10 +51,7 @@ m_aParameterRow = new OValueVector(); if (nParams < 1) - ::dbtools::throwSQLException( - "SQL statement parameters are numbered starting at 1.", - ::dbtools::SQL_INVALID_DESCRIPTOR_INDEX, - *(KabPreparedStatement *) this); + ::dbtools::throwInvalidIndexException(*(KabPreparedStatement *) this,Any()); if (nParams >= (sal_Int32) (*m_aParameterRow).size()) (*m_aParameterRow).resize(nParams); @@ -84,10 +81,13 @@ void KabPreparedStatement::getNextParameter(::rtl::OUString &rParameter) const throw(SQLException) { if (m_nParameterIndex >= (sal_Int32) (*m_aParameterRow).size()) - ::dbtools::throwSQLException( - "More parameters in SQL statement than set.", - ::dbtools::SQL_INVALID_DESCRIPTOR_INDEX, - *(KabPreparedStatement *) this); + { + ::connectivity::SharedResources aResources; + const ::rtl::OUString sError( aResources.getResourceString( + STR_INVALID_PARA_COUNT + ) ); + ::dbtools::throwGenericSQLException(sError,*(KabPreparedStatement *) this); + } // if (m_nParameterIndex >= (sal_Int32) (*m_aParameterRow).size()) rParameter = (*m_aParameterRow)[m_nParameterIndex]; @@ -201,66 +201,66 @@ // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setObjectNull", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setBoolean", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setByte", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setShort", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setInt", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setFloat", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setDouble", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const ::rtl::OUString &x) throw(SQLException, RuntimeException) @@ -275,103 +275,103 @@ // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setBytes", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setDate", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setTime", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setTimestamp", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setBinaryStream", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setCharacterStream", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setObject(sal_Int32, const Any&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setObject", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException) { - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); - ::osl::MutexGuard aGuard( m_aMutex ); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setObjectWithInfo", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setRef", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setBlob", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setClob", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setArray", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::clearParameters() throw(SQLException, RuntimeException) { -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("clearParameters", NULL); } // ------------------------------------------------------------------------- void KabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) File [changed]: KResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KResultSet.cxx?r1=1.9.46.1&r2=1.9.46.2 Delta lines: +18 -18 --------------------- --- KResultSet.cxx 2008-08-15 08:32:47+0000 1.9.46.1 +++ KResultSet.cxx 2008-08-20 07:27:30+0000 1.9.46.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: KResultSet.cxx,v $ - * $Revision: 1.9.46.1 $ + * $Revision: 1.9.46.2 $ * * This file is part of OpenOffice.org. * @@ -230,7 +230,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getBoolean", NULL); return sal_False; } @@ -240,7 +240,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getByte", NULL); sal_Int8 nRet = 0; return nRet; @@ -251,7 +251,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getShort", NULL); sal_Int16 nRet = 0; return nRet; @@ -262,7 +262,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getInt", NULL); sal_Int32 nRet = 0; return nRet; @@ -273,7 +273,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getLong", NULL); return sal_Int64(); } @@ -283,7 +283,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getFloat", NULL); float nVal(0); return nVal; @@ -294,7 +294,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getDouble", NULL); double nRet = 0; return nRet; @@ -305,7 +305,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("", NULL); return Sequence< sal_Int8 >(); } @@ -315,7 +315,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getDate", NULL); Date aRet; return aRet; @@ -326,7 +326,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getTime", NULL); Time nRet; return nRet; @@ -377,7 +377,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getBinaryStream", NULL); return NULL; } @@ -387,7 +387,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getCharacterStream", NULL); return NULL; } @@ -397,7 +397,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getObject", NULL); return Any(); } @@ -407,7 +407,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getRef", NULL); return NULL; } @@ -417,7 +417,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getBlob", NULL); return NULL; } @@ -427,7 +427,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getClob", NULL); return NULL; } @@ -437,7 +437,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getArray", NULL); return NULL; } Directory: /dba/connectivity/source/drivers/macab/ ================================================== File [changed]: MacabDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/macab/MacabDriver.cxx?r1=1.4&r2=1.4.56.1 Delta lines: +8 -3 ------------------- --- MacabDriver.cxx 2008-04-10 09:49:05+0000 1.4 +++ MacabDriver.cxx 2008-08-20 07:27:30+0000 1.4.56.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MacabDriver.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.56.1 $ * * This file is part of OpenOffice.org. * @@ -41,6 +41,7 @@ /** === end UNO includes === **/ #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> +#include "resource/macab_res.hrc" using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -144,7 +145,11 @@ // -------------------------------------------------------------------------------- void MacabImplModule::impl_throwNoMacOSException() { - impl_throwGenericSQLException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No suitable Mac OS installation was found." ) ) ); + ::connectivity::SharedResources aResources; + const ::rtl::OUString sError( aResources.getResourceString( + STR_NO_MAC_OS_FOUND + ) ); + impl_throwGenericSQLException( sError ); } // -------------------------------------------------------------------------------- File [changed]: MacabPreparedStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/macab/MacabPreparedStatement.cxx?r1=1.3.56.1&r2=1.3.56.2 Delta lines: +72 -70 --------------------- --- MacabPreparedStatement.cxx 2008-08-15 08:32:48+0000 1.3.56.1 +++ MacabPreparedStatement.cxx 2008-08-20 07:27:30+0000 1.3.56.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MacabPreparedStatement.cxx,v $ - * $Revision: 1.3.56.1 $ + * $Revision: 1.3.56.2 $ * * This file is part of OpenOffice.org. * @@ -35,6 +35,8 @@ #include "MacabAddressBook.hxx" #include "propertyids.hxx" #include <connectivity/dbexception.hxx> +#include "resource/macab_res.hrc" +#include "resource/sharedresources.hxx" using namespace connectivity::macab; using namespace com::sun::star::uno; @@ -50,10 +52,7 @@ m_aParameterRow = new OValueVector(); if (nParams < 1) - ::dbtools::throwSQLException( - "SQL statement parameters are numbered starting at 1.", - ::dbtools::SQL_INVALID_DESCRIPTOR_INDEX, - *(MacabPreparedStatement *) this); + ::dbtools::throwInvalidIndexException(*(MacabPreparedStatement *) this,Any()); if (nParams >= (sal_Int32) (*m_aParameterRow).size()) (*m_aParameterRow).resize(nParams); @@ -83,10 +82,13 @@ void MacabPreparedStatement::getNextParameter(::rtl::OUString &rParameter) const throw(SQLException) { if (m_nParameterIndex >= (sal_Int32) (*m_aParameterRow).size()) - ::dbtools::throwSQLException( - "More parameters in SQL statement than set.", - ::dbtools::SQL_INVALID_DESCRIPTOR_INDEX, - *(MacabPreparedStatement *) this); + { + ::connectivity::SharedResources aResources; + const ::rtl::OUString sError( aResources.getResourceString( + STR_INVALID_PARA_COUNT + ) ); + ::dbtools::throwGenericSQLException(sError,*(MacabPreparedStatement *) this); + } rParameter = (*m_aParameterRow)[m_nParameterIndex]; @@ -212,66 +214,66 @@ // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setObjectNull", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setBoolean", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setByte", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setShort", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setInt", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setLong", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setFloat", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setDouble", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const ::rtl::OUString &x) throw(SQLException, RuntimeException) @@ -286,103 +288,103 @@ // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setBytes", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setDate", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setTime", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setTimestamp", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setBinaryStream", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setCharacterStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setCharacterStream", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setObject(sal_Int32, const Any&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setObject", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException) { - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); - ::osl::MutexGuard aGuard( m_aMutex ); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setObjectWithInfo", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setRef", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setBlob", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setClob", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException) { - ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); + + +::dbtools::throwFunctionNotSupportedException("setArray", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::clearParameters() throw(SQLException, RuntimeException) { -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("clearParameters", NULL); } // ------------------------------------------------------------------------- void MacabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) File [changed]: MacabResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/macab/MacabResultSet.cxx?r1=1.3&r2=1.3.56.1 Delta lines: +15 -15 --------------------- --- MacabResultSet.cxx 2008-04-10 09:54:48+0000 1.3 +++ MacabResultSet.cxx 2008-08-20 07:27:30+0000 1.3.56.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MacabResultSet.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.56.1 $ * * This file is part of OpenOffice.org. * @@ -241,7 +241,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getBoolean", NULL); return sal_False; } @@ -251,7 +251,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getByte", NULL); sal_Int8 nRet = 0; return nRet; @@ -262,7 +262,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getShort", NULL); sal_Int16 nRet = 0; return nRet; @@ -389,7 +389,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getBytes", NULL); return Sequence< sal_Int8 >(); } @@ -399,7 +399,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getDate", NULL); Date aRet; return aRet; @@ -410,7 +410,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getTime", NULL); Time nRet; return nRet; @@ -448,7 +448,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getBinaryStream", NULL); return NULL; } @@ -458,7 +458,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getCharacterStream", NULL); return NULL; } @@ -468,7 +468,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getObject", NULL); return Any(); } @@ -478,7 +478,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getRef", NULL); return NULL; } @@ -488,7 +488,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getBlob", NULL); return NULL; } @@ -498,7 +498,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getClob", NULL); return NULL; } @@ -508,7 +508,7 @@ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); -::dbtools::throwFunctionNotSupportedException(::rtl::OUString::createFromAscii("Not Implemented"), NULL); +::dbtools::throwFunctionNotSupportedException("getArray", NULL); return NULL; } File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/macab/makefile.mk?r1=1.3&r2=1.3.56.1 Delta lines: +3 -2 ------------------- --- makefile.mk 2008-04-10 09:59:26+0000 1.3 +++ makefile.mk 2008-08-20 07:27:30+0000 1.3.56.1 @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.3.56.1 $ # # This file is part of OpenOffice.org. # @@ -65,6 +65,7 @@ SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ + $(DBTOOLSLIB) \ $(SALLIB) SHL1DEPN= 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.33.22.1&r2=1.33.22.2 Delta lines: +3 -3 ------------------- --- MResultSet.cxx 2008-08-15 08:32:48+0000 1.33.22.1 +++ MResultSet.cxx 2008-08-20 07:27:31+0000 1.33.22.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MResultSet.cxx,v $ - * $Revision: 1.33.22.1 $ + * $Revision: 1.33.22.2 $ * * This file is part of OpenOffice.org. * @@ -1219,7 +1219,7 @@ } else if(isCount()) { - ::dbtools::throwFunctionNotSupportedException(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("COUNT() - Driver does not support this function.")), NULL); + m_pStatement->getOwnConnection()->throwGenericSQLException(STR_NO_COUNT_SUPPORT,*this); } else { @@ -1360,7 +1360,7 @@ case SQL_STATEMENT_INSERT: break; default: - ::dbtools::throwFunctionNotSupportedException(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("statement type not supported by this database driver.")), NULL); + m_pStatement->getOwnConnection()->throwGenericSQLException(STR_STMT_TYPE_NOT_SUPPORTED,*this); break; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
