sc/source/core/data/table3.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 59dbaff0d98c747f1792b17931d8363daf556238 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Apr 16 16:25:06 2018 +0200 Only relevant whether mpTestEqualCondition is non-null ...so change it from 'const bool*' to just 'bool' Change-Id: Ibc36058f2faab565162cd05f6e798ecaae094dc1 Reviewed-on: https://gerrit.libreoffice.org/52990 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoff...@kohei.us> diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 5704a4ec59f1..3e94e174e8b3 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -2262,7 +2262,7 @@ class QueryEvaluator svl::SharedStringPool& mrStrPool; const ScTable& mrTab; const ScQueryParam& mrParam; - const bool* mpTestEqualCondition; + bool mpTestEqualCondition; utl::TransliterationWrapper* mpTransliteration; CollatorWrapper* mpCollator; const bool mbMatchWholeCell; @@ -2336,7 +2336,7 @@ class QueryEvaluator public: QueryEvaluator(ScDocument& rDoc, const ScTable& rTab, const ScQueryParam& rParam, - const bool* pTestEqualCondition) : + bool pTestEqualCondition) : mrDoc(rDoc), mrStrPool(rDoc.GetSharedStringPool()), mrTab(rTab), @@ -2767,7 +2767,7 @@ bool ScTable::ValidQuery( bool* pTest = ( nEntryCount <= nFixedBools ? &aTest[0] : new bool[nEntryCount] ); long nPos = -1; - QueryEvaluator aEval(*pDocument, *this, rParam, pbTestEqualCondition); + QueryEvaluator aEval(*pDocument, *this, rParam, pbTestEqualCondition != nullptr); ScQueryParam::const_iterator it, itBeg = rParam.begin(), itEnd = rParam.end(); for (it = itBeg; it != itEnd && (*it)->bDoQuery; ++it) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits