User: ihi Date: 2007-11-21 15:09:23+0000 Modified: dba/connectivity/source/parse/sqliterator.cxx
Log: INTEGRATION: CWS dba24c (1.54.20); FILE MERGED 2007/09/28 19:17:54 fs 1.54.20.2: RESYNC: (1.54-1.55); FILE MERGED 2007/09/18 20:05:25 fs 1.54.20.1: during #i81095#: outsourced the CYCLIC_SUB_QUERIES error to the new css.sdb.ErrorCondition File Changes: Directory: /dba/connectivity/source/parse/ ========================================== File [changed]: sqliterator.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqliterator.cxx?r1=1.55&r2=1.56 Delta lines: +8 -7 ------------------- --- sqliterator.cxx 2007-09-26 14:31:52+0000 1.55 +++ sqliterator.cxx 2007-11-21 15:09:21+0000 1.56 @@ -49,6 +49,9 @@ #ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include <connectivity/dbtools.hxx> #endif +#ifndef CONNECTIVITY_SQLERROR_HXX +#include <connectivity/sqlerror.hxx> +#endif #ifndef _COM_SUN_STAR_SDBC_COLUMNVALUE_HPP_ #include <com/sun/star/sdbc/ColumnValue.hpp> #endif @@ -61,6 +64,9 @@ #ifndef _COM_SUN_STAR_SDB_XQUERIESSUPPLIER_HPP_ #include <com/sun/star/sdb/XQueriesSupplier.hpp> #endif +#ifndef _COM_SUN_STAR_SDB_ERRORCONDITION_HPP_ +#include <com/sun/star/sdb/ErrorCondition.hpp> +#endif #ifdef SQL_TEST_PARSETREEITERATOR #include <iostream> #endif @@ -94,6 +100,7 @@ using namespace ::connectivity::sdbcx; using namespace ::dbtools; using namespace ::connectivity::parse; +using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; using namespace ::com::sun::star::sdbcx; @@ -443,13 +450,7 @@ { if ( !m_pImpl->isQueryAllowed( sComposedName ) ) { - impl_appendError( SQLException( - m_rParser.getContext().getErrorMessage( IParseContext::ERROR_CYCLIC_SUB_QUERIES ), - NULL, - getStandardSQLState( SQL_CYCLIC_SUB_QUERIES ), - 0, - Any() - ) ); + impl_appendError( m_rParser.getErrorHelper().getSQLException( sdb::ErrorCondition::PARSER_CYCLIC_SUB_QUERIES, NULL ) ); return NULL; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
