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

Olivier Hallot olivier.hallot at libreoffice.org
Thu Sep 21 12:30:34 UTC 2017


 source/text/scalc/01/04060107.xhp        |    3 
 source/text/shared/optionen/01060900.xhp |  185 ++++++++++++++++---------------
 2 files changed, 103 insertions(+), 85 deletions(-)

New commits:
commit c25389900adcc9915010b1867aa37e691ea05a62
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date:   Wed Sep 20 19:08:06 2017 -0300

    tdf#108090 Clarify array separators in help pages
    
    Change-Id: I60ddea24020d5775a373b1a06b1bdfa8f33d3c5d
    Reviewed-on: https://gerrit.libreoffice.org/42571
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
    Tested-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/source/text/scalc/01/04060107.xhp b/source/text/scalc/01/04060107.xhp
index 92ec7c4ad..b9cd4e3e1 100644
--- a/source/text/scalc/01/04060107.xhp
+++ b/source/text/scalc/01/04060107.xhp
@@ -134,11 +134,12 @@
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter instead of the Enter key. Only then does the formula become an array formula.</paragraph>
 <paragraph id="par_id3151120" role="note" xml-lang="en-US">Array formulas appear in braces in $[officename] Calc. You cannot create array formulas by manually entering the braces.</paragraph>
 </section>
-<paragraph id="par_id3154342" role="paragraph" xml-lang="en-US">The cells in a results array are automatically protected against changes. However, you can edit or copy the array formula by selecting the entire array cell range.</paragraph>
+<paragraph id="par_id3154342" role="warning" xml-lang="en-US">The cells in a results array are automatically protected against changes. However, you can edit or copy the array formula by selecting the entire array cell range.</paragraph>
 
 <paragraph id="hd_id8834803" role="heading" level="3" xml-lang="en-US">Using Inline Array Constants in Formulas</paragraph>
 <paragraph id="par_id985747" role="paragraph" xml-lang="en-US">Calc supports inline matrix/array constants in formulas. An inline array is surrounded by curly braces '{' and '}'. Elements can be each a number (including negatives), a logical constant (TRUE, FALSE), or a literal string. Non-constant expressions are not allowed. Arrays can be entered with one or more rows, and one or more columns. All rows must consist of the same number of elements, all columns must consist of the same number of elements.</paragraph>
 <paragraph id="par_id936613" role="paragraph" xml-lang="en-US">The column separator (separating elements in one row) and the row separator are language and locale dependent. But in this help content, the ';' semicolon and '|' pipe symbol are used to indicate the column and row separators, respectively. For example, in the English locale, the ',' comma is used as the column separator, while the ';' semicolon is used as the row separator.</paragraph>
+<paragraph id="par_id936615" role="tip" xml-lang="en-US">The row and column separator can be seen and altered in <item type="menuitem">Tools - Options - Calc - Formula - Separators</item>.</paragraph>
 <paragraph id="par_id1877498" role="paragraph" xml-lang="en-US">Arrays can not be nested.</paragraph>
 <paragraph id="par_id4262520" role="paragraph" xml-lang="en-US"><emph>Examples:</emph></paragraph>
 <paragraph id="par_id9387493" role="code" xml-lang="en-US">={1;2;3}</paragraph>
diff --git a/source/text/shared/optionen/01060900.xhp b/source/text/shared/optionen/01060900.xhp
index 5c6989cbc..79622c8bd 100644
--- a/source/text/shared/optionen/01060900.xhp
+++ b/source/text/shared/optionen/01060900.xhp
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -8,91 +7,109 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 
 <meta>
-    <topic id="textsharedoptionen01060900xml" indexer="include" status="PUBLISH">
-       <title xml-lang="en-US" id="tit">Formula</title>
-       <filename>/text/shared/optionen/01060900.xhp</filename>
-    </topic>
+  <topic id="textsharedoptionen01060900xml" indexer="include" status="PUBLISH">
+    <title id="tit" xml-lang="en-US">Formula</title>
+    <filename>/text/shared/optionen/01060900.xhp</filename>
+  </topic>
 </meta>
