source/text/scalc/01/12090105.xhp | 13 +++++++------
source/text/scalc/01/12090106.xhp | 24 ++++++++++++------------
2 files changed, 19 insertions(+), 18 deletions(-)
New commits:
commit 11b85a0acfb0ed4bcaa6fe15cc2a7fb316d0cb88
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Sun Jan 1 10:01:54 2017 +0100
Fix numeric ahids on Pivot table related pages
And one inconsistency between the text and UI.
Change-Id: I2c87869904d11be257f2fb61f0a4460f75e0797c
Reviewed-on: https://gerrit.libreoffice.org/32567
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/source/text/scalc/01/12090105.xhp
b/source/text/scalc/01/12090105.xhp
index c84f8ce..6d10a7c 100644
--- a/source/text/scalc/01/12090105.xhp
+++ b/source/text/scalc/01/12090105.xhp
@@ -44,10 +44,11 @@
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/pivotfielddialog/functions" id="bm_id3145799"
localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafielddialog/functions" id="bm_id1523789"
localize="false"/>
<paragraph role="heading" id="hd_id3147124" xml-lang="en-US" level="3"
l10n="U" oldref="10">Function</paragraph>
-<paragraph role="paragraph" id="par_id3154490" xml-lang="en-US" l10n="U"
oldref="11"><ahelp hid="modules/scalc/ui/pivotfielddialog/functions">Click the
type of subtotal that you want to calculate. This option is only available if
the <emph>User-defined</emph> option is selected.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154490" xml-lang="en-US" l10n="U"
oldref="11"><ahelp hid=".">Click the type of subtotal that you want to
calculate. This option is only available if the <emph>User-defined</emph>
option is selected.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/pivotfielddialog/showall" id="bm_id3154015"
localize="false"/>
-<paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="2"
l10n="U" oldref="14">Show elements without data</paragraph>
-<paragraph role="paragraph" id="par_id3149403" xml-lang="en-US" l10n="U"
oldref="15"><ahelp hid="modules/scalc/ui/pivotfielddialog/showall">Includes
empty columns and rows in the results table.</ahelp></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafielddialog/checkbutton1" id="bm_id1523790"
localize="false"/>
+<paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="2"
l10n="U" oldref="14">Show items without data</paragraph>
+<paragraph role="paragraph" id="par_id3149403" xml-lang="en-US" l10n="U"
oldref="15"><ahelp hid=".">Includes empty columns and rows in the results
table.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149122" xml-lang="en-US" level="2"
l10n="U" oldref="12">Name:</paragraph>
<paragraph role="paragraph" id="par_id3150749" xml-lang="en-US" l10n="U"
oldref="13">Lists the name of the selected data field.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafielddialog/expander" id="bm_id4281746"
localize="false"/>
@@ -61,7 +62,7 @@
<paragraph role="paragraph" id="par_idN1070F" xml-lang="en-US"
l10n="NEW"><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>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/datafielddialog/type"
id="bm_id3325907" localize="false"/>
<paragraph role="heading" id="par_idN10712" xml-lang="en-US" level="3"
l10n="NEW">Type</paragraph>
-<paragraph role="paragraph" id="par_idN10716" xml-lang="en-US"
l10n="NEW"><ahelp hid="1495371266">Select the type of calculating of the
displayed value for the data field.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10716" xml-lang="en-US"
l10n="NEW"><ahelp hid="modules/scalc/ui/datafielddialog/type">Select the type
of calculating of the displayed value for the data field.</ahelp></paragraph>
<table id="">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -157,9 +158,9 @@
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafielddialog/basefield" id="bm_id7005523"
localize="false"/>
<paragraph role="heading" id="par_idN107BA" xml-lang="en-US" level="3"
l10n="NEW">Base field</paragraph>
-<paragraph role="paragraph" id="par_idN107BE" xml-lang="en-US"
l10n="NEW"><ahelp hid="1495371267">Select the field from which the respective
value is taken as base for the calculation.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN107BE" xml-lang="en-US"
l10n="NEW"><ahelp hid="modules/scalc/ui/datafielddialog/basefield">Select the
field from which the respective value is taken as base for the
calculation.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafielddialog/baseitem" id="bm_id8070925"
localize="false"/>
<paragraph role="heading" id="par_idN107C1" xml-lang="en-US" level="3"
l10n="NEW">Base item</paragraph>
-<paragraph role="paragraph" id="par_idN107C5" xml-lang="en-US"
l10n="NEW"><ahelp hid="1495371268">Select the item of the base field from which
the respective value is taken as base for the calculation.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN107C5" xml-lang="en-US"
l10n="NEW"><ahelp hid="modules/scalc/ui/datafielddialog/baseitem">Select the
item of the base field from which the respective value is taken as base for the
calculation.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/12090106.xhp
b/source/text/scalc/01/12090106.xhp
index 91ce434..e7abbb8 100644
--- a/source/text/scalc/01/12090106.xhp
+++ b/source/text/scalc/01/12090106.xhp
@@ -36,32 +36,32 @@
</bookmark><comment>mw changed "hiding..." entry</comment><paragraph
role="heading" id="par_idN10542" xml-lang="en-US" level="1" l10n="NEW">Data
Field Options</paragraph>
<paragraph role="paragraph" id="par_idN10546" xml-lang="en-US" l10n="NEW">You
can specify additional options for column, row, and page data fields in the
<link href="text/scalc/01/12090105.xhp">pivot table</link>.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafieldoptionsdialog/sortby" id="bm_id6588335"
localize="false"/><paragraph role="heading" id="par_idN10557" xml-lang="en-US"
level="2" l10n="NEW">Sort by</paragraph>
-<paragraph role="paragraph" id="par_idN1055B" xml-lang="en-US"
l10n="NEW"><ahelp hid="1495387653">Select the data field that you want to sort
columns or rows by.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1055B" xml-lang="en-US"
l10n="NEW"><ahelp hid="modules/scalc/ui/datafieldoptionsdialog/sortby">Select
the data field that you want to sort columns or rows by.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafieldoptionsdialog/ascending"
id="bm_id6422009" localize="false"/><paragraph role="heading" id="par_idN1055E"
xml-lang="en-US" level="3" l10n="NEW">Ascending</paragraph>
-<paragraph role="paragraph" id="par_idN10562" xml-lang="en-US"
l10n="CHG"><ahelp hid="1495384580">Sorts the values from the lowest value to
the highest value. If the selected field is the field for which the dialog was
opened, the items are sorted by name. If a data field was selected, the items
are sorted by the resultant value of the selected data
field.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10562" xml-lang="en-US"
l10n="CHG"><ahelp hid="modules/scalc/ui/datafieldoptionsdialog/ascending">Sorts
the values from the lowest value to the highest value. If the selected field is
the field for which the dialog was opened, the items are sorted by name. If a
data field was selected, the items are sorted by the resultant value of the
selected data field.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafieldoptionsdialog/descending"
id="bm_id1683706" localize="false"/><paragraph role="heading" id="par_idN10565"
xml-lang="en-US" level="3" l10n="NEW">Descending</paragraph>
-<paragraph role="paragraph" id="par_idN10569" xml-lang="en-US"
l10n="CHG"><ahelp hid="1495384581">Sorts the values descending from the highest
value to the lowest value. If the selected field is the field for which the
dialog was opened, the items are sorted by name. If a data field was selected,
the items are sorted by the resultant value of the selected data
field.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10569" xml-lang="en-US"
l10n="CHG"><ahelp
hid="modules/scalc/ui/datafieldoptionsdialog/descending">Sorts the values
descending from the highest value to the lowest value. If the selected field is
the field for which the dialog was opened, the items are sorted by name. If a
data field was selected, the items are sorted by the resultant value of the
selected data field.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafieldoptionsdialog/manual" id="bm_id9101840"
localize="false"/><paragraph role="heading" id="par_idN1056C" xml-lang="en-US"
level="3" l10n="NEW">Manual</paragraph>
-<paragraph role="paragraph" id="par_idN10570" xml-lang="en-US"
l10n="CHG"><ahelp hid="1495384582">Sorts values
alphabetically.</ahelp><comment>UFI: see spec doc. Currently set to
alphabetically.</comment></paragraph>
+<paragraph role="paragraph" id="par_idN10570" xml-lang="en-US"
l10n="CHG"><ahelp hid="modules/scalc/ui/datafieldoptionsdialog/manual">Sorts
values alphabetically.</ahelp><comment>UFI: see spec doc. Currently set to
alphabetically.</comment></paragraph>
<paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2"
l10n="NEW">Display options</paragraph>
<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW">You
can specify the display options for all row fields except for the last,
innermost row field.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafieldoptionsdialog/layout" id="bm_id113223"
localize="false"/><paragraph role="heading" id="par_idN1058C" xml-lang="en-US"
level="3" l10n="NEW">Layout</paragraph>
-<paragraph role="paragraph" id="par_idN10590" xml-lang="en-US"
l10n="NEW"><ahelp hid="1495387654">Select the layout mode for the field in the
list box.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10590" xml-lang="en-US"
l10n="NEW"><ahelp hid="modules/scalc/ui/datafieldoptionsdialog/layout">Select
the layout mode for the field in the list box.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafieldoptionsdialog/emptyline"
id="bm_id2646870" localize="false"/><paragraph role="heading" id="par_idN10593"
xml-lang="en-US" level="3" l10n="NEW">Empty line after each item</paragraph>
-<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US"
l10n="NEW"><ahelp hid="1495385090">Adds an empty row after the data for each
item in the pivot table.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US"
l10n="NEW"><ahelp hid="modules/scalc/ui/datafieldoptionsdialog/emptyline">Adds
an empty row after the data for each item in the pivot
table.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="2"
l10n="NEW">Show automatically</paragraph>
<paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US"
l10n="NEW">Displays the top or bottom nn items when you sort by a specified
field.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafieldoptionsdialog/show" id="bm_id4634540"
localize="false"/><paragraph role="heading" id="par_idN105A1" xml-lang="en-US"
level="3" l10n="NEW">Show</paragraph>
-<paragraph role="paragraph" id="par_idN105A5" xml-lang="en-US"
l10n="NEW"><ahelp hid="1495385091">Turns on the automatic show
feature.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105A5" xml-lang="en-US"
l10n="NEW"><ahelp hid="modules/scalc/ui/datafieldoptionsdialog/show">Turns on
the automatic show feature.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafieldoptionsdialog/items" id="bm_id6690878"
localize="false"/><paragraph role="heading" id="par_idN105A8" xml-lang="en-US"
level="4" l10n="NEW">items</paragraph>
-<paragraph role="paragraph" id="par_idN105AC" xml-lang="en-US"
l10n="NEW"><ahelp hid="1495390209">Enter the maximum number of items that you
want to show automatically.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105AC" xml-lang="en-US"
l10n="NEW"><ahelp hid="modules/scalc/ui/datafieldoptionsdialog/items">Enter the
maximum number of items that you want to show automatically.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafieldoptionsdialog/from" id="bm_id9420148"
localize="false"/><paragraph role="heading" id="par_idN105AF" xml-lang="en-US"
level="4" l10n="NEW">From</paragraph>
-<paragraph role="paragraph" id="par_idN105B3" xml-lang="en-US"
l10n="NEW"><ahelp hid="1495387655">Shows the top or bottom items in the
specified sort order.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105B3" xml-lang="en-US"
l10n="NEW"><ahelp hid="modules/scalc/ui/datafieldoptionsdialog/from">Shows the
top or bottom items in the specified sort order.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafieldoptionsdialog/using" id="bm_id923184"
localize="false"/><paragraph role="heading" id="par_idN105B6" xml-lang="en-US"
level="4" l10n="NEW">Using field</paragraph>
-<paragraph role="paragraph" id="par_idN105BA" xml-lang="en-US"
l10n="NEW"><ahelp hid="1495387656">Select the data field that you want to sort
the data by.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105BA" xml-lang="en-US"
l10n="NEW"><ahelp hid="modules/scalc/ui/datafieldoptionsdialog/using">Select
the data field that you want to sort the data by.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafieldoptionsdialog/hideitems"
id="bm_id2068849" localize="false"/><paragraph role="heading" id="par_idN105BD"
xml-lang="en-US" level="2" l10n="NEW">Hide items</paragraph>
-<paragraph role="paragraph" id="par_idN105C1" xml-lang="en-US"
l10n="NEW"><ahelp hid="59010">Select the items that you want to hide from the
calculations.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105C1" xml-lang="en-US"
l10n="NEW"><ahelp
hid="modules/scalc/ui/datafieldoptionsdialog/hideitems">Select the items that
you want to hide from the calculations.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/datafieldoptionsdialog/hierarchy"
id="bm_id6507461" localize="false"/><paragraph role="heading" id="par_idN105C4"
xml-lang="en-US" level="3" l10n="NEW">Hierarchy</paragraph>
-<paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US"
l10n="NEW"><ahelp hid="1495387657">Select the hierarchy that you want to use.
The pivot table must be based on an external source data that contains data
hierarchies.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US"
l10n="NEW"><ahelp
hid="modules/scalc/ui/datafieldoptionsdialog/hierarchy">Select the hierarchy
that you want to use. The pivot table must be based on an external source data
that contains data hierarchies.</ahelp></paragraph>
</body>
</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
