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

New commits:
commit 4960c1ad663747257f1dc69a649f715a32a9e77e
Author: Eike Rathke <[email protected]>
Date:   Wed Mar 2 16:42:01 2016 +0100

    add warning for case sensitivity and Excel interoperability
    
    Change-Id: I79cc6d6c48225f8559339f65df99de838c2e7ae6

diff --git a/source/text/shared/optionen/01060500.xhp 
b/source/text/shared/optionen/01060500.xhp
index b38c766..5908f47 100644
--- a/source/text/shared/optionen/01060500.xhp
+++ b/source/text/shared/optionen/01060500.xhp
@@ -147,6 +147,7 @@
       <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" 
oldref="28">
          <emph>Example:</emph> Type the text 'Test' in cell A1; and the text 
'test' in B1. Then type the formula "=A1=B1" in cell C1. If the <emph>Case 
sensitive</emph> box is marked, FALSE will appear in the cell; otherwise, TRUE 
will appear in the cell.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3153965" role="note" l10n="U" 
oldref="29">The EXACT text function is always case-sensitive, independent of 
the settings in this dialog.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153966" role="warning" 
l10n="U">Disable case sensitivity for spreadsheets that need to be 
interoperable with Microsoft Excel.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/calc" 
id="bm_id3145766" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3145150" role="heading" level="2" l10n="U"
                  oldref="30">Precision as shown</paragraph>
commit c5437bed9c6c425b5ab30bc75734977f6fb0b049
Author: Eike Rathke <[email protected]>
Date:   Wed Mar 2 16:29:20 2016 +0100

    change role note to warning for Excel interoperability items
    
    ... to get the exclamation mark in online help.
    
    Change-Id: I0d8ecfb45aa02ae1e3215969317dfc74811f278c

diff --git a/source/text/shared/optionen/01060500.xhp 
b/source/text/shared/optionen/01060500.xhp
index 60882d0..b38c766 100644
--- a/source/text/shared/optionen/01060500.xhp
+++ b/source/text/shared/optionen/01060500.xhp
@@ -199,7 +199,7 @@
       </table>
 
       <paragraph xml-lang="en-US" id="par_id3148814" role="paragraph" l10n="U" 
oldref="44">If <emph>Search criteria = and &lt;&gt; 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>
+        <paragraph xml-lang="en-US" id="par_id3155096" role="warning" 
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/formulawildcards" 
id="bm_id3154420" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156449" role="heading" level="2" l10n="U"
@@ -216,21 +216,21 @@
             <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>
+        <paragraph xml-lang="en-US" id="par_id3155094" role="warning" 
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/formularegex" 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/formularegex">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>
+        <paragraph xml-lang="en-US" id="par_id3155095" role="warning" 
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/formulaliteral" id="bm_id3154421" 
localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156450" role="heading" level="2" l10n="U"
                  oldref="58">No wildcards or regular expressions in 
formulas</paragraph>
       <paragraph xml-lang="en-US" id="par_id3155097" role="paragraph" l10n="U" 
oldref="59"><ahelp 
hid="modules/scalc/ui/optcalculatepage/formulaliteral">Specifies that only 
literal strings are used 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>
-        <paragraph xml-lang="en-US" id="par_id3155098" role="note" l10n="U">Do 
not disable wildcards in formulas for spreadsheets that need to be 
interoperable with Microsoft Excel.</paragraph>
+        <paragraph xml-lang="en-US" id="par_id3155098" role="warning" 
l10n="U">Do not disable 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/lookup" id="bm_id3152901" 
localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156199" role="heading" level="2" l10n="U"
commit 70c98adeeb5a691a7945953344fd636d17e5b85c
Author: Eike Rathke <[email protected]>
Date:   Wed Mar 2 15:59:42 2016 +0100

    adapt to radiobutton group of dialog
    
    Change-Id: Icb1f3f1ae71c40e3ba65544486f2ff87eb60cd85

diff --git a/source/text/shared/optionen/01060500.xhp 
b/source/text/shared/optionen/01060500.xhp
index 59f79b8..60882d0 100644
--- a/source/text/shared/optionen/01060500.xhp
+++ b/source/text/shared/optionen/01060500.xhp
@@ -201,10 +201,10 @@
       <paragraph xml-lang="en-US" id="par_id3148814" role="paragraph" l10n="U" 
oldref="44">If <emph>Search criteria = and &lt;&gt; 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"/>
+<bookmark xml-lang="en-US" 
branch="hid/modules/scalc/ui/optcalculatepage/formulawildcards" 
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>
+        <paragraph xml-lang="en-US" id="par_id3155093" role="paragraph" 
l10n="U" oldref="60"><ahelp 
hid="modules/scalc/ui/optcalculatepage/formulawildcards">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>
@@ -218,13 +218,20 @@
         </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"/>
+<bookmark xml-lang="en-US" 
branch="hid/modules/scalc/ui/optcalculatepage/formularegex" 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 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.
+      <paragraph xml-lang="en-US" id="par_id3155092" role="paragraph" l10n="U" 
oldref="59"><ahelp 
hid="modules/scalc/ui/optcalculatepage/formularegex">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/formulaliteral" id="bm_id3154421" 
localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156450" role="heading" level="2" l10n="U"
+                 oldref="58">No wildcards or regular expressions in 
formulas</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155097" role="paragraph" l10n="U" 
oldref="59"><ahelp 
hid="modules/scalc/ui/optcalculatepage/formulaliteral">Specifies that only 
literal strings are used 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>
+        <paragraph xml-lang="en-US" id="par_id3155098" role="note" l10n="U">Do 
not disable 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/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>
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to