diff options
Diffstat (limited to 'connectivity/source/drivers/evoab2')
| -rw-r--r-- | connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 12 | ||||
| -rw-r--r-- | connectivity/source/drivers/evoab2/NResultSet.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/evoab2/NResultSetMetaData.cxx | 3 |
3 files changed, 6 insertions, 11 deletions
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index c53523b5d479..4bc4f316fe0a 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -214,8 +214,7 @@ namespace connectivity if( pSpec ) { - aName = OStringToOUString( g_param_spec_get_name( ( GParamSpec * )pSpec ), - RTL_TEXTENCODING_UTF8 ); + aName = OUString::fromUtf8( g_param_spec_get_name( ( GParamSpec * )pSpec ) ); aName = aName.replace( '-', '_' ); } return aName; @@ -1155,12 +1154,10 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( ODatabaseMetaDataResultSet::ORow aRow(3); aRow.reserve(6); - OUString aHumanName = OStringToOUString( e_source_get_display_name( pSource ), - RTL_TEXTENCODING_UTF8 ); + OUString aHumanName = OUString::fromUtf8( e_source_get_display_name( pSource ) ); aRow.push_back(new ORowSetValueDecorator(aHumanName)); //tablename aRow.push_back(new ORowSetValueDecorator(aTable)); - OUString aUID = OStringToOUString( e_source_get_uid( pSource ), - RTL_TEXTENCODING_UTF8 ); + OUString aUID = OUString::fromUtf8( e_source_get_uid( pSource ) ); aRow.push_back(new ORowSetValueDecorator(aUID)); //comment //I'd prefer to swap the comment and the human name and //just use e_source_registry_ref_source(get_e_source_registry(), aUID); @@ -1207,8 +1204,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( { ESource *pSource = E_SOURCE (s->data); - OUString aName = OStringToOUString( e_source_peek_name( pSource ), - RTL_TEXTENCODING_UTF8 ); + OUString aName = OUString::fromUtf8( e_source_peek_name( pSource ) ); ODatabaseMetaDataResultSet::ORow aRow(3); aRow.reserve(6); diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index bbf643c78a7e..59c9cf67db5c 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -98,7 +98,7 @@ valueToOUString( GValue& _rValue ) { const char *pStr = g_value_get_string( &_rValue ); OString aStr( pStr ? pStr : "" ); - OUString sResult( OStringToOUString( aStr, RTL_TEXTENCODING_UTF8 ) ); + OUString sResult( OUString::fromUtf8( aStr ) ); g_value_unset( &_rValue ); return sResult; } diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx index 8e6a0746383c..084cefd35083 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx @@ -110,8 +110,7 @@ OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum OUString aLabel; if( pSpec ) - aLabel = OStringToOUString( g_param_spec_get_nick( (GParamSpec *) pSpec ), - RTL_TEXTENCODING_UTF8 ); + aLabel = OUString::fromUtf8( g_param_spec_get_nick( (GParamSpec *) pSpec ) ); return aLabel; } |