User: obo Date: 2006/07/10 08:00:24 Modified: dba/dbaccess/source/core/api/BookmarkSet.cxx
Log: INTEGRATION: CWS qiq (1.17.2); FILE MERGED 2006/06/30 13:23:35 fs 1.17.2.1: during #i51143#: PROPERTY_ID_HY0000 superseded by StandardSQLState.SQL_GENERAL_ERROR File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: BookmarkSet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/BookmarkSet.cxx?r1=1.17&r2=1.18 Delta lines: +10 -5 -------------------- --- BookmarkSet.cxx 20 Jun 2006 02:32:54 -0000 1.17 +++ BookmarkSet.cxx 10 Jul 2006 15:00:21 -0000 1.18 @@ -44,10 +44,15 @@ #ifndef _COM_SUN_STAR_SDBC_XRESULTSETUPDATE_HPP_ #include <com/sun/star/sdbc/XResultSetUpdate.hpp> #endif +#ifndef _DBHELPER_DBEXCEPTION_HXX_ +#include <connectivity/dbexception.hxx> +#endif + #include <limits> using namespace dbaccess; -using namespace connectivity; +using namespace ::connectivity; +using namespace ::dbtools; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; @@ -109,7 +114,7 @@ { Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY); if(!xUpdRow.is()) - throw SQLException(DBACORE_RESSTRING(RID_STR_NO_XROWUPDATE),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HY000")),1000,Any()); + ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), SQL_GENERAL_ERROR, *this ); Reference<XResultSetUpdate> xUpd(m_xRowLocate,UNO_QUERY); if(xUpd.is()) @@ -125,7 +130,7 @@ (*_rInsertRow->begin()) = m_xRowLocate->getBookmark(); } else - throw SQLException(DBACORE_RESSTRING(RID_STR_NO_XRESULTSETUPDATE),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HY000")),1000,Any()); + ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XRESULTSETUPDATE ), SQL_GENERAL_ERROR, *this ); } // ------------------------------------------------------------------------- void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) @@ -133,7 +138,7 @@ // OCacheSet::updateRow( _rInsertRow,_rOrginalRow,_xTable); Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY); if(!xUpdRow.is()) - throw SQLException(DBACORE_RESSTRING(RID_STR_NO_XROWUPDATE),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HY000")),1000,Any()); + ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), SQL_GENERAL_ERROR, *this ); sal_Int32 i = 1; connectivity::ORowVector< ORowSetValue > ::const_iterator aOrgIter = _rOrginalRow->begin()+1; @@ -148,7 +153,7 @@ if(xUpd.is()) xUpd->updateRow(); else - throw SQLException(DBACORE_RESSTRING(RID_STR_NO_XRESULTSETUPDATE),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HY000")),1000,Any()); + ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XRESULTSETUPDATE ), SQL_GENERAL_ERROR, *this ); } // ------------------------------------------------------------------------- void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
