Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hey,

this patch fixes a problem with OR and AND in array formulas. The 3.3
code explicitly allowed boolean values and this patch allows them
again.

I think it is an extremely safe fix and should be included into 3-4.

Markus
From 45dac237294d5a069b32e9da79d5209200512ad0 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Tue, 1 Nov 2011 17:08:19 +0100
Subject: [PATCH] boolean values are valid for matrix evaluation (fdo#49967)

---
 sc/source/core/tool/scmatrix.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index fcdf412..ac1c7a4 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -733,7 +733,7 @@ bool EvalMatrix(const MatrixImplType& rMat)
         for (size_t j = 0; j < nCols; ++j)
         {
             matrix_element_t eType = rMat.get_type(i, j);
-            if (eType != mdds::element_numeric && eType == mdds::element_boolean)
+            if (eType != mdds::element_numeric && eType != mdds::element_boolean)
                 // assuming a CompareMat this is an error
                 return CreateDoubleError(errIllegalArgument);
 
-- 
1.7.3.4


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.