summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-08-05 18:29:06 +0200
committerEike Rathke <erack@redhat.com>2016-08-05 18:32:58 +0200
commit91cad2de121a10c470b30832ac28597bdffd7101 (patch)
treec4a9c537320d3421581e2623da50c2844304afaa /sc
parent3cb45765f2accfa749cc56a087059600ec467f28 (diff)
Compare() and CompareMat(): PopError() to propagate
... an already existing error instead of overriding with errIllegalParameter. Change-Id: Iebdbe1fbaba8aa1628eacc2a3ad3d193af7a42bf
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/interpr1.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index e14aaea6ad0e..bec54db19b56 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -885,6 +885,7 @@ double ScInterpreter::Compare( ScQueryOp eOp )
// mode. Which also means we'd have to change all places where
// it currently is handled along with svMatrix.
default:
+ PopError();
SetError( errIllegalParameter);
break;
}
@@ -953,6 +954,7 @@ sc::RangeMatrix ScInterpreter::CompareMat( ScQueryOp eOp, sc::CompareOptions* pO
// errors are transported as DoubleError inside matrix
break;
default:
+ PopError();
SetError( errIllegalParameter);
break;
}