diff options
| author | Balazs Varga <balazs.varga.extern@allotropia.de> | 2024-04-11 21:49:21 +0200 |
|---|---|---|
| committer | Balazs Varga <balazs.varga.extern@allotropia.de> | 2024-04-12 10:22:59 +0200 |
| commit | 51abf44808c6793a184e986b62c0786753e11ded (patch) | |
| tree | 90a5466dd6fad321d2ef01065490ccb74b06f896 /sc | |
| parent | 83d04e5a59b762d7edce0fcfaabbba1e26129a27 (diff) | |
Related: tdf#127293 Fix regex search mode in XLOOKUP wildcards mode
If relevant Option in Calc was set for regex, xlookup still used the
wildcard search mode.
Change-Id: I318c3f368b6f59644c43ec518542910be72a5e0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166015
Tested-by: Jenkins
Reviewed-by: Balazs Varga <balazs.varga.extern@allotropia.de>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/interpr1.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 8ea81b336641..6f3c3304e627 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -11455,14 +11455,7 @@ bool ScInterpreter::SearchVectorForValue( VectorSearchArguments& vsa ) if ( mrDoc.IsInVBAMode() ) rParam.eSearchType = utl::SearchParam::SearchType::Wildcard; else - { - // set searchtype hard to wildcard or regexp if applicable, the XLOOKUP - // argument prevails over the configuration setting - if ( MayBeWildcard( vsa.sSearchStr.getString() ) ) - rParam.eSearchType = utl::SearchParam::SearchType::Wildcard; - else if ( MayBeRegExp( vsa.sSearchStr.getString() ) ) - rParam.eSearchType = utl::SearchParam::SearchType::Regexp; - } + rParam.eSearchType = DetectSearchType(vsa.sSearchStr.getString(), mrDoc); } } else |