don't rely on implicit casting

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 );
 

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() );
 }
 
 // -------------------------------------------------------------------------