[Libreoffice-commits] core.git: Branch 'feature/unitver' - sc/source

Andrzej Hunt andrzej at ahunt.org
Wed Jun 3 07:59:14 PDT 2015


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

New commits:
commit 8144a4cf6d1ca4e80699e54ebc05c81fabab6e71
Author: Andrzej Hunt <andrzej at ahunt.org>
Date:   Wed Jun 3 15:58:29 2015 +0100

    Don't assert on unsupported opcode, return unknown instead
    
    We should eventually support all opcodes, but crashing* isn't
    really the correct response if not.
    
    *or continuing with completely wrong behvaiour in non-debug builds.
    
    Change-Id: I22d7746f4e809bdc3da62b8b6f741216504b3f22

diff --git a/sc/source/core/units/unitsimpl.cxx b/sc/source/core/units/unitsimpl.cxx
index c440df6..66f5019 100644
--- a/sc/source/core/units/unitsimpl.cxx
+++ b/sc/source/core/units/unitsimpl.cxx
@@ -162,7 +162,7 @@ UnitsResult UnitsImpl::getOutputUnitsForOpCode(stack< RAUSItem >& rStack, const
             break;
         default:
             SAL_INFO("sc.units", "unit verification not supported for opcode: " << nOpCode);
-            assert(false);
+            return { FormulaStatus::UNKNOWN, boost::none };
         }
     } else if (nOpCode >= SC_OPCODE_START_2_PAR &&
                nOpCode < SC_OPCODE_STOP_2_PAR) {


More information about the Libreoffice-commits mailing list