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

[Kohei Yoshida]

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

New commits:
commit 473e10aa5e1e3c6a4854dec9ff2ea522be283799
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.
    
    Change-Id: Id96fea354604b3c13cbbf2d9a73223b7725c7d66
    (cherry picked from commit 5fab47ddbe332a150fb2005e941a2c19bd38ce7f)
    Reviewed-on: https://gerrit.libreoffice.org/9187
    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 215bb76..f48de85 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -580,7 +580,7 @@ svl::SharedString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE
         {
             if (!maMatFlag.get<bool>(nR, nC))
                 // not an empty path.
-                break;
+                return svl::SharedString::getEmptyString();
 
             // result of empty FALSE jump path
             sal_uLong nKey = rFormatter.GetStandardFormat( NUMBERFORMAT_LOGICAL,