[Libreoffice-commits] help.git: source/text

Eike Rathke erack at redhat.com
Tue Feb 23 00:57:03 UTC 2016


 source/text/shared/optionen/01060500.xhp |   35 ++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

New commits:
commit 9f7b898faa8a58c8489cdfaa36a9445497ad5751
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Feb 23 01:54:52 2016 +0100

    add help content for wildcards option, tdf#72196
    
    ... and notes about Excel interoperability with whole cell match and
    wildcards, non-interoperability with regular expressions.
    
    Change-Id: I1425ba60ba09a60f0d82adb3f728cb1d1bff2cab

diff --git a/source/text/shared/optionen/01060500.xhp b/source/text/shared/optionen/01060500.xhp
index 43e95da..59f79b8 100644
--- a/source/text/shared/optionen/01060500.xhp
+++ b/source/text/shared/optionen/01060500.xhp
@@ -154,11 +154,11 @@
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/match" id="bm_id3150364" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3152581" role="heading" level="2" l10n="U"
                  oldref="32">Search criteria = and <> must apply to whole cells</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149211" role="paragraph" l10n="CHG" oldref="33"><ahelp hid="modules/scalc/ui/optcalculatepage/match">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When the <emph>Search criteria = and <> must apply to whole cells</emph> box is marked, $[officename] Calc behaves exactly as MS Excel when searching cells in the database functions.</ahelp></paragraph>
+               <paragraph xml-lang="en-US" id="par_id3149211" role="paragraph" l10n="CHG" oldref="33"><ahelp hid="modules/scalc/ui/optcalculatepage/match">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When both, the <emph>Search criteria = and <> must apply to whole cells</emph> box and the <emph>Enable wildcards in formulas</emph> box are marked, $[officename] Calc behaves exactly as Microsoft Excel when searching cells in the database functions.</ahelp></paragraph>
       <table id="tbl_id3149814">
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3148422" role="tablehead" l10n="U" oldref="34">.* in following position:</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3148422" role="tablehead" l10n="U" oldref="34">* in following position:</paragraph>
             </tablecell>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3156139" role="tablehead" l10n="U" oldref="35">Search result:</paragraph>
@@ -174,7 +174,7 @@
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3153782" role="tablecontent" l10n="U" oldref="38">win.*</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153782" role="tablecontent" l10n="U" oldref="38">win*</paragraph>
             </tablecell>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3151278" role="tablecontent" l10n="U" oldref="39">Finds win and win95, but not os2win or upwind</paragraph>
@@ -182,7 +182,7 @@
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3155506" role="tablecontent" l10n="U" oldref="40">.*win</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3155506" role="tablecontent" l10n="U" oldref="40">*win</paragraph>
             </tablecell>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3150886" role="tablecontent" l10n="U" oldref="41">Finds win and os2win, but not win95 or upwind</paragraph>
@@ -190,7 +190,7 @@
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3147167" role="tablecontent" l10n="U" oldref="42">.*win.*</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3147167" role="tablecontent" l10n="U" oldref="42">*win*</paragraph>
             </tablecell>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id3152985" role="tablecontent" l10n="U" oldref="43">Finds win, win95, os2win, and upwind</paragraph>
@@ -198,12 +198,33 @@
          </tablerow>
       </table>
 
-      <paragraph xml-lang="en-US" id="par_id3148814" role="paragraph" l10n="U" oldref="44">If <emph>Search criteria = and <> must apply to whole cells </emph>is not enabled, the "win" search pattern acts like ".*win.*". The search pattern can be at any position within the cell when searching with the Calc database functions.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148814" role="paragraph" l10n="U" oldref="44">If <emph>Search criteria = and <> must apply to whole cells </emph>is not enabled, the "win" search pattern acts like "*win*". The search pattern can be at any position within the cell when searching with the Calc database functions.</paragraph>
+        <paragraph xml-lang="en-US" id="par_id3155096" role="note" l10n="U">Enable whole cell match for spreadsheets that need to be interoperable with Microsoft Excel.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/wildcards" id="bm_id3154420" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156449" role="heading" level="2" l10n="U"
+                 oldref="58">Enable wildcards in formulas</paragraph>
+        <paragraph xml-lang="en-US" id="par_id3155093" role="paragraph" l10n="U" oldref="60"><ahelp hid="modules/scalc/ui/optcalculatepage/wildcards">Specifies that wildcards are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP, MATCH, AVERAGEIF, AVERAGEIFS, COUNTIF, COUNTIFS, SUMIF, SUMIFS and SEARCH.</caseinline></switchinline></paragraph>
+        <list type="unordered">
+          <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155100" role="listitem" l10n="U"><emph>?</emph> (question mark) matches any single character</paragraph>
+          </listitem>
+          <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155101" role="listitem" l10n="U"><emph>*</emph> (asterisk) matches any sequence of characters, including an empty string</paragraph>
+          </listitem>
+          <listitem>
+            <paragraph xml-lang="en-US" id="par_id3155102" role="listitem" l10n="U"><emph>~</emph> (tilde) escapes the special meaning of a question mark, asterisk or tilde character that follows immediately after the tilde character</paragraph>
+          </listitem>
+        </list>
+        <paragraph xml-lang="en-US" id="par_id3155094" role="note" l10n="U">Enable wildcards in formulas for spreadsheets that need to be interoperable with Microsoft Excel.</paragraph>
+
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/regex" id="bm_id3154419" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156448" role="heading" level="2" l10n="U"
                  oldref="58">Enable regular expressions in formulas</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3155092" role="paragraph" l10n="U" oldref="59"><ahelp hid="modules/scalc/ui/optcalculatepage/regex">Specifies that regular expressions are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP and SEARCH.
+      <paragraph xml-lang="en-US" id="par_id3155092" role="paragraph" l10n="U" oldref="59"><ahelp hid="modules/scalc/ui/optcalculatepage/regex">Specifies that regular expressions instead of simple wildcards are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP, MATCH, AVERAGEIF, AVERAGEIFS, COUNTIF, COUNTIFS, SUMIF, SUMIFS and SEARCH.
 </caseinline></switchinline><comment>Sorry, no more switches allowed inside AVIS tags</comment></paragraph>
+        <paragraph xml-lang="en-US" id="par_id3155095" role="note" l10n="U">Do not enable regular expressions in formulas for spreadsheets that need to be interoperable with Microsoft Excel.</paragraph>
+
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/lookup" id="bm_id3152901" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156199" role="heading" level="2" l10n="U"
                  oldref="55">Automatically find column and row labels</paragraph>


More information about the Libreoffice-commits mailing list