mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS dba24c (1.54.20); FILE MERGED

Browse Source 
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
This commit is contained in:
Ivo Hinkelmann
2007-11-21 14:09:21 +00:00
parent 922be07484
commit bfbf21aff0
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
connectivity/source/parse/sqliterator.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: sqliterator.cxx,v $ * $RCSfile: sqliterator.cxx,v $
* *
* $Revision: 1.55 $ * $Revision: 1.56 $
* *
* last change: $Author: hr $ $Date: 2007-09-26 14:31:52 $ * last change: $Author: ihi $ $Date: 2007-11-21 15:09:21 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -49,6 +49,9 @@
#ifndef _CONNECTIVITY_DBTOOLS_HXX_ #ifndef _CONNECTIVITY_DBTOOLS_HXX_
#include <connectivity/dbtools.hxx> #include <connectivity/dbtools.hxx>
#endif #endif
#ifndef CONNECTIVITY_SQLERROR_HXX
#include <connectivity/sqlerror.hxx>
#endif
#ifndef _COM_SUN_STAR_SDBC_COLUMNVALUE_HPP_ #ifndef _COM_SUN_STAR_SDBC_COLUMNVALUE_HPP_
#include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp>
#endif #endif
@@ -61,6 +64,9 @@
#ifndef _COM_SUN_STAR_SDB_XQUERIESSUPPLIER_HPP_ #ifndef _COM_SUN_STAR_SDB_XQUERIESSUPPLIER_HPP_
#include <com/sun/star/sdb/XQueriesSupplier.hpp> #include <com/sun/star/sdb/XQueriesSupplier.hpp>
#endif #endif
#ifndef _COM_SUN_STAR_SDB_ERRORCONDITION_HPP_
#include <com/sun/star/sdb/ErrorCondition.hpp>
#endif
#ifdef SQL_TEST_PARSETREEITERATOR #ifdef SQL_TEST_PARSETREEITERATOR
#include <iostream> #include <iostream>
#endif #endif
@@ -94,6 +100,7 @@ using namespace ::connectivity;
using namespace ::connectivity::sdbcx; using namespace ::connectivity::sdbcx;
using namespace ::dbtools; using namespace ::dbtools;
using namespace ::connectivity::parse; using namespace ::connectivity::parse;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container; using namespace ::com::sun::star::container;
using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbcx;
@@ -443,13 +450,7 @@ OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const ::rtl::OUString&
{ {
if ( !m_pImpl->isQueryAllowed( sComposedName ) ) if ( !m_pImpl->isQueryAllowed( sComposedName ) )
{ {
impl_appendError( SQLException( impl_appendError( m_rParser.getErrorHelper().getSQLException( sdb::ErrorCondition::PARSER_CYCLIC_SUB_QUERIES, NULL ) );
m_rParser.getContext().getErrorMessage( IParseContext::ERROR_CYCLIC_SUB_QUERIES ),
NULL,
getStandardSQLState( SQL_CYCLIC_SUB_QUERIES ),
0,
Any()
) );
return NULL; return NULL;
} }