[Libreoffice-commits] help.git: Branch 'libreoffice-5-2' - source/text

[Eike Rathke]

 source/text/scalc/01/04060101.xhp |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit a3f89c38a446d74b5327544de7b753964ce94a29
Author: Eike Rathke <erack at redhat.com>
Date:   Fri May 27 12:24:46 2016 +0200

    tdf#70806 DCOUNT and DCOUNTA DatabaseField argument can be omitted
    
    Change-Id: I340142fedd2239ff318c8f70fe228e696540cfdd
    (cherry picked from commit 5b1cb4f0bfbae734818ae791165cd1ea7ac5fdcb)
    Reviewed-on: https://gerrit.libreoffice.org/25536
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/source/text/scalc/01/04060101.xhp b/source/text/scalc/01/04060101.xhp
index 41dc0c9..2777a13 100644
--- a/source/text/scalc/01/04060101.xhp
+++ b/source/text/scalc/01/04060101.xhp
@@ -405,7 +405,7 @@
       <paragraph xml-lang="en-US" id="par_id3149453" role="paragraph" l10n="U" oldref="85">
 <emph>Database</emph> is the cell range defining the database.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3151272" role="paragraph" l10n="U" oldref="86">
-<emph>DatabaseField</emph> specifies the column where the function operates on after the search criteria of the first parameter is applied and the data rows are selected. It is not related to the search criteria itself. <variable id="quotes">To reference a column by means of the column header name, place quotation marks around the header name.
+<emph>DatabaseField</emph> specifies the column where the function operates on after the search criteria of the first parameter is applied and the data rows are selected. It is not related to the search criteria itself. <variable id="quotes">For the DatabaseField parameter you can enter a reference to a header cell or a number to specify the column within the Database area, starting with 1. To reference a column by means of the literal column header name, place quotation marks around the header name.
 </variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id3147083" role="paragraph" l10n="U" oldref="87">
 <emph>SearchCriteria</emph> is the cell range containing search criteria. If you write several criteria in one row they are connected by AND. If you write the criteria in different rows they are connected by OR. Empty cells in the search criteria range will be ignored.</paragraph>
@@ -423,9 +423,8 @@
          <embed href="text/shared/00/00000001.xhp#regulaer"/>
          <paragraph xml-lang="en-US" id="hd_id3156099" role="heading" level="3" l10n="U"
                     oldref="90">Syntax</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3153218" role="code" l10n="U" oldref="91">DCOUNT(Database; DatabaseField; SearchCriteria)</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3153273" role="paragraph" l10n="U" oldref="187">For the DatabaseField parameter you can enter a cell to specify the column. <embedvar href="text/scalc/01/04060101.xhp#quotes"/>
-</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153218" role="code" l10n="U" oldref="91">DCOUNT(Database; [DatabaseField]; SearchCriteria)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153273" role="paragraph" l10n="U" oldref="187">If the DatabaseField argument is omitted, DCOUNT returns the count of all records that satisfy Criteria. <embedvar href="text/scalc/01/04060101.xhp#quotes"/></paragraph>
          <paragraph xml-lang="en-US" id="hd_id3154743" role="heading" level="3" l10n="U"
                     oldref="92">Example</paragraph>
          <paragraph xml-lang="en-US" id="par_id3153623" role="paragraph" l10n="U" oldref="93">In the example above (scroll up, please), we want to know how many children have to travel more than 600 meters to school. The result is to be stored in cell B16. Set the cursor in cell B16. Enter the formula <item type="input">=DCOUNT(A1:E10;D1;A13:E14)</item> in B16. The <emph>Function Wizard</emph> helps you to input ranges.</paragraph>
@@ -445,8 +444,8 @@
          <embed href="text/shared/00/00000001.xhp#regulaer"/>
          <paragraph xml-lang="en-US" id="hd_id3143228" role="heading" level="3" l10n="U"
                     oldref="99">Syntax</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3146893" role="code" l10n="U" oldref="100">DCOUNTA(Database; DatabaseField; SearchCriteria)</paragraph>
-         <embed href="text/scalc/01/04060101.xhp#quotes"/>
+         <paragraph xml-lang="en-US" id="par_id3146893" role="code" l10n="U" oldref="100">DCOUNTA(Database; [DatabaseField]; SearchCriteria)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153274" role="paragraph" l10n="U" oldref="189">If the DatabaseField argument is omitted, DCOUNTA returns the count of all records that satisfy Criteria. <embedvar href="text/scalc/01/04060101.xhp#quotes"/></paragraph>
          <paragraph xml-lang="en-US" id="hd_id3149751" role="heading" level="3" l10n="U"
                     oldref="101">Example</paragraph>
          <paragraph xml-lang="en-US" id="par_id3153982" role="paragraph" l10n="CHG" oldref="102">In the example above (scroll up, please), you can search for the number of children whose name starts with an E or a subsequent letter. Edit the formula in B16 to read <item type="input">=DCOUNTA(A1:E10;"Name";A13:E14)</item>. Delete the old search criteria and enter <item type="input">>=E</item> under Name in field A14. The result is 5. If you now delete all number values for Greta in row 8, the result changes to 4. Row 8 is no longer included in the count because it does not contain any values. The name Greta is text, not a value. Note that the DatabaseField parameter must point to a column that can contain values.<comment>see i25407</comment></paragraph>