From 7436d694795fafe2fd6b53431a4d3a91a3dc45dc Mon Sep 17 00:00:00 2001 From: "Daniel Rentz [dr]" Date: Wed, 12 Jan 2011 10:06:16 +0100 Subject: dr79: #i116407# change term 'DataPilot' to 'Pivot Table' in help, thanks to UFI --- helpcontent2/source/auxiliary/scalc.tree | 16 ++++---- helpcontent2/source/text/scalc/00/00000412.xhp | 32 ++++++++-------- helpcontent2/source/text/scalc/01/04060109.xhp | 28 +++++++------- helpcontent2/source/text/scalc/01/12080200.xhp | 6 +-- helpcontent2/source/text/scalc/01/12080700.xhp | 10 ++--- helpcontent2/source/text/scalc/01/12090000.xhp | 20 ++++------ helpcontent2/source/text/scalc/01/12090100.xhp | 25 +++++------- helpcontent2/source/text/scalc/01/12090101.xhp | 8 ++-- helpcontent2/source/text/scalc/01/12090102.xhp | 44 +++++++++++----------- helpcontent2/source/text/scalc/01/12090105.xhp | 17 +++------ helpcontent2/source/text/scalc/01/12090106.xhp | 18 ++++----- helpcontent2/source/text/scalc/01/12090200.xhp | 10 ++--- helpcontent2/source/text/scalc/01/12090300.xhp | 24 +++++------- helpcontent2/source/text/scalc/01/12090400.xhp | 12 ++---- helpcontent2/source/text/scalc/04/01020000.xhp | 4 +- helpcontent2/source/text/scalc/guide/datapilot.xhp | 23 +++++------ .../text/scalc/guide/datapilot_createtable.xhp | 26 ++++++------- .../text/scalc/guide/datapilot_deletetable.xhp | 21 +++++------ .../text/scalc/guide/datapilot_edittable.xhp | 23 ++++++----- .../text/scalc/guide/datapilot_filtertable.xhp | 22 +++++------ .../source/text/scalc/guide/datapilot_grouping.xhp | 22 +++++------ .../source/text/scalc/guide/datapilot_tipps.xhp | 26 ++++++------- .../text/scalc/guide/datapilot_updatetable.xhp | 24 +++++------- helpcontent2/source/text/scalc/main0112.xhp | 6 +-- .../source/text/shared/guide/microsoft_terms.xhp | 16 ++------ helpcontent2/source/text/shared/tree_strings.xhp | 8 ++-- 26 files changed, 221 insertions(+), 270 deletions(-) diff --git a/helpcontent2/source/auxiliary/scalc.tree b/helpcontent2/source/auxiliary/scalc.tree index d1c1507d9f..087ee9ce84 100755 --- a/helpcontent2/source/auxiliary/scalc.tree +++ b/helpcontent2/source/auxiliary/scalc.tree @@ -114,14 +114,14 @@ Sorting Database Ranges - -DataPilot -Creating DataPilot Tables -Deleting DataPilot Tables -Editing DataPilot Tables -Filtering DataPilot Tables -Selecting DataPilot Output Ranges -Updating DataPilot Tables + +Pivot Tables +Creating Pivot Tables +Deleting Pivot Tables +Editing Pivot Tables +Filtering Pivot Tables +Selecting Pivot Table Output Ranges +Updating Pivot Tables Using Scenarios diff --git a/helpcontent2/source/text/scalc/00/00000412.xhp b/helpcontent2/source/text/scalc/00/00000412.xhp index a432a91a4f..09d8faede5 100644 --- a/helpcontent2/source/text/scalc/00/00000412.xhp +++ b/helpcontent2/source/text/scalc/00/00000412.xhp @@ -6,8 +6,8 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * Copyright 2000, 2011 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -77,7 +77,7 @@ -Choose Data - Sort - Options tab +Choose Data - Sort - Options tab Choose Data - Filter @@ -128,17 +128,17 @@ Choose Data - Subtotals -Choose Data - Subtotals - 1st, 2nd, 3rd Group tabs +Choose Data - Subtotals - 1st, 2nd, 3rd Group tabs -Choose Data - Subtotals - Options tab +Choose Data - Subtotals - Options tab Choose Data - Validity -Menu Data - Validity - Criteria tab +Menu Data - Validity - Criteria tab -Choose Data - Validity - Input Help tab +Choose Data - Validity - Input Help tab -Choose Data - Validity - Error Alert tab +Choose Data - Validity - Error Alert tab Choose Data - Multiple Operations @@ -194,21 +194,21 @@ Choose Data - Group and Outline - Remove -Choose Data - Group and Outline - Show Details (for some DataPilot tables) +Choose Data - Group and Outline - Show Details (for some pivot tables) -Choose Data - DataPilot +Choose Data - Pivot Table -Choose Data - DataPilot - Start +Choose Data - Pivot Table - Create -Choose Data - DataPilot - Start, in the Select Source dialog choose the option Data source registered in $[officename]. +Choose Data - Pivot Table - Create, in the Select Source dialog choose the option Data source registered in $[officename].
-Choose Data - DataPilot - Start, in the Select Source dialog choose the option Current selection. -Choose Data - DataPilot - Start, in the Select Source dialog choose the option Data source registered in $[officename], click OK to see Select Data Source dialog. +Choose Data - Pivot Table - Create, in the Select Source dialog choose the option Current selection. +Choose Data - Pivot Table - Create, in the Select Source dialog choose the option Data source registered in $[officename], click OK to see Select Data Source dialog.
-Choose Data - DataPilot - Refresh +Choose Data - Pivot Table - Refresh -Choose Data - DataPilot - Delete +Choose Data - Pivot Table - Delete Choose Data - Refresh Range diff --git a/helpcontent2/source/text/scalc/01/04060109.xhp b/helpcontent2/source/text/scalc/01/04060109.xhp index 8c78a37c18..9dbf21f342 100644 --- a/helpcontent2/source/text/scalc/01/04060109.xhp +++ b/helpcontent2/source/text/scalc/01/04060109.xhp @@ -6,7 +6,7 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * Copyright 2000, 2011 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -594,29 +594,29 @@ GETPIVOTDATA - The GETPIVOTDATA function returns a result value from a DataPilot table. The value is addressed using field and item names, so it remains valid if the layout of the DataPilot table changes. + The GETPIVOTDATA function returns a result value from a pivot table. The value is addressed using field and item names, so it remains valid if the layout of the pivot table changes. Syntax Two different syntax definitions can be used: - GETPIVOTDATA(TargetField; DataPilot; [ Field 1; Item 1; ... ]) - GETPIVOTDATA(DataPilot; Constraints) + GETPIVOTDATA(TargetField; pivot table; [ Field 1; Item 1; ... ]) + GETPIVOTDATA(pivot table; Constraints) The second syntax is assumed if exactly two parameters are given, of which the first parameter is a cell or cell range reference. The first syntax is assumed in all other cases. The Function Wizard shows the first syntax. First Syntax - TargetField is a string that selects one of the DataPilot table's data fields. The string can be the name of the source column, or the data field name as shown in the table (like "Sum - Sales"). + TargetField is a string that selects one of the pivot table's data fields. The string can be the name of the source column, or the data field name as shown in the table (like "Sum - Sales"). - DataPilot is a reference to a cell or cell range that is positioned within a DataPilot table or contains a DataPilot table. If the cell range contains several DataPilot tables, the table that was created last is used. - If no Field n / Item n pairs are given, the grand total is returned. Otherwise, each pair adds a constraint that the result must satisfy. Field n is the name of a field from the DataPilot table. Item n is the name of an item from that field. - If the DataPilot 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 DataPilot table. - If the source data contains entries that are hidden by settings of the DataPilot table, they are ignored. The order of the Field/Item pairs is not significant. Field and item names are not case-sensitive. - 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 DataPilot table, populated using the "Page Fields" area of the DataPilot Layout dialog. From each page field, an item (value) can be selected, which means only that item is included in the calculation. - Subtotal values from the DataPilot table are only used if they use the function "auto" (except when specified in the constraint, see Second Syntax below). + pivot table is a reference to a cell or cell range that is positioned within a pivot table or contains a pivot table. If the cell range contains several pivot tables, the table that was created last is used. + If no Field n / Item n pairs are given, the grand total is returned. Otherwise, each pair adds a constraint that the result must satisfy. Field n is the name of a field from the pivot table. Item n is the name of an item from that field. + 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. + 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. + 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. + Subtotal values from the pivot table are only used if they use the function "auto" (except when specified in the constraint, see Second Syntax below). Second Syntax - DataPilot has the same meaning as in the first syntax. + pivot table has the same meaning as in the first syntax.
Constraints is a space-separated list. Entries can be quoted (single quotes). The whole string must be enclosed in quotes (double quotes), unless you reference the string from another cell. - One of the entries can be the data field name. The data field name can be left out if the DataPilot table contains only one data field, otherwise it must be present. - Each of the other entries specifies a constraint in the form Field[Item] (with literal characters [ and ]), or only Item if the item name is unique within all fields that are used in the DataPilot table.i82342 + One of the entries can be the data field name. The data field name can be left out if the pivot table contains only one data field, otherwise it must be present. + Each of the other entries specifies a constraint in the form Field[Item] (with literal characters [ and ]), or only Item if the item name is unique within all fields that are used in the pivot table.i82342 A function name can be added in the form Field[Item;Function], which will cause the constraint to match only subtotal values which use that function. The possible function names are Sum, Count, Average, Max, Min, Product, Count (Numbers only), StDev (Sample), StDevP (Population), Var (Sample), and VarP (Population), case-insensitive.UFI: Example from spec doc is quite difficult to localize. Try to find other one diff --git a/helpcontent2/source/text/scalc/01/12080200.xhp b/helpcontent2/source/text/scalc/01/12080200.xhp index 6dc8912078..c50dd95530 100644 --- a/helpcontent2/source/text/scalc/01/12080200.xhp +++ b/helpcontent2/source/text/scalc/01/12080200.xhp @@ -6,8 +6,8 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * Copyright 2000, 2011 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -52,7 +52,7 @@
-Show Details command in DataPilot tables +Show Details command in pivot tables
diff --git a/helpcontent2/source/text/scalc/01/12080700.xhp b/helpcontent2/source/text/scalc/01/12080700.xhp index 06a1436c1b..f22563129b 100644 --- a/helpcontent2/source/text/scalc/01/12080700.xhp +++ b/helpcontent2/source/text/scalc/01/12080700.xhp @@ -7,7 +7,7 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * Copyright 2000, 2011 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -35,17 +35,17 @@ -Show Details (DataPilot) +Show Details (Pivot Table) /text/scalc/01/12080700.xhp
-Show Details (DataPilot) -Inserts a new "drill-down" sheet with more information about the current DataPilot cell. You can also double-click a DataPilot cell to insert the "drill-down" sheet. The new sheet shows a subset of rows from the original data source that constitutes the result data displayed in the current cell. +Show Details (Pivot Table) +Inserts a new "drill-down" sheet with more information about the current pivot table cell. You can also double-click a pivot table cell to insert the "drill-down" sheet. The new sheet shows a subset of rows from the original data source that constitutes the result data displayed in the current cell.
-
Hidden items are not evaluated, the rows for the hidden items are included. Show Details is available only for DataPilot tables that are based on cell ranges or database data. +Hidden items are not evaluated, the rows for the hidden items are included. Show Details is available only for pivot tables that are based on cell ranges or database data.
diff --git a/helpcontent2/source/text/scalc/01/12090000.xhp b/helpcontent2/source/text/scalc/01/12090000.xhp index ef77f1c7d8..377869e05e 100755 --- a/helpcontent2/source/text/scalc/01/12090000.xhp +++ b/helpcontent2/source/text/scalc/01/12090000.xhp @@ -4,8 +4,8 @@ - + -DataPilot +Pivot Table /text/scalc/01/12090000.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -
-DataPilot -A DataPilot table provides a summary of large amounts of data. You can then rearrange the DataPilot table to view different summaries of the data. +Pivot Table +A pivot table provides a summary of large amounts of data. You can then rearrange the pivot table to view different summaries of the data.
-Start +Create -DataPilot dialog +Pivot table dialog
diff --git a/helpcontent2/source/text/scalc/01/12090100.xhp b/helpcontent2/source/text/scalc/01/12090100.xhp index 0d3718bd67..32513bbf4f 100644 --- a/helpcontent2/source/text/scalc/01/12090100.xhp +++ b/helpcontent2/source/text/scalc/01/12090100.xhp @@ -4,8 +4,8 @@ - + Select Source /text/scalc/01/12090100.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - - Select Source
-Opens a dialog where you can select the source for your DataPilot table, and then create your table. +Opens a dialog where you can select the source for your pivot table, and then create your table.
Selection -Select a data source for the DataPilot table. +Select a data source for the pivot table. Current Selection -Uses the selected cells as the data source for the DataPilot table. -The data columns in the DataPilot table use the same number format as the first data row in the current selection. +Uses the selected cells as the data source for the pivot table. +The data columns in the pivot table use the same number format as the first data row in the current selection. Data source registered in $[officename] -Uses a table or query in a database that is registered in $[officename] as the data source for the DataPilot table. +Uses a table or query in a database that is registered in $[officename] as the data source for the pivot table. External source/interface -Opens the External Source dialog where you can select the OLAP data source for the DataPilot table. -DataPilot dialog +Opens the External Source dialog where you can select the OLAP data source for the pivot table. +Pivot table dialog
diff --git a/helpcontent2/source/text/scalc/01/12090101.xhp b/helpcontent2/source/text/scalc/01/12090101.xhp index 8855a6bf2c..a6739bc7bd 100755 --- a/helpcontent2/source/text/scalc/01/12090101.xhp +++ b/helpcontent2/source/text/scalc/01/12090101.xhp @@ -4,8 +4,8 @@ - + @@ -59,7 +59,7 @@ Type Click the source type of for the selected data source. You can choose from four source types: "Table", "Query" and "SQL" or SQL (Native).
-DataPilot dialog +Pivot table dialog
diff --git a/helpcontent2/source/text/scalc/01/12090102.xhp b/helpcontent2/source/text/scalc/01/12090102.xhp index 8f5e66bc8a..f9b6187b7e 100644 --- a/helpcontent2/source/text/scalc/01/12090102.xhp +++ b/helpcontent2/source/text/scalc/01/12090102.xhp @@ -1,12 +1,12 @@ - + - - + + - DataPilot + Pivot Table /text/scalc/01/12090102.xhp -DataPilot function;show details - DataPilot function;drill down +pivot table function;show details +pivot table function;drill down - -DataPilot - Specify the layout of the table that is generated by the DataPilot. +Pivot Table + Specify the layout of the table that is generated by the pivot table.
- The DataPilot displays data fields as buttons which you can drag and drop to define the DataPilot table. + The pivot table displays data fields as buttons which you can drag and drop to define the pivot table. @@ -57,7 +56,7 @@ UFI: changed help id from 59001 to dply_page Layout - To define the layout of a DataPilot table, drag and drop data field buttons onto the Page Fields, Row Fields, Column Fields, and Data Fields areas. You can also use drag and drop to rearrange the data fields on a DataPilot table. + To define the layout of a pivot table, drag and drop data field buttons onto the Page Fields, Row Fields, Column Fields, and Data Fields areas. You can also use drag and drop to rearrange the data fields on a pivot table. $[officename] automatically adds a caption to buttons that are dragged into the Data Fields area. The caption contains the name of the data field as well as the formula that created the data. To change the function that is used by a data field, double-click a button in the Data Fields area to open the Data Field dialog. You can also double-click buttons in the Row Fields or Column Fields areas. @@ -71,19 +70,19 @@ More - Displays or hides additional options for defining the DataPilot table. + Displays or hides additional options for defining the pivot table. Result - Specify the settings for displaying the results of the DataPilot table. + Specify the settings for displaying the results of the pivot table. Selection from - Select the area that contains the data for the current datapilot table. + Select the area that contains the data for the current pivot table. Results to - Select the area where you want to display the results of the DataPilot table. + Select the area where you want to display the results of the pivot table. - If the selected area contains data, the DataPilot overwrites the data. To prevent the loss of existing data, let the DataPilot automatically select the area to display the results. + If the selected area contains data, the pivot table overwrites the data. To prevent the loss of existing data, let the pivot table automatically select the area to display the results. Ignore empty rows Ignores empty fields in the data source. @@ -100,16 +99,15 @@ Calculates and displays the grand total of the row calculation. Add filter - Adds a Filter button to DataPilot tables that are based on spreadsheet data. - + Adds a Filter button to pivot tables that are based on spreadsheet data. Opens the Filter dialog. Enable drill to details Select this check box and double-click an item label in the table to show or hide details for the item. Clear this check box and double-click a cell in the table to edit the contents of the cell. - To examine details inside a DataPilot table + To examine details inside a pivot table Do one of the following: - + Select a range of cells and choose Data - Group and Outline - Show Details. @@ -122,7 +120,7 @@ Show Detail Choose the field that you want to view the details for.
- DataPilot shortcut keys + Pivot table shortcut keys
\ No newline at end of file diff --git a/helpcontent2/source/text/scalc/01/12090105.xhp b/helpcontent2/source/text/scalc/01/12090105.xhp index 4f761bedb3..5484d260e7 100644 --- a/helpcontent2/source/text/scalc/01/12090105.xhp +++ b/helpcontent2/source/text/scalc/01/12090105.xhp @@ -4,8 +4,8 @@ - + Data field /text/scalc/01/12090105.xhp - -Sun Microsystems, Inc. -UFI: added info from spec sc-features Field Options in DataPilot -YJ: checked - -calculating;Data Pilot +calculating;pivot table Data field -The contents of this dialog is different for data fields in the Data area, and data fields in the Row or Column area of the DataPilot dialog. +The contents of this dialog is different for data fields in the Data area, and data fields in the Row or Column area of the Pivot Table dialog. Subtotals Specify the subtotals that you want to calculate. @@ -141,7 +136,7 @@ YJ: checked % of row -Each result is divided by the total result for its row in the DataPilot table. If there are several data fields, the total for the result's data field is used. If there are subtotals with manually selected summary functions, the total with the data field's summary function is still used. +Each result is divided by the total result for its row in the pivot table. If there are several data fields, the total for the result's data field is used. If there are subtotals with manually selected summary functions, the total with the data field's summary function is still used. diff --git a/helpcontent2/source/text/scalc/01/12090106.xhp b/helpcontent2/source/text/scalc/01/12090106.xhp index 6f04ba9d2c..842d7bb1e3 100644 --- a/helpcontent2/source/text/scalc/01/12090106.xhp +++ b/helpcontent2/source/text/scalc/01/12090106.xhp @@ -6,8 +6,8 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * Copyright 2000, 2011 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -40,12 +40,12 @@ -hiding;data fields, from calculations in Data Pilot -display options in Data Pilot -sorting;options in Data Pilot -data field options for Data Pilot +hiding;data fields, from calculations in pivot table +display options in pivot table +sorting;options in pivot table +data field options for pivot table mw changed "hiding..." entryData Field Options -You can specify additional options for column, row, and page data fields in the DataPilot. +You can specify additional options for column, row, and page data fields in the pivot table. Sort by Select the data field that you want to sort columns or rows by. Ascending @@ -59,7 +59,7 @@ Layout Select the layout mode for the field in the list box. Empty line after each item -Adds an empty row after the data for each item in the DataPilot table. +Adds an empty row after the data for each item in the pivot table. Show automatically Displays the top or bottom nn items when you sort by a specified field. Show @@ -73,6 +73,6 @@ Hide items Select the items that you want to hide from the calculations. Hierarchy -Select the hierarchy that you want to use. The DataPilot must be based on an external source data that contains data hierarchies. +Select the hierarchy that you want to use. The pivot table must be based on an external source data that contains data hierarchies. diff --git a/helpcontent2/source/text/scalc/01/12090200.xhp b/helpcontent2/source/text/scalc/01/12090200.xhp index 91081ce184..e619640974 100644 --- a/helpcontent2/source/text/scalc/01/12090200.xhp +++ b/helpcontent2/source/text/scalc/01/12090200.xhp @@ -4,8 +4,8 @@ - + @@ -44,9 +44,9 @@ Refresh -Updates the DataPilot table. +Updates the pivot table. -After you import an Excel spreadsheet that contains a Pivot table, click in the table, and then choose Data - DataPilot - Refresh. +After you import an Excel spreadsheet that contains a pivot table, click in the table, and then choose Data - Pivot Table - Refresh.
diff --git a/helpcontent2/source/text/scalc/01/12090300.xhp b/helpcontent2/source/text/scalc/01/12090300.xhp index e4ae79f4d5..2746a04605 100644 --- a/helpcontent2/source/text/scalc/01/12090300.xhp +++ b/helpcontent2/source/text/scalc/01/12090300.xhp @@ -4,8 +4,8 @@ +
+ Delete - Deletes the selected DataPilot table. -
-
- +Deletes the selected pivot table. +
+
+
- +
diff --git a/helpcontent2/source/text/scalc/01/12090400.xhp b/helpcontent2/source/text/scalc/01/12090400.xhp index 0b8deac477..6337482c43 100755 --- a/helpcontent2/source/text/scalc/01/12090400.xhp +++ b/helpcontent2/source/text/scalc/01/12090400.xhp @@ -4,8 +4,8 @@ - + Grouping /text/scalc/01/12090400.xhp - -UFI: Grouping dialog of DataPilot -YJ: checked - Grouping -Grouping DataPilot tables displays the Grouping dialog for either values or dates. +Grouping pivot tables displays the Grouping dialog for either values or dates.
diff --git a/helpcontent2/source/text/scalc/04/01020000.xhp b/helpcontent2/source/text/scalc/04/01020000.xhp index 7e312d217f..71a0d715ed 100755 --- a/helpcontent2/source/text/scalc/04/01020000.xhp +++ b/helpcontent2/source/text/scalc/04/01020000.xhp @@ -7,7 +7,7 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * Copyright 2000, 2011 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -558,7 +558,7 @@
-Using the DataPilot +Using the pivot table diff --git a/helpcontent2/source/text/scalc/guide/datapilot.xhp b/helpcontent2/source/text/scalc/guide/datapilot.xhp index 9bc65aedf7..7a8ff0a1a9 100755 --- a/helpcontent2/source/text/scalc/guide/datapilot.xhp +++ b/helpcontent2/source/text/scalc/guide/datapilot.xhp @@ -4,8 +4,8 @@ - + -DataPilot +Pivot Table /text/scalc/guide/datapilot.xhp - -Sun Microsystems, Inc. -FPE: Deleted screenshot, cleaned up -YJ: checked - -DataPilot function; introduction -Pivot table, see DataPilot function +pivot table function; introduction +DataPilot, see pivot table function -DataPilot +Pivot Table -The DataPilot (sometimes known as Pivot Table) allows you to combine, compare, and analyze large amounts of data. You can view different summaries of the source data, you can display the details of areas of interest, and you can create reports. -A table that has been created with the DataPilot is an interactive table. Data can be arranged, rearranged or summarized according to different points of view. +The pivot table (formerly known as DataPilot) allows you to combine, compare, and analyze large amounts of data. You can view different summaries of the source data, you can display the details of areas of interest, and you can create reports. +A table that has been created as a pivot table is an interactive table. Data can be arranged, rearranged or summarized according to different points of view.
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp index e605818255..1a6be7babf 100755 --- a/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp +++ b/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp @@ -1,12 +1,12 @@ - + - - + + - Creating DataPilot Tables + Creating Pivot Tables /text/scalc/guide/datapilot_createtable.xhp -DataPilot tables - DataPilot function; calling up and applying +pivot tables + pivot table function; calling up and applying -Creating DataPilot Tables +Creating Pivot Tables Position the cursor within a range of cells containing values, row and column headings. - Choose Data - DataPilot - Start. The Select Source dialog appears. Choose Current selection and confirm with OK. The table headings are shown as buttons in the DataPilot dialog. Drag these buttons as required and drop them into the layout areas "Page Fields", "Column Fields", "Row Fields" and "Data Fields". + Choose Data - Pivot Table - Create. The Select Source dialog appears. Choose Current selection and confirm with OK. The table headings are shown as buttons in the Pivot Table dialog. Drag these buttons as required and drop them into the layout areas "Page Fields", "Column Fields", "Row Fields" and "Data Fields". Drag the desired buttons into one of the four areas. - Drag a button to the Page Fields area to create a button and a listbox on top of the generated datapilot table. The listbox can be used to filter the DataPilot table by the contents of the selected item. You can use drag-and-drop within the generated DataPilot table to use another page field as a filter. + Drag a button to the Page Fields 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. If the button is dropped in the Data Fields area it will be given a caption that also shows the formula that will be used to calculate the data. By double-clicking on one of the fields in the Data Fields area you can call up the Data Field dialog. - Use the Data Field dialog to select the calculations to be used for the data. To make a multiple selection, press the Command + Use the Data Field dialog to select the calculations to be used for the data. To make a multiple selection, press the Command Ctrl key while clicking the desired calculation. @@ -76,7 +76,7 @@ To open the Data Field dialog, double-click one of the buttons in the Row or Column area. Use the dialog to select if and to what extent %PRODUCTNAME calculates display subtotals. - Exit the DataPilot dialog by pressing OK. A Filter button will now be inserted, or a page button for every data field that you dropped in the Page Fields area. The DataPilot table is inserted further down. + Exit the Pivot Table dialog by pressing OK. A Filter button will now be inserted, or a page button for every data field that you dropped in the Page Fields area. The pivot table is inserted further down.
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_deletetable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_deletetable.xhp index de85d0d9ff..ee9fe95802 100755 --- a/helpcontent2/source/text/scalc/guide/datapilot_deletetable.xhp +++ b/helpcontent2/source/text/scalc/guide/datapilot_deletetable.xhp @@ -1,12 +1,12 @@ - + - - + + - Deleting DataPilot Tables + Deleting Pivot Tables /text/scalc/guide/datapilot_deletetable.xhp -DataPilot function; deleting tables - deleting;DataPilot tables +pivot table function; deleting tables + deleting;pivot tables -Deleting DataPilot Tables +Deleting Pivot Tables - In order to delete a DataPilot table, select any cell in the DataPilot table, then choose Delete in the context menu. + In order to delete a pivot table, click any cell in the pivot table, then choose Delete in the context menu.
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp index 20082ed7dd..4d8eb444f5 100644 --- a/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp +++ b/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp @@ -6,7 +6,7 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * Copyright 2000, 2011 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -33,24 +33,23 @@ - Editing DataPilot Tables + Editing Pivot Tables /text/scalc/guide/datapilot_edittable.xhp -DataPilot function; editing tables - editing;DataPilot tables +pivot table function; editing tables +editing;pivot tables -Editing DataPilot Tables +Editing Pivot Tables - Click one of the buttons in the table that the DataPilot has created and hold the mouse button down. A special symbol will appear next to the mouse pointer. + 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. 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. - In the DataPilot dialog, you can drag a button to the Page Fields area to create a button and a listbox on top of the generated DataPilot table. The listbox can be used to filter the DataPilot table by the contents of the selected item. You can use drag-and-drop within the generated DataPilot table to use another page field as a filter. - To remove a button from the table, just drag it out of the DataPilot table. Release the mouse button when the mouse pointer positioned within the sheet has become a 'not allowed' icon. The button is deleted. - To edit the DataPilot table, click a cell inside the DataPilot table and open the context menu. In the context menu you find the command Start, which displays the DataPilot dialog for the current DataPilot table. - In the DataPilot table, you can use drag-and-drop or cut/paste commands to rearrange the order of data fields. - You can assign custom display names to fields, field members, subtotals (with some restrictions), and grand totals inside DataPilot tables. A custom display name is assigned to an item by overwriting the original name with another name. + In the Pivot Table dialog, you can drag a button to the Page Fields 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. + 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. + 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 Layout, which displays the Pivot Table dialog for the current pivot table. + In the pivot table, you can use drag-and-drop or cut/paste commands to rearrange the order of data fields. + You can assign custom display names to fields, field members, subtotals (with some restrictions), and grand totals inside pivot tables. A custom display name is assigned to an item by overwriting the original name with another name.
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp index 87e7e3ab5c..4adedbf77b 100644 --- a/helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp +++ b/helpcontent2/source/text/scalc/guide/datapilot_filtertable.xhp @@ -3,7 +3,7 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * Copyright 2000, 2011 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -28,34 +28,34 @@ -Filtering DataPilot Tables +Filtering Pivot Tables /text/scalc/guide/datapilot_filtertable.xhp -DataPilot function; filtering tables -filtering;DataPilot tables +pivot table function; filtering tables +filtering;pivot tables -Filtering DataPilot Tables -You can use filters to remove unwanted data from a DataPilot table. -Click the Filter button in the sheet to call up the dialog for the filter conditions. Alternatively, call up the context menu of the DataPilot table and select the Filter command. The Filter dialog appears. Here you can filter the DataPilot table. -You can also click the arrow on a button in the DataPilot table to show a pop-up window. In this pop-up window, you can edit the visibility settings of the associated field. +Filtering Pivot Tables +You can use filters to remove unwanted data from a pivot table. +Click the Filter button in the sheet to call up the dialog for the filter conditions. Alternatively, call up the context menu of the pivot table and select the Filter command. The Filter dialog appears. Here you can filter the pivot table. +You can also click the arrow on a button in the pivot table to show a pop-up window. In this pop-up window, you can edit the visibility settings of the associated field. The pop-up window displays a list of field members associated with that field. A check box is placed to the left of each field member name. When a field has an alternative display name that differs from its original name, that name is displayed in the list. -Enable or disable a checkbox to show or hide the associated field member in the DataPilot table. +Enable or disable a checkbox to show or hide the associated field member in the pivot table. Enable or disable the All checkbox to show all or none of the field members. -Select a field member in the pop-up window and click the Show only the current item button to show only the selected field member. All other field members are hidden in the DataPilot table. +Select a field member in the pop-up window and click the Show only the current item button to show only the selected field member. All other field members are hidden in the pivot table. -Select a field member in the pop-up window and click the Hide only the current item button to hide only the selected field member. All other field members are shown in the DataPilot table. +Select a field member in the pop-up window and click the Hide only the current item button to hide only the selected field member. All other field members are shown in the pivot table. Commands enable you to sort the field members in ascending order, descending order, or using a custom sort list. diff --git a/helpcontent2/source/text/scalc/guide/datapilot_grouping.xhp b/helpcontent2/source/text/scalc/guide/datapilot_grouping.xhp index 5610db5c59..254374ea0f 100755 --- a/helpcontent2/source/text/scalc/guide/datapilot_grouping.xhp +++ b/helpcontent2/source/text/scalc/guide/datapilot_grouping.xhp @@ -6,8 +6,8 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * Copyright 2000, 2011 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -35,27 +35,27 @@ -Grouping DataPilot Tables +Grouping Pivot Tables /text/scalc/guide/datapilot_grouping.xhp -grouping; DataPilot tables -DataPilot function;grouping table entries -ungrouping entries in DataPilot tables +grouping; pivot tables +pivot table function;grouping table entries +ungrouping entries in pivot tables -Grouping DataPilot Tables -see http://specs.openoffice.org/calc/compatibility/grouping.sxwThe resulting DataPilot table can contain many different entries. By grouping the entries, you can improve the visible result. +Grouping Pivot Tables +see http://specs.openoffice.org/calc/compatibility/grouping.sxwThe resulting pivot table can contain many different entries. By grouping the entries, you can improve the visible result. -Select a cell or range of cells in the DataPilot table. +Select a cell or range of cells in the pivot table. Choose Data - Group and Outline - Group. -Depending on the format of the selected cells, either a new group field is added to the DataPilot table, or you see one of the two Grouping dialogs, either for numeric values, or for date values. -The DataPilot table must be organized in a way that grouping can be applied. +Depending on the format of the selected cells, either a new group field is added to the pivot table, or you see one of the two Grouping dialogs, either for numeric values, or for date values. +The pivot table must be organized in a way that grouping can be applied. To remove a grouping, click inside the group, then choose Data - Group and Outline - Ungroup. diff --git a/helpcontent2/source/text/scalc/guide/datapilot_tipps.xhp b/helpcontent2/source/text/scalc/guide/datapilot_tipps.xhp index 72a1079d11..8cebe609b0 100755 --- a/helpcontent2/source/text/scalc/guide/datapilot_tipps.xhp +++ b/helpcontent2/source/text/scalc/guide/datapilot_tipps.xhp @@ -4,8 +4,8 @@ - + -Selecting DataPilot Output Ranges +Selecting Pivot Table Output Ranges /text/scalc/guide/datapilot_tipps.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - -DataPilot function; preventing data overwriting -output ranges of DataPilot tables +pivot table function; preventing data overwriting +output ranges of pivot tables -Selecting DataPilot Output Ranges +Selecting Pivot Table Output Ranges -Click the button More in the DataPilot dialog. The dialog will be extended. -You can select a named range in which the DataPilot table is to be created, from the Results to box. If the results range does not have a name, enter the coordinates of the upper left cell of the range into the field to the right of the Results to box. You can also click on the appropriate cell to have the coordinates entered accordingly. -If you mark the Ignore empty rows check box, they will not be taken into account when the DataPilot table is created. -If the Identify categories check box is marked, the categories will be identified by their headings and assigned accordingly when the DataPilot table is created. +Click the button More in the Pivot Table dialog. The dialog will be extended. +You can select a named range in which the pivot table is to be created, from the Results to box. If the results range does not have a name, enter the coordinates of the upper left cell of the range into the field to the right of the Results to box. You can also click on the appropriate cell to have the coordinates entered accordingly. +If you mark the Ignore empty rows check box, they will not be taken into account when the pivot table is created. +If the Identify categories check box is marked, the categories will be identified by their headings and assigned accordingly when the pivot table is created.
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_updatetable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_updatetable.xhp index 002bd09af0..da16c04b43 100755 --- a/helpcontent2/source/text/scalc/guide/datapilot_updatetable.xhp +++ b/helpcontent2/source/text/scalc/guide/datapilot_updatetable.xhp @@ -5,8 +5,8 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * Copyright 2000, 2011 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -29,27 +29,23 @@ * ************************************************************************ --> - + -Updating DataPilot Tables +Updating Pivot Tables /text/scalc/guide/datapilot_updatetable.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - -Pivot table import -DataPilot function; refreshing tables -recalculating;DataPilot tables -updating;DataPilot tables +pivot table import +pivot table function; refreshing tables +recalculating;pivot tables +updating;pivot tables -Updating DataPilot Tables +Updating Pivot Tables -If the data of the source sheet has been changed, $[officename] recalculates the DataPilot table. To recalculate the tables, choose Data - DataPilot - Refresh. Do the same after you have imported an Excel Pivot table into $[officename] Calc. +If the data of the source sheet has been changed, $[officename] recalculates the pivot table. To recalculate the table, choose Data - Pivot Table - Refresh. Do the same after you have imported an Excel pivot table into $[officename] Calc.
diff --git a/helpcontent2/source/text/scalc/main0112.xhp b/helpcontent2/source/text/scalc/main0112.xhp index 070b076ca0..3316380e78 100755 --- a/helpcontent2/source/text/scalc/main0112.xhp +++ b/helpcontent2/source/text/scalc/main0112.xhp @@ -6,8 +6,8 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * Copyright 2000, 2011 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -42,7 +42,7 @@
Data -Use the Data menu commands to edit the data in the current sheet. You can define ranges, sort and filter the data, calculate results, outline data, and open the DataPilot. +Use the Data menu commands to edit the data in the current sheet. You can define ranges, sort and filter the data, calculate results, outline data, and create a pivot table.
Define Range diff --git a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp index 8e96a8fc24..8f07bcad9b 100755 --- a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp +++ b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp @@ -1,11 +1,11 @@ - + - - + + Comparing Microsoft Office and $[officename] Terms @@ -135,14 +135,6 @@ -PivotTable - - -DataPilot - - - - Refresh Data (in Excel) diff --git a/helpcontent2/source/text/shared/tree_strings.xhp b/helpcontent2/source/text/shared/tree_strings.xhp index 31991694cb..c2955981f5 100755 --- a/helpcontent2/source/text/shared/tree_strings.xhp +++ b/helpcontent2/source/text/shared/tree_strings.xhp @@ -4,7 +4,7 @@