diff options
Diffstat (limited to 'connectivity/source/commontools/TTableHelper.cxx')
| -rw-r--r-- | connectivity/source/commontools/TTableHelper.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 7d020e9fc4a6..5d3027a627b1 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.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. @@ -44,6 +45,8 @@ #include <unotools/sharedunocomponent.hxx> #include "TConnection.hxx" +#include <o3tl/compat_functional.hxx> + using namespace ::comphelper; using namespace connectivity; using namespace ::com::sun::star::uno; @@ -242,7 +245,7 @@ namespace // if that's not the case, normalize it if ( bGaps || bDuplicates ) { - OSL_ENSURE( false, "lcl_sanitizeColumnDescs: database did provide invalid ORDINAL_POSITION values!" ); + OSL_FAIL( "lcl_sanitizeColumnDescs: database did provide invalid ORDINAL_POSITION values!" ); OrdinalPosition nNormalizedPosition = 1; for ( ::std::vector< ColumnDesc >::iterator normalize = _rColumns.begin(); @@ -278,7 +281,7 @@ void OTableHelper::refreshColumns() aCatalog, m_SchemaName, m_Name, - ::rtl::OUString::createFromAscii("%") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")) ) ); // collect the column names, together with their ordinal position @@ -301,7 +304,7 @@ void OTableHelper::refreshColumns() aSortedColumns.begin(), aSortedColumns.end(), ::std::insert_iterator< TStringVector >( aVector, aVector.begin() ), - ::std::select2nd< ::std::map< OrdinalPosition, ::rtl::OUString >::value_type >() + ::o3tl::select2nd< ::std::map< OrdinalPosition, ::rtl::OUString >::value_type >() ); } @@ -519,7 +522,7 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx ::rtl::OUString sComposedName; sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sal_True,::dbtools::eInDataManipulation); sSql += sComposedName - + ::rtl::OUString::createFromAscii(" TO "); + + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TO ")); sComposedName = ::dbtools::composeTableName(getMetaData(),sCatalog,sSchema,sTable,sal_True,::dbtools::eInDataManipulation); sSql += sComposedName; @@ -586,7 +589,7 @@ sdbcx::TKeyProperties OTableHelper::getKeyProperties(const ::rtl::OUString& _sNa } else // only a fall back { - OSL_ENSURE(0,"No key with the given name found"); + OSL_FAIL("No key with the given name found"); pKeyProps.reset(new sdbcx::KeyProperties()); } @@ -628,3 +631,5 @@ Reference< ::com::sun::star::sdb::tools::XIndexAlteration> OTableHelper::getInd return m_pImpl->m_xIndexAlter; } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |