core.git: sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/docshell/docsh8.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit c458bfe2cc7f03b3e73be46cec3aba9e14b0f3df
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jan 4 15:41:18 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jan 5 09:52:23 2024 +0100

    nColCount is sal_Int32 so iter i can be as well
    
    Change-Id: I60d59a94329240b4cec0bae8beaeb93cddc5d3b1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161623
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 2b75ccc7d626..0d501a1fe328 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -286,7 +286,6 @@ ErrCode ScDocShell::DBaseImport( const OUString& 
rFullFileName, rtl_TextEncoding
 
     try
     {
-        tools::Long i;
         sal_Int32 nColCount = 0;
         OUString aTabName;
         uno::Reference<sdbc::XDriverManager2> xDrvMan;
@@ -335,7 +334,7 @@ ErrCode ScDocShell::DBaseImport( const OUString& 
rFullFileName, rtl_TextEncoding
         // currency flag is not needed for dBase
         uno::Sequence<sal_Int32> aColTypes( nColCount );    // column types
         sal_Int32* pTypeArr = aColTypes.getArray();
-        for (i=0; i<nColCount; i++)
+        for (sal_Int32 i=0; i<nColCount; i++)
             pTypeArr[i] = xMeta->getColumnType( i+1 );
 
         //  read column names
@@ -344,7 +343,7 @@ ErrCode ScDocShell::DBaseImport( const OUString& 
rFullFileName, rtl_TextEncoding
         aProgress.SetState( 0 );
 
         vector<tools::Long> aScales(nColCount, -1);
-        for (i=0; i<nColCount; i++)
+        for (sal_Int32 i=0; i<nColCount; i++)
         {
             OUString aHeader = xMeta->getColumnLabel( i+1 );
 
@@ -386,11 +385,11 @@ ErrCode ScDocShell::DBaseImport( const OUString& 
rFullFileName, rtl_TextEncoding
         bool bEnd = false;
         while ( !bEnd && xRowSet->next() )
         {
-            if ( nRow <= m_pDocument->MaxRow() )
+            if (nRow <= m_pDocument->MaxRow())
             {
                 bool bSimpleRow = true;
                 SCCOL nCol = 0;
-                for (i=0; i<nColCount; i++)
+                for (sal_Int32 i=0; i<nColCount; i++)
                 {
                     ScDatabaseDocUtil::StrData aStrData;
                     ScDatabaseDocUtil::PutData( *m_pDocument, nCol, nRow, 0,