diff options
Diffstat (limited to 'connectivity/source/drivers/mozab/MStatement.cxx')
-rw-r--r-- | connectivity/source/drivers/mozab/MStatement.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx index 13f64b124d0a..2070f8da37c8 100644 --- a/connectivity/source/drivers/mozab/MStatement.cxx +++ b/connectivity/source/drivers/mozab/MStatement.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -146,14 +147,14 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException ) { if(m_pParseTree) { - ::vos::ORef<connectivity::OSQLColumns> xCreateColumn; + ::rtl::Reference<connectivity::OSQLColumns> xCreateColumn; if (m_pSQLIterator->getStatementType() == SQL_STATEMENT_CREATE_TABLE) { const OSQLTables& xTabs = m_pSQLIterator->getTables(); OSL_ENSURE( !xTabs.empty(), "Need a Table"); ::rtl::OUString ouTableName=xTabs.begin()->first; xCreateColumn = m_pSQLIterator->getCreateColumns(); - OSL_ENSURE(xCreateColumn.isValid(), "Need the Columns!!"); + OSL_ENSURE(xCreateColumn.is(), "Need the Columns!!"); const OColumnAlias& aColumnAlias = m_pConnection->getColumnAlias(); @@ -254,7 +255,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const ::rtl::OUStrin } getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this ); - OSL_ENSURE( false, "OCommonStatement::parseSql: unreachable!" ); + OSL_FAIL( "OCommonStatement::parseSql: unreachable!" ); return eSelect; } @@ -490,7 +491,7 @@ void OCommonStatement::createColumnMapping() size_t i; // initialize the column index map (mapping select columns to table columns) - ::vos::ORef<connectivity::OSQLColumns> xColumns = m_pSQLIterator->getSelectColumns(); + ::rtl::Reference<connectivity::OSQLColumns> xColumns = m_pSQLIterator->getSelectColumns(); m_aColMapping.resize(xColumns->get().size() + 1); for (i=0; i<m_aColMapping.size(); ++i) m_aColMapping[i] = i; @@ -559,3 +560,5 @@ void OCommonStatement::setOrderbyColumn( OSQLParseNode* pColumnRef, m_aOrderbyAscending.push_back((SQL_ISTOKEN(pAscendingDescending,DESC)) ? SQL_DESC : SQL_ASC); } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |