1 files changed, 3 insertions, 3 deletions
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
index 3d0ac9ce8411..21dd0fafc686 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
@@ -21,11 +21,11 @@
 #include "mysqlc_general.hxx"
 
 #include <com/sun/star/sdbc/XRow.hpp>
-#include <rtl/ustrbuf.hxx>
+#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <o3tl/safeint.hxx>
 
 using namespace connectivity::mysqlc;
 using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
 using namespace com::sun::star::sdbc;
 
 OResultSetMetaData::OResultSetMetaData(OConnection& rConn, MYSQL_RES* pResult)
@@ -199,7 +199,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isWritable(sal_Int32 column)
 void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
 {
     auto nColCount = m_fields.size();
-    if (columnIndex < 1 || columnIndex > static_cast<sal_Int32>(nColCount))
+    if (columnIndex < 1 || o3tl::make_unsigned(columnIndex) > nColCount)
     {
         OUString str = "Column index out of range (expected 1 to "
                        + OUString::number(sal_Int32(nColCount)) + ", got "