summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2013-10-08 11:11:48 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2013-10-08 15:48:11 -0400
commit25bb77cd3f4431cdff9ef798976f55b8505c979f (patch)
tree16cff610563c0c5a2ddf0acf338c789a21438719 /sc
parent6cfaf9b3d3194d850b52993d2f0e3dcf8e4e5bce (diff)
Turns out we are not using OpenCL here in the existing interpreter.
Change-Id: I4d511ef8099b5d7fcff07adf401901c9ee089ad3
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/interpr1.cxx52
1 files changed, 3 insertions, 49 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 3885823c3940..770ee24e36ae 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6449,43 +6449,6 @@ void ScInterpreter::ScHLookup()
CalculateLookup(true);
}
-namespace {
-
-#if 1
-bool isFilterByEqualString( const ScQueryParam& )
-{
- return false;
-}
-#else
-bool isFilterByEqualString( const ScQueryParam& rParam )
-{
- if (rParam.bRegExp)
- // filter by regular expression.
- return false;
-
- if (!rParam.GetEntryCount())
- // No entries.
- return false;
-
- const ScQueryEntry& rEntry = rParam.GetEntry(0);
- if (rEntry.eOp != SC_EQUAL)
- return false;
-
- const ScQueryEntry::QueryItemsType& rItems = rEntry.GetQueryItems();
- if (rItems.size() != 1)
- // Multi-item query is not supported.
- return false;
-
- if (rItems[0].meType != ScQueryEntry::ByString)
- // Not by string equality.
- return false;
-
- return true;
-}
-#endif
-
-}
-
void ScInterpreter::CalculateLookup(bool bHLookup)
{
sal_uInt8 nParamCount = GetByte();
@@ -6722,18 +6685,9 @@ void ScInterpreter::CalculateLookup(bool bHLookup)
}
else
{
- if (isFilterByEqualString(aParam))
- {
- nRow = nRow1;
- bFound = true;
- }
- else
- {
- ScAddress aResultPos( nCol1, nRow1, nTab1);
- bFound = LookupQueryWithCache( aResultPos, aParam);
- nRow = aResultPos.Row();
- }
-
+ ScAddress aResultPos( nCol1, nRow1, nTab1);
+ bFound = LookupQueryWithCache( aResultPos, aParam);
+ nRow = aResultPos.Row();
nCol = nSpIndex;
}