tdf161612 Precisions for XMATCH function Help page

Change-Id: Id50a01c9c33284124f022540ac51c1f1651848e7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/169007
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit 9f43bf5caf95051c06f0c08f326f8d864c501d58)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/169102

4 files changed, 22 insertions, 6 deletions

diff --git a/source/text/scalc/01/common_func.xhp b/source/text/scalc/01/common_func.xhp
index 4a3ac7a323..1d8fb882e4 100644
--- a/source/text/scalc/01/common_func.xhp
+++ b/source/text/scalc/01/common_func.xhp
@@ -37,7 +37,7 @@
         <note id="par_id301616845402409">This function ignores any text or empty cell within a data range. If you suspect wrong results from this function, look for text in the data ranges. To highlight text contents in a data range, use the <link href="text/scalc/01/03080000.xhp">value highlighting</link> feature.</note>
     </section>
     <section id="optional_args">
-        <note id="par_id431716730587722">Any of the optional arguments can be omitted. An optional argument is required to be preceded by the preceding separators.</note>
+        <note id="par_id431716730587722">Any of the optional arguments can be omitted. An optional argument requires all preceding separators to be present.</note>
     </section>
 </body>
 </helpdocument>
diff --git a/source/text/scalc/01/ful_func.xhp b/source/text/scalc/01/ful_func.xhp
index c31872347b..a2003e7a66 100644
--- a/source/text/scalc/01/ful_func.xhp
+++ b/source/text/scalc/01/ful_func.xhp
@@ -94,7 +94,7 @@
         <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>.</note>
+      <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 c3095969ef..d141816110 100644
--- a/source/text/scalc/01/func_xlookup.xhp
+++ b/source/text/scalc/01/func_xlookup.xhp
@@ -25,7 +25,7 @@
     <h1 id="hd_id821708279355736"><variable id="h1"><link href="text/scalc/01/func_xlookup.xhp">XLOOKUP</link></variable></h1>
     <paragraph id="par_id581708279355738" role="paragraph">Searches for a value in an array and returns a reference to a cell or range of cells.</paragraph>
 </section>
-<paragraph role="paragraph" id="par_id631708282151776">XLOOKUP function is a modern and flexible replacement for older functions like <link href="text/scalc/01/04060109.xhp#Section9">VLOOKUP</link>, <link href="text/scalc/01/04060109.xhp#Section17">HLOOKUP</link>, and <link href="text/scalc/01/04060109.xhp#Section14">LOOKUP</link>. XLOOKUP supports approximate and exact matching, wildcards (* ?) for partial matches, and lookups in vertical or horizontal ranges. XLOOKUP can perform a reverse search and offers a fast binary search option when working with large datasets.</paragraph>
+<paragraph role="paragraph" id="par_id631708282151776">XLOOKUP function is a modern and flexible replacement for older functions like <link href="text/scalc/01/04060109.xhp#Section9">VLOOKUP</link>, <link href="text/scalc/01/04060109.xhp#Section17">HLOOKUP</link>, and <link href="text/scalc/01/04060109.xhp#Section14">LOOKUP</link>. XLOOKUP supports approximate and exact matching, wildcards (* ?) or regular expressions for partial matches, and lookups in vertical or horizontal ranges. XLOOKUP can perform a reverse search and offers a fast binary search option when working with large datasets.</paragraph>
 
 <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/>
 <paragraph role="code" id="par_id211708281649651">XLOOKUP( [Lookup] ; Array ; Return [ ; [ NotFound ] [ ; [MatchType] [ ; SearchMode ] ] ] )</paragraph>
@@ -49,7 +49,7 @@
         <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.</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, or a match using <link href="text/shared/01/02100001.xhp">regular expressions</link>.</paragraph>
     </listitem>
     </list>
 </section>
@@ -71,8 +71,8 @@
         <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>
 </section>
-
 <embed href="text/scalc/01/common_func.xhp#optional_args"/>
 
 <embed href="text/scalc/01/ful_func.xhp#func_head_example"/>
diff --git a/source/text/scalc/01/func_xmatch.xhp b/source/text/scalc/01/func_xmatch.xhp
index 6595230a37..6e3a734dd8 100644
--- a/source/text/scalc/01/func_xmatch.xhp
+++ b/source/text/scalc/01/func_xmatch.xhp
@@ -31,9 +31,25 @@
 <paragraph role="code" id="par_id211708281649651">XMATCH(Lookup; Array [; MatchType [; SearchMode ] ] )</paragraph>
 <paragraph role="paragraph" id="par_id861708281340704"><emph>Lookup</emph>: The value of any type to search for in <emph>Array</emph>.</paragraph>
 <paragraph role="paragraph" id="par_id831708281625340"><emph>Array</emph>: is the reference of the array or range to search.</paragraph>
-<embed href="text/scalc/01/func_xlookup.xhp#matchmode"/>
+
+<paragraph role="paragraph" id="par_id121708281643207"><emph>MatchType</emph>: (optional) specifies the match type. Values can be:</paragraph>
+<list type="unordered">
+    <listitem>
+        <paragraph id="par_id111708281542144" role="listitem"><emph>0</emph>: exact match (default). If <emph>Lookup</emph> value is not found, then return the #N/A error.</paragraph>
+    </listitem>
+    <listitem>
+        <paragraph id="par_id851708281548335" role="listitem"><emph>-1</emph>: attempt exact match. If <emph>Lookup</emph> value is not found, then return the next smaller item.</paragraph>
+    </listitem>
+    <listitem>
+        <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>
+    </listitem>
+    </list>
 <embed href="text/scalc/01/func_xlookup.xhp#searchmode"/>
 <embed href="text/scalc/01/common_func.xhp#optional_args"/>
+
 <embed href="text/scalc/01/ful_func.xhp#func_head_example"/>
 <embed href="text/scalc/01/04060109.xhp#xmpl_periodic_elements"/>
 <paragraph role="paragraph" id="par_id471716753503759"><input>=XMATCH("Atomic Number",A1:A4)</input> returns 3, the third line of the A1:A4 array.</paragraph>