diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 12:00:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 20:38:35 +0000 |
| commit | 6a9ba3c97efa7650b7ef306cc79a05b16c305b35 (patch) | |
| tree | e53fa642fcb32e81e19026aa7f77ae819eba4c4d /connectivity | |
| parent | 74b95a4d6adeee2efcf969e0f234403ff82a9ec1 (diff) | |
don't rely on implicit casting
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/evoab2/NResultSet.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/drivers/evoab2/NStatement.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 501dea609629..8fc193ae4f10 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -233,7 +233,7 @@ executeQuery (EBook* pBook, EBookQuery* pQuery, GList **ppList, { rtl::OString aUser( getUserName( pBook ) ); const char *pAuth = e_source_get_property( pSource, "auth" ); - bAuthSuccess = e_book_authenticate_user( pBook, aUser, rPassword, pAuth, pError ); + bAuthSuccess = e_book_authenticate_user( pBook, aUser.getStr(), rPassword.getStr(), pAuth, pError ); } if (bAuthSuccess) @@ -517,7 +517,7 @@ void OEvoabResultSet::construct( const QueryData& _rData ) { ENSURE_OR_THROW( _rData.getQuery(), "internal error: no EBookQuery" ); - EBook *pBook = openBook( ::rtl::OUStringToOString( _rData.sTable, RTL_TEXTENCODING_UTF8 ) ); + EBook *pBook = openBook(::rtl::OUStringToOString(_rData.sTable, RTL_TEXTENCODING_UTF8).getStr()); if ( !pBook ) m_pConnection->throwGenericSQLException( STR_CANNOT_OPEN_BOOK, *this ); diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 33193c5033b3..2ea738ad3419 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -208,8 +208,8 @@ OCommonStatement::createTest( const ::rtl::OUString &aColumnName, ::rtl::OString sMatch = rtl::OUStringToOString( aMatch, RTL_TEXTENCODING_UTF8 ); ::rtl::OString sColumnName = rtl::OUStringToOString( aColumnName, RTL_TEXTENCODING_UTF8 ); - return e_book_query_field_test( e_contact_field_id( sColumnName ), - eTest, sMatch ); + return e_book_query_field_test( e_contact_field_id( sColumnName.getStr() ), + eTest, sMatch.getStr() ); } // ------------------------------------------------------------------------- |