1 files changed, 6 insertions, 7 deletions
diff --git a/connectivity/source/drivers/component/CResultSet.cxx b/connectivity/source/drivers/component/CResultSet.cxx
index 050b4034da45..8a170bab20d4 100644
--- a/connectivity/source/drivers/component/CResultSet.cxx
+++ b/connectivity/source/drivers/component/CResultSet.cxx
@@ -45,12 +45,12 @@ OComponentResultSet::OComponentResultSet( OStatement_Base* pStmt,connectivity::O
 
 OUString SAL_CALL OComponentResultSet::getImplementationName(  )
 {
-    return "com.sun.star.sdbcx.component.ResultSet";
+    return u"com.sun.star.sdbcx.component.ResultSet"_ustr;
 }
 
 Sequence< OUString > SAL_CALL OComponentResultSet::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 OComponentResultSet::supportsService( const OUString& _rServiceName )
@@ -77,7 +77,7 @@ Any SAL_CALL OComponentResultSet::getBookmark(  )
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 
-    return makeAny(static_cast<sal_Int32>((*m_aRow)[0]->getValue()));
+    return Any((*m_aRow)[0]->getValue().getInt32());
 }
 
 sal_Bool SAL_CALL OComponentResultSet::moveToBookmark( const  Any& bookmark )
@@ -130,8 +130,7 @@ Sequence< sal_Int32 > SAL_CALL OComponentResultSet::deleteRows( const  Sequence<
     ::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 OComponentResultSet::fillIndexValues(const Reference< XColumnsSupplier> &/*_xIndex*/)
@@ -153,12 +152,12 @@ bool OComponentResultSet::fillIndexValues(const Reference< XColumnsSupplier> &/*
 }
 
 
-void SAL_CALL OComponentResultSet::acquire() throw()
+void SAL_CALL OComponentResultSet::acquire() noexcept
 {
     OComponentResultSet_BASE2::acquire();
 }
 
-void SAL_CALL OComponentResultSet::release() throw()
+void SAL_CALL OComponentResultSet::release() noexcept
 {
     OComponentResultSet_BASE2::release();
 }