core.git: sc/source

[Laurent Balland (via logerrit)]

 sc/source/ui/docshell/impex.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 47187acee758680cda8086b6e295ef7beea3491b
Author:     Laurent Balland <laurent.ball...@mailo.fr>
AuthorDate: Mon Apr 15 18:43:35 2024 +0200
Commit:     Eike Rathke <er...@redhat.com>
CommitDate: Wed Apr 17 13:05:52 2024 +0200

    tdf#129701 Follow-up of previous change
    
    According to comments in https://gerrit.libreoffice.org/c/core/+/163536
    Follow-up of previous change
    
    Change-Id: Icd7b6798d6ef35ca9574125cd3d4c4d89044569c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166133
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <er...@redhat.com>

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 248c837b6dd1..80b4a2b96701 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1592,7 +1592,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
     ScDocumentImport aDocImport(rDoc);
     do
     {
-        SCCOL nLastCol = nEndCol; // tdf#129701 preserve value of nEndCol
+        const SCCOL nLastCol = nEndCol; // tdf#129701 preserve value of nEndCol
         for( ;; )
         {
             aLine = ReadCsvLine(rStrm, !bFixed, aSeps, cStr, cDetectSep);
@@ -1714,15 +1714,15 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
                                 aTransliteration, aCalendar,
                                 pEnglishTransliteration.get(), 
pEnglishCalendar.get());
                         }
+                        ++nCol;
                         if (bIsLastColEmpty)
                         {
                             bIsLastColEmpty = false; // toggle to stop
                         }
                         else
                         {
-                            ++nCol;
                             // tdf#129701 detect if there is a last empty 
column when we need it
-                            bIsLastColEmpty = !(*p) && !bSkipEmptyCells && 
!bDetermineRange && nCol == nLastCol;
+                            bIsLastColEmpty = (nCol == nLastCol) && !(*p) && 
!bSkipEmptyCells && !bDetermineRange;
                         }
 
                     }