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

[Kohei Yoshida]

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

New commits:
commit a226019bb5431ca04cae28fefb6b83e2bb738243
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Mon Apr 28 11:55:23 2014 -0400

    fdo#75397: Return an empty string for empty element.
    
    This is the behavior as of 3.6.  It had changed in 4.0 and onward by
    accident, and caused the bug as reported in fdo#75397.
    
    (cherry picked from commit 5fab47ddbe332a150fb2005e941a2c19bd38ce7f)
    
    Change-Id: Id96fea354604b3c13cbbf2d9a73223b7725c7d66
    Reviewed-on: https://gerrit.libreoffice.org/9188
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 933e808..66e43d8 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -677,7 +677,7 @@ OUString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE nC, SCSI
         {
             if (!maMatFlag.get<bool>(nR, nC))
                 // not an empty path.
-                break;
+                return EMPTY_OUSTRING;
 
             // result of empty FALSE jump path
             sal_uLong nKey = rFormatter.GetStandardFormat( NUMBERFORMAT_LOGICAL,