diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
| commit | fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5 (patch) | |
| tree | 49a72b76d2d2a92af6371748c19277778159b86d /connectivity/source/drivers/evoab2 | |
| parent | e36dae401fc8963c9a92cb2c11d9b650b943c6d3 (diff) | |
Revert "use the new OUString::fromUtf8 method"
This reverts commit 05050cdb23de586870bf479a9df5ced06828d498,
not all places that use e.g. OStringToOUString to convert potential UTF-8
are guaranteed to fulfil the prerequisites necessary to use fromUtf8 (and
some places like e.g. in codemaker are happy with the best-effort effect
of OStringToOUString's OSTRING_TO_OUSTRING_CVTFLAGS).
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, 11 insertions, 6 deletions
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index 4bc4f316fe0a..c53523b5d479 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -214,7 +214,8 @@ namespace connectivity if( pSpec ) { - aName = OUString::fromUtf8( g_param_spec_get_name( ( GParamSpec * )pSpec ) ); + aName = OStringToOUString( g_param_spec_get_name( ( GParamSpec * )pSpec ), + RTL_TEXTENCODING_UTF8 ); aName = aName.replace( '-', '_' ); } return aName; @@ -1154,10 +1155,12 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( ODatabaseMetaDataResultSet::ORow aRow(3); aRow.reserve(6); - OUString aHumanName = OUString::fromUtf8( e_source_get_display_name( pSource ) ); + OUString aHumanName = OStringToOUString( e_source_get_display_name( pSource ), + RTL_TEXTENCODING_UTF8 ); aRow.push_back(new ORowSetValueDecorator(aHumanName)); //tablename aRow.push_back(new ORowSetValueDecorator(aTable)); - OUString aUID = OUString::fromUtf8( e_source_get_uid( pSource ) ); + OUString aUID = OStringToOUString( e_source_get_uid( pSource ), + RTL_TEXTENCODING_UTF8 ); 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); @@ -1204,7 +1207,8 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( { ESource *pSource = E_SOURCE (s->data); - OUString aName = OUString::fromUtf8( e_source_peek_name( pSource ) ); + OUString aName = OStringToOUString( e_source_peek_name( pSource ), + RTL_TEXTENCODING_UTF8 ); ODatabaseMetaDataResultSet::ORow aRow(3); aRow.reserve(6); diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 59c9cf67db5c..bbf643c78a7e 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( OUString::fromUtf8( aStr ) ); + OUString sResult( OStringToOUString( aStr, RTL_TEXTENCODING_UTF8 ) ); g_value_unset( &_rValue ); return sResult; } diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx index 084cefd35083..8e6a0746383c 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx @@ -110,7 +110,8 @@ OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum OUString aLabel; if( pSpec ) - aLabel = OUString::fromUtf8( g_param_spec_get_nick( (GParamSpec *) pSpec ) ); + aLabel = OStringToOUString( g_param_spec_get_nick( (GParamSpec *) pSpec ), + RTL_TEXTENCODING_UTF8 ); return aLabel; } |