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

Eike Rathke erack at redhat.com
Wed Apr 1 01:09:16 PDT 2015


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

New commits:
commit bf8fdf104b780b8bf54710d00cf3f19922700fdf
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Mar 31 16:09:14 2015 +0200

    use error value instead of string in array/matrix, tdf#42481 related
    
    Change-Id: Ib97509609bd3e6629e3efd0c633535564f1c64d6
    (cherry picked from commit f3989e4d3d87f07a484d7c404bc2bfc678faa7f0)
    Reviewed-on: https://gerrit.libreoffice.org/15096
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index c5b1f02..a8111f3 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -994,7 +994,7 @@ sc::RangeMatrix ScInterpreter::CompareMat( ScQueryOp eOp, sc::CompareOptions* pO
                         sc::CompareFunc(aComp.maCells[0], aComp.maCells[1], aComp.mbIgnoreCase, pOptions), j, k);
                 }
                 else
-                    aRes.mpMat->PutString(mrStrPool.intern(ScGlobal::GetRscString(STR_NO_VALUE)), j, k);
+                    aRes.mpMat->PutError( errNoValue, j, k);
             }
         }
 


More information about the Libreoffice-commits mailing list