summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-06-29 22:20:04 +0200
committerEike Rathke <erack@redhat.com>2015-06-29 22:30:50 +0200
commitf61d873202ddc30b7153e837d071d14dca07e3f4 (patch)
tree058ebbdb9439a18934f8d194c5c8a4758f7b34dc
parent5d89d4e45bc01119032944ce8b147e9cb682e25d (diff)
Resolves: tdf#31577 volatile lookup ranges must not be cached
Change-Id: Iac8574329c8c8e0bc0ac956993ccdd085372a6cc (cherry picked from commit 5e83f49e5d62587f427ad416f5188ce81506c05b)
-rw-r--r--sc/source/core/tool/interpr1.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index e2255ac7a31e..e1dfd2afa93d 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8503,7 +8503,13 @@ bool ScInterpreter::LookupQueryWithCache( ScAddress & o_rResultPos,
const ScQueryEntry& rEntry = rParam.GetEntry(0);
bool bColumnsMatch = (rParam.nCol1 == rEntry.nField);
OSL_ENSURE( bColumnsMatch, "ScInterpreter::LookupQueryWithCache: columns don't match");
- if (!bColumnsMatch)
+ // At least all volatile functions that generate indirect references have
+ // to force non-cached lookup.
+ /* TODO: We could further classify volatile functions into reference
+ * generating and not reference generating functions to have to force less
+ * direct lookups here. We could even further attribute volatility per
+ * parameter so it would affect only the lookup range parameter. */
+ if (!bColumnsMatch || GetVolatileType() != NOT_VOLATILE)
bFound = lcl_LookupQuery( o_rResultPos, pDok, rParam, rEntry);
else
{