source/text/scalc/01/04060109.xhp | 2 +-
source/text/scalc/01/12090102.xhp | 2 +-
source/text/scalc/01/12090105.xhp | 2 +-
source/text/scalc/guide/datapilot_createtable.xhp | 6 +++---
source/text/scalc/guide/datapilot_edittable.xhp | 2 +-
source/text/scalc/guide/pivotchart_filter.xhp | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 9c9690285ccb3e2116626b84f6747f9f71d35b20
Author: Stanislav Horacek <stanislav.hora...@gmail.com>
AuthorDate: Tue Dec 29 10:33:36 2020 +0100
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Mon Jan 4 14:44:43 2021 +0100
"page fields" in pivot table have been renamed to "filters"
Change-Id: I4b13bdbb91e5953833a518a5068b7db45147a3ea
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/108447
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/scalc/01/04060109.xhp
b/source/text/scalc/01/04060109.xhp
index cd7809cd7..c695e9165 100644
--- a/source/text/scalc/01/04060109.xhp
+++ b/source/text/scalc/01/04060109.xhp
@@ -551,7 +551,7 @@
<paragraph xml-lang="en-US" id="par_id4809411" role="paragraph">If no
<emph>Field n / Item n</emph> pairs are given, the grand total is returned.
Otherwise, each pair adds a constraint that the result must satisfy.
<emph>Field n</emph> is the name of a field from the pivot table. <emph>Item
n</emph> is the name of an item from that field.</paragraph>
<paragraph xml-lang="en-US" id="par_id6454969" role="paragraph">If
the pivot table contains only a single result value that fulfills all of the
constraints, or a subtotal result that summarizes all matching values, that
result is returned. If there is no matching result, or several ones without a
subtotal for them, an error is returned. These conditions apply to results that
are included in the pivot table.</paragraph>
<paragraph xml-lang="en-US" id="par_id79042" role="paragraph">If the
source data contains entries that are hidden by settings of the pivot table,
they are ignored. The order of the Field/Item pairs is not significant. Field
and item names are not case-sensitive.</paragraph>
- <paragraph xml-lang="en-US" id="par_id7928708" role="paragraph">If no
constraint for a page field is given, the field's selected value is implicitly
used. If a constraint for a page field is given, it must match the field's
selected value, or an error is returned. Page fields are the fields at the top
left of a pivot table, populated using the "Page Fields" area of the pivot
table layout dialog. From each page field, an item (value) can be selected,
which means only that item is included in the calculation.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7928708" role="paragraph">If no
constraint for a filter is given, the field's selected value is implicitly
used. If a constraint for a filter is given, it must match the field's selected
value, or an error is returned. Filters are the fields at the top left of a
pivot table, populated using the "Filters" area of the pivot table layout
dialog. From each filter, an item (value) can be selected, which means only
that item is included in the calculation.</paragraph>
<paragraph xml-lang="en-US" id="par_id3864253"
role="paragraph">Subtotal values from the pivot table are only used if they use
the function "auto" (except when specified in the constraint, see <item
type="literal">Second Syntax</item> below).</paragraph>
<h3 id="hd_id551585688835597">Second Syntax</h3>
<paragraph xml-lang="en-US" id="par_id9937131"
role="paragraph"><emph>pivot table</emph> has the same meaning as in the first
syntax.</paragraph>
diff --git a/source/text/scalc/01/12090102.xhp
b/source/text/scalc/01/12090102.xhp
index 9ae7996f4..d33593fa7 100644
--- a/source/text/scalc/01/12090102.xhp
+++ b/source/text/scalc/01/12090102.xhp
@@ -46,7 +46,7 @@
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/pivottablelayoutdialog/listbox-data"
id="bm_id2920621" localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/pivottablelayoutdialog/listbox-page"
id="bm_id7411420" localize="false"/><comment>UFI: changed help id from 59001 to
dply_page</comment>
<paragraph xml-lang="en-US" id="hd_id3154908" role="heading"
level="2">Layout</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150768" role="paragraph"><ahelp
hid="modules/scalc/ui/pivottablelayoutdialog/listbox-fields">To define the
layout of a pivot table, drag and drop data field buttons onto the <emph>Page
Fields, Row Fields, Column Fields, </emph>and<emph> Data Fields
</emph>areas.</ahelp> You can also use drag and drop to rearrange the data
fields on a pivot table.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150768" role="paragraph"><ahelp
hid="modules/scalc/ui/pivottablelayoutdialog/listbox-fields">To define the
layout of a pivot table, drag and drop data field buttons onto the
<emph>Filters, Row Fields, Column Fields</emph> and <emph>Data Fields</emph>
areas.</ahelp> You can also use drag and drop to rearrange the data fields on a
pivot table.</paragraph>
<paragraph xml-lang="en-US" id="par_id3147229"
role="paragraph">$[officename] automatically adds a caption to buttons that are
dragged into the <emph>Data Fields </emph>area. The caption contains the name
of the data field as well as the formula that created the data.</paragraph>
<paragraph xml-lang="en-US" id="par_id3145749" role="paragraph">To
change the function that is used by a data field, double-click a button in the
<emph>Data Fields</emph> area to open the <link
href="text/scalc/01/12090105.xhp" name="Data Field">Data Field</link> dialog.
You can also double-click buttons in the <emph>Row Fields</emph> or
<emph>Column Fields</emph> areas.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/pivottablelayoutdialog/more" id="bm_id4284798"
localize="false"/>
diff --git a/source/text/scalc/01/12090105.xhp
b/source/text/scalc/01/12090105.xhp
index aec5b923c..bdde49582 100644
--- a/source/text/scalc/01/12090105.xhp
+++ b/source/text/scalc/01/12090105.xhp
@@ -58,7 +58,7 @@
<paragraph role="paragraph" id="par_idN106F0" xml-lang="en-US"><ahelp
hid=".">Expands or reduces the dialog. The <emph>More</emph> button is visible
for data fields only.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/pivotfielddialog/options" id="bm_id2855922"
localize="false"/>
<paragraph role="heading" id="par_idN106F3" xml-lang="en-US"
level="2">Options</paragraph>
-<paragraph role="paragraph" id="par_idN106F7" xml-lang="en-US"><ahelp
hid=".">Opens the <link href="text/scalc/01/12090106.xhp">Data Field
Options</link> dialog. The <emph>Options</emph> button is visible for column,
row, or page fields only.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN106F7" xml-lang="en-US"><ahelp
hid=".">Opens the <link href="text/scalc/01/12090106.xhp">Data Field
Options</link> dialog. The <emph>Options</emph> button is visible for filters
and column or row fields only.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10708" xml-lang="en-US">If the dialog
is expanded by the <emph>More</emph> button, the following items are added to
the dialog:</paragraph>
<paragraph role="heading" id="par_idN1070B" xml-lang="en-US"
level="2">Displayed value</paragraph>
<paragraph role="paragraph" id="par_idN1070F" xml-lang="en-US"><ahelp
hid=".">For each data field, you can select the type of display.</ahelp> For
some types you can select additional information for a base field and a base
item.</paragraph>
diff --git a/source/text/scalc/guide/datapilot_createtable.xhp
b/source/text/scalc/guide/datapilot_createtable.xhp
index d03151a4d..4610d1709 100644
--- a/source/text/scalc/guide/datapilot_createtable.xhp
+++ b/source/text/scalc/guide/datapilot_createtable.xhp
@@ -37,13 +37,13 @@
<paragraph xml-lang="en-US" id="par_id3156023"
role="listitem">Position the cursor within a range of cells containing values,
row and column headings.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3147264"
role="listitem">Choose <emph>Insert - Pivot Table</emph>. The <emph>Select
Source</emph> dialog appears. Choose <emph>Current selection</emph> and confirm
with <emph>OK</emph>. The table headings are shown as buttons in the
<emph>Pivot Table</emph> dialog. Drag these buttons as required and drop them
into the layout areas "Page Fields", "Column Fields", "Row Fields" and "Data
Fields".</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147264"
role="listitem">Choose <emph>Insert - Pivot Table</emph>. The <emph>Select
Source</emph> dialog appears. Choose <emph>Current selection</emph> and confirm
with <emph>OK</emph>. The table headings are shown as buttons in the
<emph>Pivot Table</emph> dialog. Drag these buttons as required and drop them
into the layout areas "Filters", "Column Fields", "Row Fields" and "Data
Fields".</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3150868"
role="listitem">Drag the desired buttons into one of the four areas.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id7599414" role="paragraph">Drag a
button to the <emph>Page Fields</emph> area to create a button and a listbox on
top of the generated pivot table. The listbox can be used to filter the pivot
table by the contents of the selected item. You can use drag-and-drop within
the generated pivot table to use another page field as a filter.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7599414" role="paragraph">Drag a
button to the <emph>Filters</emph> area to create a button and a listbox on top
of the generated pivot table. The listbox can be used to filter the pivot table
by the contents of the selected item. You can use drag-and-drop within the
generated pivot table to use another page field as a filter.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154011" role="paragraph">If the
button is dropped in the <emph>Data Fields</emph> area it will be given a
caption that also shows the formula that will be used to calculate the
data.</paragraph>
<list type="unordered">
<listitem>
@@ -64,7 +64,7 @@
<paragraph xml-lang="en-US" id="par_id3147338" role="listitem">To
open the <link href="text/scalc/01/12090105.xhp" name="Data Field"><emph>Data
Field</emph></link> dialog, double-click one of the buttons in the <emph>Row
Fields</emph> or <emph>Column Fields</emph> area. Use the dialog to select if
and to what extent <item type="productname">%PRODUCTNAME</item> calculates
display subtotals.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id3154020" role="paragraph">Exit the
Pivot Table dialog by pressing OK. A <emph>Filter</emph> button will now be
inserted, or a page button for every data field that you dropped in the
<emph>Page Fields</emph> area. The pivot table is inserted further
down.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154020" role="paragraph">Exit the
Pivot Table dialog by pressing OK. A <emph>Filter</emph> button will now be
inserted, or a page button for every data field that you dropped in the
<emph>Filters</emph> area. The pivot table is inserted further down.</paragraph>
<embed href="text/scalc/06/calcsamplefiles.xhp#pivot"/>
<section id="relatedtopics">
diff --git a/source/text/scalc/guide/datapilot_edittable.xhp
b/source/text/scalc/guide/datapilot_edittable.xhp
index 0c3d67f33..6016004c4 100644
--- a/source/text/scalc/guide/datapilot_edittable.xhp
+++ b/source/text/scalc/guide/datapilot_edittable.xhp
@@ -34,7 +34,7 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3150868" role="paragraph">Click
one of the buttons in the pivot table and hold the mouse button down. A special
symbol will appear next to the mouse pointer.</paragraph>
<paragraph xml-lang="en-US" id="par_id3145786" role="paragraph">By
dragging the button to a different position in the same row you can alter the
order of the columns. If you drag a button to the left edge of the table into
the row headings area, you can change a column into a row.</paragraph>
- <paragraph xml-lang="en-US" id="par_id1648915" role="paragraph">In the
Pivot Table dialog, you can drag a button to the <emph>Page Fields</emph> area
to create a button and a listbox on top of the pivot table. The listbox can be
used to filter the pivot table by the contents of the selected item. You can
use drag-and-drop within the pivot table to use another page field as a
filter.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1648915" role="paragraph">In the
Pivot Table dialog, you can drag a button to the <emph>Filters</emph> area to
create a button and a listbox on top of the pivot table. The listbox can be
used to filter the pivot table by the contents of the selected item. You can
use drag-and-drop within the pivot table to use another page field as a
filter.</paragraph>
<paragraph xml-lang="en-US" id="par_id3147434" role="paragraph">To
remove a button from the table, just drag it out of the pivot table. Release
the mouse button when the mouse pointer positioned within the sheet has become
a 'not allowed' icon. The button is deleted.</paragraph>
<paragraph xml-lang="en-US" id="par_id3156442" role="paragraph">To edit
the pivot table, click a cell inside the pivot table and open the context menu.
In the context menu you find the command <emph>Edit Layout</emph>, which
displays the <emph>Pivot Table</emph> dialog for the current pivot
table.</paragraph>
<paragraph xml-lang="en-US" id="par_id2666096" role="paragraph">In the
pivot table, you can use drag-and-drop or cut/paste commands to rearrange the
order of data fields.</paragraph>
diff --git a/source/text/scalc/guide/pivotchart_filter.xhp
b/source/text/scalc/guide/pivotchart_filter.xhp
index 7327a4dcc..11ccabb53 100644
--- a/source/text/scalc/guide/pivotchart_filter.xhp
+++ b/source/text/scalc/guide/pivotchart_filter.xhp
@@ -21,7 +21,7 @@
<paragraph role="heading" id="hd_id201525166689277" level="2"
xml-lang="en-US">Pivot chart field buttons</paragraph>
- <paragraph role="paragraph" id="par_id751525167435160"
xml-lang="en-US">Pivot chart buttons are unique to pivot charts, normal charts
don't have them. The buttons shows the layout of the pivot table, which are the
pivot table fields. If present, page fields are displayed in the top. Row
fields are displayed on the bottom of the chart next to each other and the
legend shows the buttons from column fields stacked.</paragraph>
+ <paragraph role="paragraph" id="par_id751525167435160"
xml-lang="en-US">Pivot chart buttons are unique to pivot charts, normal charts
don't have them. The buttons shows the layout of the pivot table, which are the
pivot table fields. If present, filters are displayed in the top. Row fields
are displayed on the bottom of the chart next to each other and the legend
shows the buttons from column fields stacked.</paragraph>
<paragraph role="paragraph" id="par_id681525167692377" xml-lang="en-US">
<image src="media/helpimg/sc_PivotChartButtons.png"
id="img_id801525167692378" width="604px" height="340px"><alt xml-lang="en-US"
id="alt_id881525167692378">Pivot chart buttons</alt></image>
@@ -29,7 +29,7 @@
<paragraph role="paragraph" id="par_id851525167448337"
xml-lang="en-US">The buttons have a pop-up action attached to them. If there is
some filtering applied, then the arrow turns blue (similar to the pivot table),
so it is easier to see when a field has any filter applied.</paragraph>
- <paragraph role="paragraph" id="par_id401525167457977"
xml-lang="en-US">Existing page fields shows what is filtered: when nothing is
filtered "- all -" is shown, when some data is filtered, then "- multiple -" is
shown and when only one value is not filtered, the value is shown.</paragraph>
+ <paragraph role="paragraph" id="par_id401525167457977"
xml-lang="en-US">Existing filters shows what is filtered: when nothing is
filtered "- all -" is shown, when some data is filtered, then "- multiple -" is
shown and when only one value is not filtered, the value is shown.</paragraph>
<embed href="text/scalc/06/calcsamplefiles.xhp#pivot"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
