summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-06-27 17:26:44 +0300
committerEike Rathke <erack@redhat.com>2016-06-29 13:46:49 +0000
commit6fd975b1f6aca9fd26a202b4997a0485e1b8de46 (patch)
treefade741363dea87a206f4d5df281d63076de58ed
parent449a599109f4c16a384dba4df6cd953518396395 (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 (cherry picked from commit f948dce856d51704e1962553198015dbebb6e527) Reviewed-on: https://gerrit.libreoffice.org/26745 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
-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 a32b2f77fc04..c81594fd2d41 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2336,7 +2336,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:
@@ -2348,7 +2348,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;
@@ -2449,7 +2449,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:
@@ -2463,7 +2463,7 @@ void copyFirstStringBlock(
{
EditTextObject* pText = *it;
OUString aStr = ScEditUtil::GetString(*pText, &rDoc);
- *itArray = rPool.intern(aStr).getDataIgnoreCase();
+ *itArray = rPool.intern(aStr).getData();
}
}
break;