summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-06-27 17:26:44 +0300
committerTor Lillqvist <tml@collabora.com>2016-06-28 16:13:56 +0300
commitf948dce856d51704e1962553198015dbebb6e527 (patch)
tree512faf12f4d3075894271fb1067d9678c09cbcc4
parentc9f05625a7d34bed2229d59466420cd56f904c41 (diff)
tdf#75387: Don't case-fold strings for formula group calculations
There should be no need for it as far as I see. Possibly it made some sense back when we thought we could use OpenCL for operators and functions that are supposed to ignore the case of strings they handle. But we hopefully should never try to use OpenCL for string data nowadays anyway. And actually, the case-folding ended up affecting strings handled by the so-called software interpreter. For the tdf#75387, the sample sheet worked fine when OpenCL was enabled. Change-Id: I1c170ebf09551fea0964f394cdb3c65079672257
-rw-r--r--sc/source/core/data/column2.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index eccb7dcac668..7565a1aab560 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2337,7 +2337,7 @@ bool appendToBlock(
rCxt.ensureStrArray(rColArray, nArrayLen);
for (; itData != itDataEnd; ++itData, ++nPos)
- (*rColArray.mpStrArray)[nPos] = itData->getDataIgnoreCase();
+ (*rColArray.mpStrArray)[nPos] = itData->getData();
}
break;
case sc::element_type_edittext:
@@ -2349,7 +2349,7 @@ bool appendToBlock(
for (; itData != itDataEnd; ++itData, ++nPos)
{
OUString aStr = ScEditUtil::GetString(**itData, pDoc);
- (*rColArray.mpStrArray)[nPos] = rPool.intern(aStr).getDataIgnoreCase();
+ (*rColArray.mpStrArray)[nPos] = rPool.intern(aStr).getData();
}
}
break;
@@ -2450,7 +2450,7 @@ void copyFirstStringBlock(
sc::string_block::iterator itEnd = it;
std::advance(itEnd, nLen);
for (; it != itEnd; ++it, ++itArray)
- *itArray = it->getDataIgnoreCase();
+ *itArray = it->getData();
}
break;
case sc::element_type_edittext:
@@ -2464,7 +2464,7 @@ void copyFirstStringBlock(
{
EditTextObject* pText = *it;
OUString aStr = ScEditUtil::GetString(*pText, &rDoc);
- *itArray = rPool.intern(aStr).getDataIgnoreCase();
+ *itArray = rPool.intern(aStr).getData();
}
}
break;