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

[Luboš Luňák (via logerrit)]

 sc/source/core/data/documen6.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a18fd80e81fdab190d41f53c9cfe53f500c6034a
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Tue Jan 14 12:26:52 2020 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Fri Jan 17 16:30:02 2020 +0100

    do not ignore return value of a (confusing) function (tdf#126248)
    
    The two ScCellFormat::GetString() overloads are lame API, one returns
    the value normally and the other one returns void and uses a reference
    parameter. I got confused by this in 6f810e3d7dafcd7d0101173a501
    and didn't use the return value in one case.
    
    Change-Id: I0b6c839f9d0299e14ea022813481802275df5ea6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86750
    Tested-by: Jenkins
    Reviewed-by: 锁琨珑 <suokunlong at 126.com>
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit 5a211ba9f5f465c8c898ebce4cc37fa30581acac)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86835
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit deeb6f645d4eeb686afd5646b9d64480e54dabea)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86897
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx
index 789f26c2c009..e6d7a315f7bf 100644
--- a/sc/source/core/data/documen6.cxx
+++ b/sc/source/core/data/documen6.cxx
@@ -120,7 +120,7 @@ SvtScriptType ScDocument::GetCellScriptType( const ScAddress& rPos, sal_uInt32 n
     if( pCell )
         ScCellFormat::GetString(*pCell, nNumberFormat, aStr, &pColor, *mxPoolHelper->GetFormTable(), this);
     else
-        ScCellFormat::GetString(*this, rPos, nNumberFormat, &pColor, *mxPoolHelper->GetFormTable());
+        aStr = ScCellFormat::GetString(*this, rPos, nNumberFormat, &pColor, *mxPoolHelper->GetFormTable());
 
     SvtScriptType nRet = GetStringScriptType( aStr );