+
 <body>
-    <section id="formula">
-    <bookmark xml-lang="en-US" branch="index" id="bm_id4249399">
-        <bookmark_value>formula options;formula syntax</bookmark_value>
-        <bookmark_value>formula options;separators</bookmark_value>
-        <bookmark_value>formula options;reference syntax in string parameters</bookmark_value>
-        <bookmark_value>formula options;recalculating spreadsheets</bookmark_value>
-        <bookmark_value>formula options;large spreadsheet files</bookmark_value>
-        <bookmark_value>formula options;loading spreadsheet files</bookmark_value>
-        <bookmark_value>separators;function</bookmark_value>
-        <bookmark_value>separators;array column</bookmark_value>
-        <bookmark_value>separators;array row</bookmark_value>
-        <bookmark_value>recalculating;formula options</bookmark_value>
-        <bookmark_value>recalculating;large spreadsheet files</bookmark_value>
-        <bookmark_value>loading;large spreadsheet files</bookmark_value>
-    </bookmark>
-    <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optformula/OptFormula" id="bm_id3149095" localize="false"/>
-    <paragraph xml-lang="en-US" id="hd_id3145071" role="heading" level="1"><link href="text/shared/optionen/01060900.xhp" name="Formula">Formula</link></paragraph>
-    <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph"><ahelp hid=".">Defines formula syntax options and loading options for %PRODUCTNAME Calc.</ahelp></paragraph>
-    </section>
-    <section id="howtoget">
-       <embed href="text/shared/00/00000406.xhp#exopfo"/>
-    </section>
-    <paragraph xml-lang="en-US" id="hd_id3149399" role="heading" level="2">Formula options</paragraph>
-    <paragraph xml-lang="en-US" id="hd_id31493991" role="heading" level="3">Formula syntax</paragraph>
-    <paragraph xml-lang="en-US" id="par_id3155419" role="paragraph">There are three options. Let's see it by example. In a sample spreadsheet there are two worksheets, Sheet1 and Sheet2. In A1 cell of Sheet1 there is a reference to C4 cell of Sheet2.</paragraph>
-    <list type="unordered">
-       <listitem>
-        <paragraph xml-lang="en-US" id="par_id3156155" role="listitem"><emph>Calc A1</emph> - This is the default of %PRODUCTNAME Calc. The reference will be <item type="input">=$Sheet2.C4</item></paragraph>
-       </listitem>
-       <listitem>
-        <paragraph xml-lang="en-US" id="par_id3147530" role="listitem"><emph>Excel A1</emph> - This is the default of Microsoft Excel. The reference will be <item type="input">=Sheet2!C4</item></paragraph>
-       </listitem>
-       <listitem>
-        <paragraph xml-lang="en-US" id="par_id3153061" role="listitem"><emph>Excel R1C1</emph> - This is the relative row/column addressing, known from Microsoft Excel. The reference will be <item type="input">=Sheet2!R[3]C[2]</item></paragraph>
-       </listitem>
-    </list>
-    <paragraph xml-lang="en-US" id="hd_id31493992" role="heading" level="3">Use English function names</paragraph>
-    <paragraph xml-lang="en-US" id="par_id4155419" role="paragraph">In %PRODUCTNAME Calc function names can be localized. By default, the check box is off, which means the localized function names are used. Checking this check box will swap localized function names with the English ones. This change takes effect in all of the following areas: formula input and display, function wizard, and formula tips. You can of course uncheck it to go back to the localized function names.</paragraph>
-    <paragraph xml-lang="en-US" id="hd_id4149399" role="heading" level="2">Separators</paragraph>
-    <paragraph xml-lang="en-US" id="par_id5155419" role="paragraph">This option group lets you configure separators in your formula expressions. This comes in handy when, for instance, you want to separate your function parameters by commas (,) instead of semicolons (;).</paragraph>
-    <paragraph xml-lang="en-US" id="par_id6155419" role="paragraph">For example, instead of <item type="input">=SUM(A1;B1;C1)</item> you can type <item type="input">=SUM(A1,B1,C1)</item>.</paragraph>
-    <paragraph xml-lang="en-US" id="par_id7155419" role="paragraph">Likewise, you can also change the column and row separators for in-line arrays. Previously, an in-line array used semicolons (;) as the column separators and the pipe symbols (|) as the row separators, so a typical in-line array expression looked like this for a 5 x 2 matrix array:</paragraph>
-    <paragraph xml-lang="en-US" id="par_id8155419" role="paragraph"><item type="input">={1;2;3;4;5|6;7;8;9;10}</item></paragraph>
-    <paragraph xml-lang="en-US" id="par_id9155419" role="paragraph">By changing the column separators to commas (,) and the row separators to semicolons (;), the same expression will look like this:</paragraph>
-    <paragraph xml-lang="en-US" id="par_id0155419" role="paragraph"><item type="input">={1,2,3,4,5;6,7,8,9,10}</item></paragraph>
-    <paragraph xml-lang="en-US" id="hd_id5149399" role="heading" level="2">Detailed calculation settings</paragraph>
-    <paragraph xml-lang="en-US" id="par_id1015549" role="paragraph">Here you can configure the formula syntax to use when parsing references given in string parameters. This affects built-in functions such as INDIRECT that takes a reference as a string value.</paragraph>
-    <paragraph xml-lang="en-US" id="hd_id5149400" role="heading" level="2">Recalculation on File Load</paragraph>
-<paragraph xml-lang="en-US" id="par_id2335549" role="paragraph">Recalculating formulas can take significant time while loading very large files.</paragraph>
-<paragraph xml-lang="en-US" id="par_id2115549" role="heading" level="3">Excel 2007 and newer:</paragraph>
-<paragraph xml-lang="en-US" id="par_id2015549" role="paragraph">
-Loading a large spreadsheet file can take a long time. If you don't need to update your large spreadsheet data immediately, you can postpone the recalculation at a better time.
-%PRODUCTNAME allows you to defer recalculation of Excel 2007 (and above) spreadsheets to speedup loading time.
-</paragraph>
-<paragraph xml-lang="en-US" id="par_id2215549" role="heading" level="3">ODF Spreadsheet (not saved by %PRODUCTNAME):</paragraph>
-<paragraph xml-lang="en-US" id="par_id2016549" role="paragraph">
-Recent versions of %PRODUCTNAME caches spreadsheet formula results into its ODF file.
-This feature helps %PRODUCTNAME to recalculate a large ODF spreadsheet saved by %PRODUCTNAME faster.
-</paragraph>
-<paragraph xml-lang="en-US" id="par_id2017549" role="paragraph">
-For ODF spreadsheets saved by other programs, where such cached formula results may not exist, recalculation can be deferred to speedup file loading as with Excel 2007 files.
-</paragraph>
-<paragraph xml-lang="en-US" id="par_id2315549" role="paragraph">For the entries above the following choices are possible:</paragraph>
-    <list type="unordered">
-       <listitem>
-        <paragraph xml-lang="en-US" id="par_id3256155" role="listitem"><emph>Never recalculate</emph> - No formulas will be recalculated on loading the file.</paragraph>
-       </listitem>
-       <listitem>
-        <paragraph xml-lang="en-US" id="par_id3247530" role="listitem"><emph>Always recalculate</emph> - All formulas will be recalculated on file load.</paragraph>
-       </listitem>
-       <listitem>
-        <paragraph xml-lang="en-US" id="par_id3253061" role="listitem"><emph>Prompt user</emph> - Prompt user for action.</paragraph>
-       </listitem>
-    </list>
-    <paragraph xml-lang="en-US" id="par_id2010549" role="tip">
-      %PRODUCTNAME saved ODF spreadsheets will honor <emph>Never recalculate</emph> and <emph>Always recalculate</emph> options.
-    </paragraph>
-    </body>
-</helpdocument>
+
+
+<section id="formula">
+<bookmark xml-lang="en-US" branch="index" id="bm_id4249399">
+  <bookmark_value>formula options;formula syntax</bookmark_value>
+  <bookmark_value>formula options;separators</bookmark_value>
+  <bookmark_value>formula options;reference syntax in string parameters</bookmark_value>
+  <bookmark_value>formula options;recalculating spreadsheets</bookmark_value>
+  <bookmark_value>formula options;large spreadsheet files</bookmark_value>
+  <bookmark_value>formula options;loading spreadsheet files</bookmark_value>
+  <bookmark_value>separators;function</bookmark_value>
+  <bookmark_value>separators;array column</bookmark_value>
+  <bookmark_value>separators;array row</bookmark_value>
+  <bookmark_value>recalculating;formula options</bookmark_value>
+  <bookmark_value>recalculating;large spreadsheet files</bookmark_value>
+  <bookmark_value>loading;large spreadsheet files</bookmark_value>
+</bookmark>
+
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optformula/OptFormula" id="bm_id3149095" localize="false"/>
+
+<paragraph id="hd_id3145071" role="heading" level="1" xml-lang="en-US"><link href="text/shared/optionen/01060900.xhp" name="Formula">Formula</link></paragraph>
+<paragraph id="par_id3147576" role="paragraph" xml-lang="en-US"><ahelp hid=".">Defines formula syntax options and loading options for %PRODUCTNAME Calc.</ahelp></paragraph>
+</section>
+
+<section id="howtoget">
+<embed href="text/shared/00/00000406.xhp#exopfo"/>
+</section>
+
+<paragraph id="hd_id3149399" role="heading" level="2" xml-lang="en-US">Formula options</paragraph>
+
+<paragraph id="hd_id31493991" role="heading" level="3" xml-lang="en-US">Formula syntax</paragraph>
+<paragraph id="par_id3155419" role="paragraph" xml-lang="en-US">There are three options. Let's see it by example. In a sample spreadsheet there are two worksheets, Sheet1 and Sheet2. In A1 cell of Sheet1 there is a reference to C4 cell of Sheet2.</paragraph>
+
+<list type="unordered">
+  <listitem>
+    <paragraph id="par_id3156155" role="listitem" xml-lang="en-US"><emph>Calc A1</emph> - This is the default of %PRODUCTNAME Calc. The reference will be <item type="input">=$Sheet2.C4</item></paragraph>
+  </listitem>
+  <listitem>
+    <paragraph id="par_id3147530" role="listitem" xml-lang="en-US"><emph>Excel A1</emph> - This is the default of Microsoft Excel. The reference will be <item type="input">=Sheet2!C4</item></paragraph>
+  </listitem>
+  <listitem>
+    <paragraph id="par_id3153061" role="listitem" xml-lang="en-US"><emph>Excel R1C1</emph> - This is the relative row/column addressing, known from Microsoft Excel. The reference will be <item type="input">=Sheet2!R[3]C[2]</item></paragraph>
+  </listitem></list>
+
+<paragraph id="hd_id31493992" role="heading" level="3" xml-lang="en-US">Use English function names</paragraph>
+<paragraph id="par_id4155419" role="paragraph" xml-lang="en-US">In %PRODUCTNAME Calc function names can be localized. By default, the check box is off, which means the localized function names are used. Checking this check box will swap localized function names with the English ones. This change takes effect in all of the following areas: formula input and display, function wizard, and formula tips. You can of course uncheck it to go back to the localized function names.</paragraph>
+
+<paragraph id="hd_id4149399" role="heading" level="2" xml-lang="en-US">Separators</paragraph>
+<paragraph id="par_id5155419" role="paragraph" xml-lang="en-US">This option group lets you configure separators in your formula expressions. This comes in handy when, for instance, you want to separate your function parameters by commas (,) instead of semicolons (;).</paragraph>
+<paragraph id="par_id6155419" role="paragraph" xml-lang="en-US">For example, instead of <item type="input">=SUM(A1;B1;C1)</item> you can type <item type="input">=SUM(A1,B1,C1)</item>.</paragraph>
+<paragraph id="par_id7155419" role="paragraph" xml-lang="en-US">Likewise, you can also change the column and row separators for in-line arrays. Previously, an in-line array used semicolons (;) as the column separators and the pipe symbols (|) as the row separators, so a typical in-line array expression looked like this for a 5 x 2 matrix array:</paragraph>
+<paragraph id="par_id8155419" role="paragraph" xml-lang="en-US"><item type="input">={1;2;3;4;5|6;7;8;9;10}</item></paragraph>
+<paragraph id="par_id9155419" role="paragraph" xml-lang="en-US">By changing the column separators to commas (,) and the row separators to semicolons (;), the same expression will look like this:</paragraph>
+<paragraph id="par_id0155419" role="paragraph" xml-lang="en-US"><item type="input">={1,2,3,4,5;6,7,8,9,10}</item></paragraph>
+
+<paragraph id="hd_id5149399" role="heading" level="2" xml-lang="en-US">Detailed calculation settings</paragraph>
+<paragraph id="par_id1015549" role="paragraph" xml-lang="en-US">Here you can configure the formula syntax to use when parsing references given in string parameters. This affects built-in functions such as INDIRECT that takes a reference as a string value.</paragraph>
+
+<paragraph id="hd_id5149400" role="heading" level="2" xml-lang="en-US">Recalculation on File Load</paragraph>
+<paragraph id="par_id2335549" role="paragraph" xml-lang="en-US">Recalculating formulas can take significant time while loading very large files.</paragraph>
+
+<paragraph id="par_id2115549" role="heading" level="3" xml-lang="en-US">Excel 2007 and newer:</paragraph>
+<paragraph id="par_id2015549" role="paragraph" xml-lang="en-US">Loading a large spreadsheet file can take a long time. If you don't need to update your large spreadsheet data immediately, you can postpone the recalculation at a better time. %PRODUCTNAME allows you to defer recalculation of Excel 2007 (and above) spreadsheets to speedup loading time. </paragraph>
+
+<paragraph id="par_id2215549" role="heading" level="3" xml-lang="en-US">ODF Spreadsheet (not saved by %PRODUCTNAME):</paragraph>
+<paragraph id="par_id2016549" role="paragraph" xml-lang="en-US">Recent versions of %PRODUCTNAME caches spreadsheet formula results into its ODF file. This feature helps %PRODUCTNAME to recalculate a large ODF spreadsheet saved by %PRODUCTNAME faster. </paragraph>
+<paragraph id="par_id2017549" role="paragraph" xml-lang="en-US">For ODF spreadsheets saved by other programs, where such cached formula results may not exist, recalculation can be deferred to speedup file loading as with Excel 2007 files. </paragraph>
+<paragraph id="par_id2315549" role="paragraph" xml-lang="en-US">For the entries above the following choices are possible:</paragraph>
+
+<list type="unordered">
+  <listitem>
+    <paragraph id="par_id3256155" role="listitem" xml-lang="en-US"><emph>Never recalculate</emph> - No formulas will be recalculated on loading the file.</paragraph>
+  </listitem>
+  <listitem>
+    <paragraph id="par_id3247530" role="listitem" xml-lang="en-US"><emph>Always recalculate</emph> - All formulas will be recalculated on file load.</paragraph>
+  </listitem>
+  <listitem>
+    <paragraph id="par_id3253061" role="listitem" xml-lang="en-US"><emph>Prompt user</emph> - Prompt user for action.</paragraph>
+  </listitem></list>
+<paragraph id="par_id2010549" role="tip" xml-lang="en-US">%PRODUCTNAME saved ODF spreadsheets will honor <emph>Never recalculate</emph> and <emph>Always recalculate</emph> options. </paragraph>
+
+<section id="relatedtopics">
+<paragraph id="par_id200920171902249043" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060107.xhp">Array formulas</link></paragraph>
+</section>
+</body>
+
+</helpdocument>
\ No newline at end of file


More information about the Libreoffice-commits mailing list