[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-1' - sc/source

[Eike Rathke (via logerrit)]

 sc/source/filter/dif/difimp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ceb0695169e6087ae546687fb22800eaf0da67d
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Thu Aug 25 12:53:51 2022 +0200
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Mon Aug 29 07:37:57 2022 +0200

    Resolves: tdf#150599 Move obtaining data into loop again
    
    Regression from
    
        commit a23a7eea5cfcdc50d09be248828cb1e6293e5ebb
        CommitDate: Sun Dec 26 20:36:26 2021 +0100
    
            Avoid OUStringBuffer::toString where possible
    
    that erroneously also moved obtaining the data string outside the
    loop, whyever..
    
    Change-Id: I329108d42db43c1ab22ba82650d801e595dd7ece
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138805
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 9c3c564659320fb24d2a9c230464f06cf855a136)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138816
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index f6e1fd0b0a36..fd88cdf4cfd4 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -122,7 +122,6 @@ ErrCode ScFormatFilterPluginImpl::ScImportDif(SvStream& 
rIn, ScDocument* pDoc, c
 
         ScSetStringParam aStrParam; // used to set string value without number 
detection.
         aStrParam.setTextInput();
-        const OUString aData = rData.makeStringAndClear();
 
         while( eCurrent != D_EOD )
         {
@@ -130,6 +129,7 @@ ErrCode ScFormatFilterPluginImpl::ScImportDif(SvStream& 
rIn, ScDocument* pDoc, c
 
             aPrgrsBar.Progress();
             ScAddress aPos(nColCnt, nRowCnt, nBaseTab);
+            const OUString aData = rData.makeStringAndClear();
 
             switch( eCurrent )
             {