source/text/scalc/01/04060109.xhp | 2 +-
source/text/scalc/01/04060181.xhp | 4 ++--
source/text/scalc/01/func_averageif.xhp | 2 +-
source/text/scalc/01/func_averageifs.xhp | 2 +-
source/text/scalc/01/func_countifs.xhp | 2 +-
source/text/scalc/01/func_sumifs.xhp | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit c1c697836d0be764ed91807871500fec7bd21425
Author: Eike Rathke <er...@redhat.com>
Date: Tue Feb 23 00:00:41 2016 +0100
differentiate between regular expressions and wildcards
Change-Id: Ib929ff3f89a51ddafe4c6e745545ef94851a83d4
diff --git a/source/text/scalc/01/04060109.xhp
b/source/text/scalc/01/04060109.xhp
index a124f86..0cc5f00 100644
--- a/source/text/scalc/01/04060109.xhp
+++ b/source/text/scalc/01/04060109.xhp
@@ -371,7 +371,7 @@
<emph>LookupArray</emph> is the reference searched. A lookup array
can be a single row or column, or part of a single row or column.</paragraph>
<paragraph xml-lang="en-US" id="par_id3147239" role="paragraph"
l10n="U" oldref="107">
<emph>Type</emph> may take the values 1, 0, or -1. If Type = 1 or
if this optional parameter is missing, it is assumed that the first column of
the search array is sorted in ascending order. If Type = -1 it is assumed that
the column in sorted in descending order. This corresponds to the same function
in Microsoft Excel.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154265" role="paragraph"
l10n="CHG" oldref="231">If Type = 0, only exact matches are found. If the
search criterion is found more than once, the function returns the index of the
first matching value. Only if Type = 0 can you search for regular
expressions.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154265" role="paragraph"
l10n="CHG" oldref="231">If Type = 0, only exact matches are found. If the
search criterion is found more than once, the function returns the index of the
first matching value. Only if Type = 0 can you search for regular expressions
(if enabled in calculation options) or wildcards (if enabled in calculation
options).</paragraph>
<paragraph xml-lang="en-US" id="par_id3147528" role="paragraph"
l10n="CHG" oldref="232">If Type = 1 or the third parameter is missing, the
index of the last value that is smaller or equal to the search criterion is
returned. This applies even when the search array is not sorted. For Type = -1,
the first value that is larger or equal is returned.</paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph xml-lang="en-US" id="hd_id3155119" role="heading"
level="3" l10n="U"
diff --git a/source/text/scalc/01/04060181.xhp
b/source/text/scalc/01/04060181.xhp
index b21faee..e5d3f3b 100644
--- a/source/text/scalc/01/04060181.xhp
+++ b/source/text/scalc/01/04060181.xhp
@@ -129,7 +129,7 @@
<paragraph id="hd_id3164953" role="heading" level="3"
xml-lang="en-US">Syntax</paragraph>
<paragraph id="par_id3164967" role="code" xml-lang="en-US">COUNTIF(Range;
Criteria)</paragraph>
<paragraph id="par_id3164980" role="paragraph"
xml-lang="en-US"><emph>Range</emph> is the range to which the criteria are to
be applied.</paragraph>
-<paragraph id="par_id3165000" role="paragraph"
xml-lang="en-US"><emph>Criteria</emph> indicates the criteria in the form of a
number, an expression or a character string. These criteria determine which
cells are counted. You may also enter a search text in the form of a regular
expression, e.g. b.* for all words that begin with b. You may also indicate a
cell range that contains the search criterion. If you search for literal text,
enclose the text in double quotes.</paragraph>
+<paragraph id="par_id3165000" role="paragraph"
xml-lang="en-US"><emph>Criteria</emph> indicates the criteria in the form of a
number, an expression or a character string. These criteria determine which
cells are counted. If regular expressions are enabled in calculation options
you may also enter a search text in the form of a regular expression, e.g. b.*
for all cells that begin with b. If wildcards are enabled in calculation
options you may enter a search text with wildcards, e.g. b* for all cells that
begin with b. You may also indicate a cell address that contains the search
criterion. If you search for literal text, enclose the text in double
quotes.</paragraph>
<paragraph id="hd_id3165037" role="heading" level="3"
xml-lang="en-US">Example</paragraph>
<paragraph id="par_id3166505" role="paragraph" xml-lang="en-US">A1:A10 is a
cell range containing the numbers <item type="input">2000</item> to <item
type="input">2009</item>. Cell B1 contains the number <item
type="input">2006</item>. In cell B2, you enter a formula:</paragraph>
@@ -765,4 +765,4 @@
</section>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/scalc/01/func_averageif.xhp
b/source/text/scalc/01/func_averageif.xhp
index 85e19dd..ed548b2 100644
--- a/source/text/scalc/01/func_averageif.xhp
+++ b/source/text/scalc/01/func_averageif.xhp
@@ -29,7 +29,7 @@
<paragraph id="hd_id210572014129502" role="heading" level="3"
xml-lang="en-US">Syntax</paragraph>
<paragraph id="par_id200801176228491" role="code"
xml-lang="en-US">AVERAGEIF(Range; Criterion [; Average_Range ])</paragraph>
<paragraph id="par_id15226321619829" role="paragraph"
xml-lang="en-US"><emph>Range</emph> â required argument. An array, a name of
named range or a label of a column or a row containing numbers for averaging or
numbers or text for the condition.</paragraph>
-<paragraph id="par_id24499731228013" role="paragraph"
xml-lang="en-US"><emph>Criterion</emph> â required argument. A condition in
the form of expression or a cell reference with expression that defines what
cells should be used to calculate the mean. The expression can contain text,
numbers or regular expressions.</paragraph>
+<paragraph id="par_id24499731228013" role="paragraph"
xml-lang="en-US"><emph>Criterion</emph> â required argument. A condition in
the form of expression or a cell reference with expression that defines what
cells should be used to calculate the mean. The expression can contain text,
numbers, regular expressions (if enabled in calculation options) or wildcards
(if enabled in calculation options).</paragraph>
<paragraph id="par_id174711913219765" role="paragraph"
xml-lang="en-US"><emph>Average_Range</emph> â optional. It is a range of
values for calculating the mean.</paragraph>
<paragraph id="par_id45123108916423" role="note" xml-lang="en-US">Note that if
the <emph>Average_Range</emph> is not specified, <emph>Range</emph> is used for
both, the calculation of the mean and the search according to the condition. If
the <emph>Average_Range</emph> is specified, the <emph>Range</emph> is used
only for the condition test, while <emph>Average_Range</emph> is used for the
mean calculation.<br/>
The <emph>Criterion</emph> needs to be a string expression, in particular, the
<emph>Criterion</emph> needs to be enclosed in quotation marks ("Criterion")
with the exception of the names of functions, cell references and an operation
of a string concatenation (&).</paragraph><embed
href="text/scalc/01/ODFF.xhp#odff"/>
diff --git a/source/text/scalc/01/func_averageifs.xhp
b/source/text/scalc/01/func_averageifs.xhp
index 8825180..e73d4c3 100644
--- a/source/text/scalc/01/func_averageifs.xhp
+++ b/source/text/scalc/01/func_averageifs.xhp
@@ -30,7 +30,7 @@
<paragraph id="par_id21050267713178" role="code"
xml-lang="en-US">AVERAGEIFS(Average_range; Criterion_range1; Criterion1 [;
Criterion_range2; Criterion2 [; ...]])</paragraph>
<paragraph id="par_id165832700711773" role="paragraph"
xml-lang="en-US"><emph>Average_range</emph> â required argument. It is a
range of cells, a name of a named range or a label of a column or a row
containing values for calculating the mean.</paragraph>
<paragraph id="par_id23557225011065" role="paragraph"
xml-lang="en-US"><emph>Criterion_range1</emph> â required argument. It is a
range of cells, a name of a named range or a label of a column or a row
containing values for finding the corresponding criterion.</paragraph>
-<paragraph id="par_id115612745015792" role="paragraph"
xml-lang="en-US"><emph>Criterion1</emph> â required argument. A condition in
the form of expression or a cell reference to expression that defines what
cells should be used to calculate the mean. The expression can contain text,
numbers or regular expressions. </paragraph>
+<paragraph id="par_id115612745015792" role="paragraph"
xml-lang="en-US"><emph>Criterion1</emph> â required argument. A condition in
the form of expression or a cell reference to expression that defines what
cells should be used to calculate the mean. The expression can contain text,
numbers, regular expressions (if enabled in calculation options) or wildcards
(if enabled in calculation options). </paragraph>
<paragraph id="par_id249477513695" role="paragraph"
xml-lang="en-US"><emph>Criterion_range2</emph> â Optional. Criterion_range2
and all the following mean the same as Criterion_range1.</paragraph>
<paragraph id="par_id157492744623347" role="paragraph"
xml-lang="en-US"><emph>Criterion2</emph> â Optional. Criterion2 and all the
following mean the same as Criterion1.</paragraph>
<paragraph id="par_id262061474420658" role="note" xml-lang="en-US">The logical
relation between criteria can be defined as logical AND (conjunction). In other
words, if and only if all given criteria are met, a value from the
corresponding cell of the given Average_range is taken into calculation of the
mean.<br/>
diff --git a/source/text/scalc/01/func_countifs.xhp
b/source/text/scalc/01/func_countifs.xhp
index aa77677..825a39b 100644
--- a/source/text/scalc/01/func_countifs.xhp
+++ b/source/text/scalc/01/func_countifs.xhp
@@ -30,7 +30,7 @@
<paragraph id="hd_id465746574657" role="heading" level="3"
xml-lang="en-US">Syntax</paragraph>
<paragraph id="par_id27421466710275" role="code"
xml-lang="en-US">COUNTIFS(Range1; Criterion1 [; Range2; Criterion2 [;
...]])</paragraph>
<paragraph id="par_id242131304318587" role="paragraph"
xml-lang="en-US"><emph>Range1</emph> â required argument. It is a range of
cells, a name of a named range or a label of a column or a row containing
values for counting and finding the corresponding criterion.</paragraph>
-<paragraph id="par_id23526994221948" role="paragraph"
xml-lang="en-US"><emph>Criterion1</emph> â required argument. A condition in
the form of expression or a cell reference to expression that defines what
cells should be used for counting. The expression can contain text, numbers or
regular expressions. </paragraph>
+<paragraph id="par_id23526994221948" role="paragraph"
xml-lang="en-US"><emph>Criterion1</emph> â required argument. A condition in
the form of expression or a cell reference to expression that defines what
cells should be used for counting. The expression can contain text, numbers,
regular expressions (if enabled in calculation options) or wildcards (if
enabled in calculation options). </paragraph>
<paragraph id="par_id190621657742" role="paragraph"
xml-lang="en-US"><emph>Criterion_range2</emph> â Optional. Criterion_range2
and all the following mean the same as Criterion_range1.</paragraph>
<paragraph id="par_id317001803813193" role="paragraph"
xml-lang="en-US"><emph>Criterion2</emph> â Optional. Criterion2 and all the
following mean the same as Criterion1.</paragraph>
<paragraph id="par_id14223137501158" role="note" xml-lang="en-US">The logical
relation between criteria can be defined as logical AND (conjunction). In other
words, if and only if all given criteria are met, a row or a column is taken
into counting.<br/>
diff --git a/source/text/scalc/01/func_sumifs.xhp
b/source/text/scalc/01/func_sumifs.xhp
index 1d5cefe..23fc8bc 100644
--- a/source/text/scalc/01/func_sumifs.xhp
+++ b/source/text/scalc/01/func_sumifs.xhp
@@ -32,7 +32,7 @@
<paragraph id="par_id59901690530236" role="paragraph"
xml-lang="en-US"><emph>Sum_Range</emph> â required argument. It is a range of
cells, a name of a named range or a label of a column or a row containing
values for calculating the sum.</paragraph>
<paragraph id="par_id14445505532098" role="paragraph"
xml-lang="en-US"><emph>Criterion_range1</emph> â required argument. It is a
range of cells, a name of a named range or a label of a column or a row
containing values for finding the corresponding criterion.</paragraph>
-<paragraph id="par_id24470258022447" role="paragraph"
xml-lang="en-US"><emph>Criterion1</emph> â required argument. A condition in
the form of expression or a cell reference to expression that defines what
cells should be used to calculate the sum. The expression can contain text,
numbers or regular expressions. </paragraph>
+<paragraph id="par_id24470258022447" role="paragraph"
xml-lang="en-US"><emph>Criterion1</emph> â required argument. A condition in
the form of expression or a cell reference to expression that defines what
cells should be used to calculate the sum. The expression can contain text,
numbers, regular expressions (if enabled in calculation options) or wildcards
(if enabled in calculation options). </paragraph>
<paragraph id="par_id111151356820933" role="paragraph"
xml-lang="en-US"><emph>Criterion_range2</emph> â Optional. Criterion_range2
and all the following mean the same as Criterion_range1.</paragraph>
<paragraph id="par_id14734320631376" role="paragraph"
xml-lang="en-US"><emph>Criterion2</emph> â Optional. Criterion2 and all the
following mean the same as Criterion1.</paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
