source/text/scalc/01/ful_func.xhp | 3 ---
source/text/scalc/01/func_xlookup.xhp | 8 +++++---
source/text/scalc/01/func_xmatch.xhp | 5 ++++-
3 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 9acd72cd9faa94ec85826293f1e95da3e6175d35
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Fri Jun 21 09:34:05 2024 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Sun Jun 23 09:20:16 2024 +0200
tdf#159596 tdf#159771 Update XMATCH and XLOOKUP pages
+ Added 3 as matchtype
+ removed reference for "search-criteria-must-apply-to-whole-cell"
+ set that matchtype 2 and 3 cannot be combined with binary search.
Change-Id: I1fd2171aa92fb0a2df1c9ee85a1fb5f7f755efdb
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/169334
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Tested-by: Jenkins
diff --git a/source/text/scalc/01/ful_func.xhp
b/source/text/scalc/01/ful_func.xhp
index a2003e7a66..1681a65bc6 100644
--- a/source/text/scalc/01/ful_func.xhp
+++ b/source/text/scalc/01/ful_func.xhp
@@ -93,8 +93,5 @@
<section id="func_volatile">
<paragraph role="paragraph" id="par_id1001601332672155">This function
is always recalculated whenever a recalculation occurs.</paragraph>
</section>
- <section id="func_case_sensitive">
- <note id="par_id711715953325962">The function is always <emph>case
insensitive</emph>, independent from the setting of <emph>Case sensitive</emph>
checkbox in <switchinline select="sys"><caseinline
select="MAC"><menuitem>%PRODUCTNAME -
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools -
Options</menuitem></defaultinline></switchinline> - <link
href="text/shared/optionen/01060500.xhp"><menuitem>%PRODUCTNAME Calc -
Calculate</menuitem></link>. You can however, use the mode modifier
<emph>(?-i)</emph> in <link href="text/shared/01/02100001.xhp">regular
expressions</link> to force search for a case-sensitive match.</note>
- </section>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/func_xlookup.xhp
b/source/text/scalc/01/func_xlookup.xhp
index d141816110..9c06c3e61d 100644
--- a/source/text/scalc/01/func_xlookup.xhp
+++ b/source/text/scalc/01/func_xlookup.xhp
@@ -49,14 +49,16 @@
<paragraph id="par_id801708281553430" role="listitem"><emph>1</emph>:
attempt exact match. If <emph>Lookup</emph> value is not found, then return the
next larger item.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id881708281558005" role="listitem"><emph>2</emph>:
a <link href="text/scalc/guide/wildcards.xhp">wildcard</link> match where
characters *, ?, and ~ have special meanings, or a match using <link
href="text/shared/01/02100001.xhp">regular expressions</link>.</paragraph>
+ <paragraph id="par_id881708281558005" role="listitem"><emph>2</emph>:
a <link href="text/scalc/guide/wildcards.xhp">wildcard</link> match where
characters *, ?, and ~ have special meanings.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph role="listitem" id="par_id111718970605394"><emph>3</emph>: a
<link href="text/shared/01/02100001.xhp">regular expression</link>
match.</paragraph>
</listitem>
</list>
</section>
<section id="searchmode">
<paragraph role="paragraph"
id="par_id871708281607313"><emph>SearchMode</emph>: (optional) specifies the
search mode to use.</paragraph>
- <embed href="text/scalc/01/ful_func.xhp#func_case_sensitive"/>
<list type="unordered">
<listitem>
<paragraph id="par_id281708281579757" role="listitem"><emph>1</emph>:
returns the first occurrence starting from the first item of <emph>Array</emph>
(default).</paragraph>
@@ -71,7 +73,7 @@
<paragraph id="par_id561708281595885" role="listitem"><emph>-2</emph>:
binary search that relies on <emph>Array</emph> being sorted in descending
order. If not sorted, invalid results will be returned.</paragraph>
</listitem>
</list>
- <warning id="par_id551718627629229"><emph>MatchType</emph> value 2 cannot
be combined with binary search (<emph>SearchMode</emph> value <emph>2</emph> or
<emph>-2</emph>).</warning>
+ <warning id="par_id551718627629229"><emph>MatchType</emph> values 2 and 3
cannot be combined with binary search (<emph>SearchMode</emph> value
<emph>2</emph> or <emph>-2</emph>).</warning>
</section>
<embed href="text/scalc/01/common_func.xhp#optional_args"/>
diff --git a/source/text/scalc/01/func_xmatch.xhp
b/source/text/scalc/01/func_xmatch.xhp
index 6e3a734dd8..8a14e52a28 100644
--- a/source/text/scalc/01/func_xmatch.xhp
+++ b/source/text/scalc/01/func_xmatch.xhp
@@ -44,7 +44,10 @@
<paragraph id="par_id801708281553430" role="listitem"><emph>1</emph>:
attempt exact match. If <emph>Lookup</emph> value is not found, then return the
next larger item.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id881708281558005" role="listitem"><emph>2</emph>:
a <link href="text/scalc/guide/wildcards.xhp">wildcard</link> match where
characters *, ?, and ~ have special meanings, or a match using <link
href="text/shared/01/02100001.xhp">regular expressions</link>.</paragraph>
+ <paragraph id="par_id881708281558005" role="listitem"><emph>2</emph>:
a <link href="text/scalc/guide/wildcards.xhp">wildcard</link> match where
characters *, ?, and ~ have special meanings.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph role="listitem" id="par_id111718970605394"><emph>3</emph>: a
<link href="text/shared/01/02100001.xhp">regular expression</link>
match.</paragraph>
</listitem>
</list>
<embed href="text/scalc/01/func_xlookup.xhp#searchmode"/>
