diff options
| author | Eike Rathke <erack@redhat.com> | 2013-12-04 00:29:29 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-12-04 00:40:39 +0100 |
| commit | 507afd9531a89e5c8ec07514a8f741ce21a0b78d (patch) | |
| tree | 95ca4f9733c34c47b81f0ab3ac659f3400ec2ac7 /sc/source/core | |
| parent | 90102d0832b2bc173b09188604aa311f17c19bbe (diff) | |
resolved fdo#72288 made case insensitive matrix string query work again
The SharedString stored at ScQueryEntry::Item was constructed from an
OUString passed from ScMatrixValue::GetString() so
rItem.maString.getDataIgnoreCase() in QueryEvaluator::compareByString()
was NULL and never evaluated equal. Made ScMatrixValue::GetString()
return a SharedString instead.
Change-Id: I473d5724dfb97707fea58e6b72b1396c049b79c8
(cherry picked from commit 882665d821a2fc705b7ae03372c2ae7593028210)
Diffstat (limited to 'sc/source/core')
| -rw-r--r-- | sc/source/core/data/validat.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 0adc60a40eb2..b7e51bad3cbf 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -731,7 +731,7 @@ bool ScValidationData::GetSelectionFromFormula( // strings and empties if( ScMatrix::IsNonValueType( nMatVal.nType ) ) { - aValStr = nMatVal.GetString(); + aValStr = nMatVal.GetString().getString(); if( NULL != pStrings ) pEntry = new ScTypedStrData( aValStr, 0.0, ScTypedStrData::Standard); diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index c70fdf410fa1..6983d3e8ac14 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -1855,7 +1855,7 @@ void ScInterpreter::QueryMatrixType(ScMatrixRef& xMat, short& rRetTypeExpr, sal_ } else { - OUString aStr( nMatVal.GetString()); + svl::SharedString aStr( nMatVal.GetString()); FormulaTokenRef xRes = new FormulaStringToken( aStr); PushTempToken( new ScMatrixCellResultToken( xMat, xRes.get())); rRetTypeExpr = NUMBERFORMAT_TEXT; |