source/text/scalc/01/ful_func.xhp | 3 --- source/text/scalc/01/func_xlookup.xhp | 8 +++++--- source/text/scalc/01/func_xmatch.xhp | 5 ++++- source/text/shared/01/02100001.xhp | 4 +++- 4 files changed, 12 insertions(+), 8 deletions(-)
New commits: commit 2f68941ab30515f5ae7e1bbaa2a8e119714f7489 Author: Olivier Hallot <[email protected]> AuthorDate: Fri Jun 21 09:34:05 2024 -0300 Commit: Olivier Hallot <[email protected]> CommitDate: Thu Jul 4 16:20:37 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 <[email protected]> Reviewed-by: Olivier Hallot <[email protected]> Tested-by: Jenkins (cherry picked from commit 9acd72cd9faa94ec85826293f1e95da3e6175d35) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/169962 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"/> commit ace610a82455c9fe944ce394cbb85afe813951fe Author: Pierre F <[email protected]> AuthorDate: Mon Jun 24 13:07:39 2024 +0200 Commit: Olivier Hallot <[email protected]> CommitDate: Thu Jul 4 16:20:16 2024 +0200 fix typo Change-Id: I353e1a52697f5d7ac055ad870d1415885a3b5a5a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/169439 Reviewed-by: Olivier Hallot <[email protected]> Tested-by: Jenkins (cherry picked from commit c796230a7363073c9763dff5d157fd5711ba590d) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/169961 diff --git a/source/text/shared/01/02100001.xhp b/source/text/shared/01/02100001.xhp index ffb5b2905d..dc184e775e 100644 --- a/source/text/shared/01/02100001.xhp +++ b/source/text/shared/01/02100001.xhp @@ -271,7 +271,7 @@ </tablerow> <tablerow> <tablecell> - <paragraph id="par_id3152855" localize="false" role="tablecontent"> </paragraph> + <paragraph id="par_id3152855" localize="false" role="tablecontent">\d</paragraph> <paragraph id="par_id3152885" localize="false" role="tablecontent">[:digit:]</paragraph> </tablecell> <tablecell> commit 92a38c452c2e71463a3331431fbc24b6e3d3c6c0 Author: Pierre F <[email protected]> AuthorDate: Sun Jun 23 17:53:30 2024 +0200 Commit: Olivier Hallot <[email protected]> CommitDate: Thu Jul 4 16:15:20 2024 +0200 explicit \s and \d + put the note first for full ICU spec. tdf#113975 Change-Id: Ie06115c051def1da7b94357a392796d15a21df34 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/169402 Tested-by: Jenkins Reviewed-by: Olivier Hallot <[email protected]> (cherry picked from commit ade7397aed9febc73918d93ffdf6477d3f4d4175) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/169960 diff --git a/source/text/shared/01/02100001.xhp b/source/text/shared/01/02100001.xhp index 33925f27dc..ffb5b2905d 100644 --- a/source/text/shared/01/02100001.xhp +++ b/source/text/shared/01/02100001.xhp @@ -39,6 +39,7 @@ <bookmark_value>ampersand symbol, see also operators</bookmark_value> </bookmark><comment>mw added "replacing;" and "tab stops;"</comment> <h1 id="hd_id3146765"><variable id="02100001"><link href="text/shared/01/02100001.xhp">List of Regular Expressions</link></variable></h1> +<note id="par_id5311440">For a full list of supported metacharacters and syntax, see <link href="https://unicode-org.github.io/icu/userguide/strings/regexp.html#regular-expression-metacharacters";>ICU Regular Expressions documentation</link></note> <table id="tbl_id3149517"> <tablerow> <tablecell> @@ -270,6 +271,7 @@ </tablerow> <tablerow> <tablecell> + <paragraph id="par_id3152855" localize="false" role="tablecontent"> </paragraph> <paragraph id="par_id3152885" localize="false" role="tablecontent">[:digit:]</paragraph> </tablecell> <tablecell> @@ -286,6 +288,7 @@ </tablerow> <tablerow> <tablecell> + <paragraph id="par_id3153722" localize="false" role="tablecontent">\s</paragraph> <paragraph id="par_id3153726" localize="false" role="tablecontent">[:space:]</paragraph> </tablecell> <tablecell> @@ -325,7 +328,6 @@ </tablecell> </tablerow> </table> -<note id="par_id5311440">For a full list of supported metacharacters and syntax, see <link href="https://unicode-org.github.io/icu/userguide/strings/regexp.html#regular-expression-metacharacters";>ICU Regular Expressions documentation</link></note> <paragraph role="paragraph" id="par_id261559577375317">Regular expression terms can be combined to form complex and sophisticated regular expressions for searches as show in the following examples.</paragraph> <h2 id="hd_id5311441">Examples</h2>
