diff options
Diffstat (limited to 'connectivity/source/drivers/kab/KDatabaseMetaData.cxx')
-rwxr-xr-x[-rw-r--r--] | connectivity/source/drivers/kab/KDatabaseMetaData.cxx | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx index b972f362b45a..e27ce35bce04 100644..100755 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.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. @@ -219,7 +220,7 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQLE ::rtl::OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) { // normally this is " - ::rtl::OUString aVal = ::rtl::OUString::createFromAscii("\""); + ::rtl::OUString aVal(RTL_CONSTASCII_USTRINGPARAM("\"")); return aVal; } // ------------------------------------------------------------------------- @@ -566,7 +567,7 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(S { // if someday we support more than the default address book, // this method should return the URL which was used to create it - ::rtl::OUString aValue = ::rtl::OUString::createFromAscii("sdbc:address:kab:"); + ::rtl::OUString aValue( RTL_CONSTASCII_USTRINGPARAM( "sdbc:address:kab:" )); return aValue; } // ------------------------------------------------------------------------- @@ -578,13 +579,13 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(S // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL KabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue = ::rtl::OUString::createFromAscii("kab"); + ::rtl::OUString aValue( RTL_CONSTASCII_USTRINGPARAM( "kab" )); return aValue; } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) { - ::rtl::OUString aValue = ::rtl::OUString::createFromAscii(KAB_DRIVER_VERSION); + ::rtl::OUString aValue(RTL_CONSTASCII_USTRINGPARAM(KAB_DRIVER_VERSION)); return aValue; } // ------------------------------------------------------------------------- @@ -791,7 +792,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes( ) throw(SQ Reference< XResultSet > xRef = pResult; static ODatabaseMetaDataResultSet::ORows aRows; - static const ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE")); + static const ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE")); if (aRows.empty()) { @@ -815,7 +816,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo( ) throw(SQLE ODatabaseMetaDataResultSet::ORow aRow(19); aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue(); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("CHAR")); + aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR"))); aRow[2] = new ORowSetValueDecorator(DataType::CHAR); aRow[3] = new ORowSetValueDecorator((sal_Int32) 254); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); @@ -886,7 +887,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( aRow[14] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[15] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[16] = new ORowSetValueDecorator((sal_Int32) 254); - aRow[18] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("YES")); + aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES"))); sal_Int32 nPosition = 1; QString aQtName; @@ -898,7 +899,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( { aRow[4] = new ORowSetValueDecorator(sName); aRow[5] = new ORowSetValueDecorator(DataType::TIMESTAMP); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIMESTAMP")); + aRow[6] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"))); aRow[17] = new ORowSetValueDecorator(nPosition++); aRows.push_back(aRow); } @@ -916,7 +917,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( { aRow[4] = new ORowSetValueDecorator(sName); aRow[5] = new ORowSetValueDecorator(DataType::CHAR); - aRow[6] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("CHAR")); + aRow[6] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR"))); aRow[7] = new ORowSetValueDecorator((sal_Int32) 256); // Might be VARCHAR and not CHAR[256]... aRow[17] = new ORowSetValueDecorator(nPosition); @@ -940,7 +941,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( // check whether we have tables in the requested types // for the moment, we answer only the "TABLE" table type // when no types are given at all, we return all the tables - static const ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE")); + static const ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE")); sal_Bool bTableFound = sal_False; const ::rtl::OUString* p = types.getConstArray(), * pEnd = p + types.getLength(); @@ -1013,7 +1014,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( aRow[2] = new ORowSetValueDecorator(sName); aRow[3] = new ORowSetValueDecorator(DataType::TIMESTAMP); - aRow[4] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIMESTAMP")); + aRow[4] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"))); aRow[5] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[6] = ODatabaseMetaDataResultSet::getEmptyValue(); @@ -1078,3 +1079,5 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const throw SQLException(); } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |