diff options
| author | Eike Rathke <erack@redhat.com> | 2015-03-20 11:10:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-03-20 12:04:52 +0000 |
| commit | 53fd20770d7f425ca99e807bb4b45eafa9b47aad (patch) | |
| tree | f0d5824802523b81ec53a9b9944f79fad28e8a2d /sc | |
| parent | 17f741678ea58841ba463465f22eeb6b83c40bc3 (diff) | |
Resolves: tdf#89958 filter ends with / does not end with correction
Regression of 8850633fe4cdac306c35caab1a0d14c13d9df864 String to
OUString and xub_StrLen to sal_Int32 conversion, it worked by accident
only anyway..
Change-Id: Id6fea7075949b98e58294d9fdaae4313f69f9b55
(cherry picked from commit 9e2e9453cbca9399e1c670b354cfc3c23d70307f)
Reviewed-on: https://gerrit.libreoffice.org/14921
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/table3.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 4637e744e8b0..4ec4b420afaf 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -2509,9 +2509,9 @@ public: OUString aQuer( mpTransliteration->transliterate( aQueryStr, ScGlobal::eLnge, 0, aQueryStr.getLength(), NULL ) ); - sal_Int32 nIndex = (rEntry.eOp == SC_ENDS_WITH - || rEntry.eOp == SC_DOES_NOT_END_WITH) ? (aCell.getLength()-aQuer.getLength()) : 0; - sal_Int32 nStrPos = aCell.indexOf( aQuer, nIndex ); + sal_Int32 nIndex = (rEntry.eOp == SC_ENDS_WITH || rEntry.eOp == SC_DOES_NOT_END_WITH) ? + (aCell.getLength() - aQuer.getLength()) : 0; + sal_Int32 nStrPos = ((nIndex < 0) ? -1 : aCell.indexOf( aQuer, nIndex )); switch (rEntry.eOp) { case SC_EQUAL: @@ -2529,10 +2529,10 @@ public: bOk = ( nStrPos != 0 ); break; case SC_ENDS_WITH: - bOk = ( nStrPos + aQuer.getLength() == aCell.getLength() ); + bOk = (nStrPos >= 0 && nStrPos + aQuer.getLength() == aCell.getLength() ); break; case SC_DOES_NOT_END_WITH: - bOk = ( nStrPos + aQuer.getLength() != aCell.getLength() ); + bOk = (nStrPos < 0 || nStrPos + aQuer.getLength() != aCell.getLength() ); break; default: { |