1 files changed, 5 insertions, 6 deletions
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 3533477bb0cf..99357a01fcc8 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -49,12 +49,12 @@ ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParse
 
 OUString SAL_CALL ODbaseResultSet::getImplementationName(  )
 {
-    return "com.sun.star.sdbcx.dbase.ResultSet";
+    return u"com.sun.star.sdbcx.dbase.ResultSet"_ustr;
 }
 
 Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames(  )
 {
-    return { "com.sun.star.sdbc.ResultSet", "com.sun.star.sdbcx.ResultSet" };
+    return { u"com.sun.star.sdbc.ResultSet"_ustr, u"com.sun.star.sdbcx.ResultSet"_ustr };
 }
 
 sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString& _rServiceName )
@@ -81,7 +81,7 @@ Any SAL_CALL ODbaseResultSet::getBookmark(  )
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     OSL_ENSURE((m_bShowDeleted || !m_aRow->isDeleted()),"getBookmark called for deleted row");
 
-    return makeAny((*m_aRow)[0]->getValue().getInt32());
+    return Any((*m_aRow)[0]->getValue().getInt32());
 }
 
 sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const  Any& bookmark )
@@ -149,13 +149,12 @@ Sequence< sal_Int32 > SAL_CALL ODbaseResultSet::deleteRows( const  Sequence<  An
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
-    ::dbtools::throwFeatureNotImplementedSQLException( "XDeleteRows::deleteRows", *this );
-    return Sequence< sal_Int32 >();
+    ::dbtools::throwFeatureNotImplementedSQLException( u"XDeleteRows::deleteRows"_ustr, *this );
 }
 
 bool ODbaseResultSet::fillIndexValues(const Reference< XColumnsSupplier> &_xIndex)
 {
-    auto pIndex = comphelper::getFromUnoTunnel<dbase::ODbaseIndex>(_xIndex);
+    auto pIndex = dynamic_cast<dbase::ODbaseIndex*>(_xIndex.get());
     if(pIndex)
     {
         std::unique_ptr<dbase::OIndexIterator> pIter = pIndex->createIterator();