diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:16 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:16 +0100 |
| commit | bc131c1ceaca2a227d4827f765e83faa0754a3f1 (patch) | |
| tree | d275c8e57d62430153ca6ef21966f5033fd99cd9 /helpcontent2/source/auxiliary | |
| parent | d55766ce22ef3ed771938e5ad60f6b776bab38ad (diff) | |
| parent | 13e0998c215eb9419fce0ca6a4fc0d69a18356d5 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
helpcontent2/helpers/hid.lst
helpcontent2/source/text/scalc/01/04050000.xhp
helpcontent2/source/text/scalc/guide/text_rotate.xhp
helpcontent2/source/text/shared/01/04110000.xhp
helpcontent2/source/text/shared/01/06040000.xhp
helpcontent2/source/text/shared/02/01170202.xhp
helpcontent2/source/text/shared/main0108.xhp
helpcontent2/source/text/shared/optionen/01030000.xhp
helpcontent2/source/text/swriter/01/05150101.xhp
helpcontent2/util/target.pmk
Diffstat (limited to 'helpcontent2/source/auxiliary')
| -rwxr-xr-x | helpcontent2/source/auxiliary/scalc.tree | 16 | ||||
| -rwxr-xr-x | helpcontent2/source/auxiliary/swriter.tree | 3 |
2 files changed, 10 insertions, 9 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 @@ <!-- removed scalc/text/scalc/guide/database_group.xhp --> <topic id="scalc/text/scalc/guide/database_sort.xhp">Sorting Database Ranges</topic> </node> - <node id="0809" title="Data Pilot"> -<topic id="scalc/text/scalc/guide/datapilot.xhp">DataPilot</topic> -<topic id="scalc/text/scalc/guide/datapilot_createtable.xhp">Creating DataPilot Tables</topic> -<topic id="scalc/text/scalc/guide/datapilot_deletetable.xhp">Deleting DataPilot Tables</topic> -<topic id="scalc/text/scalc/guide/datapilot_edittable.xhp">Editing DataPilot Tables</topic> -<topic id="scalc/text/scalc/guide/datapilot_filtertable.xhp">Filtering DataPilot Tables</topic> -<topic id="scalc/text/scalc/guide/datapilot_tipps.xhp">Selecting DataPilot Output Ranges</topic> -<topic id="scalc/text/scalc/guide/datapilot_updatetable.xhp">Updating DataPilot Tables</topic> + <node id="0809" title="Pivot Tables"> +<topic id="scalc/text/scalc/guide/datapilot.xhp">Pivot Tables</topic> +<topic id="scalc/text/scalc/guide/datapilot_createtable.xhp">Creating Pivot Tables</topic> +<topic id="scalc/text/scalc/guide/datapilot_deletetable.xhp">Deleting Pivot Tables</topic> +<topic id="scalc/text/scalc/guide/datapilot_edittable.xhp">Editing Pivot Tables</topic> +<topic id="scalc/text/scalc/guide/datapilot_filtertable.xhp">Filtering Pivot Tables</topic> +<topic id="scalc/text/scalc/guide/datapilot_tipps.xhp">Selecting Pivot Table Output Ranges</topic> +<topic id="scalc/text/scalc/guide/datapilot_updatetable.xhp">Updating Pivot Tables</topic> </node> <node id="0810" title="Scenarios"> <topic id="scalc/text/scalc/guide/scenario.xhp">Using Scenarios</topic> diff --git a/helpcontent2/source/auxiliary/swriter.tree b/helpcontent2/source/auxiliary/swriter.tree index 901258414d..b0435240f0 100755 --- a/helpcontent2/source/auxiliary/swriter.tree +++ b/helpcontent2/source/auxiliary/swriter.tree @@ -45,7 +45,7 @@ </node> </node> - <node id="0203" title="Creating Text Documents"> + <node id="0203" title="Creating Text Documents"> <topic id="swriter/text/swriter/guide/text_nav_keyb.xhp">Navigating and Selecting With the Keyboard</topic> <topic id="swriter/text/swriter/guide/text_direct_cursor.xhp">Using the Direct Cursor</topic> </node> @@ -119,6 +119,7 @@ <topic id="swriter/text/swriter/guide/template_create.xhp">Creating a Document Template</topic> <topic id="swriter/text/swriter/guide/template_default.xhp">Changing the Default Template</topic> </node> +<topic id="swriter/text/swriter/guide/pageorientation.xhp">Landscape or Portrait Pages</topic> <topic id="swriter/text/swriter/guide/text_capital.xhp">Changing the Case of Text</topic> <topic id="swriter/text/swriter/guide/hidden_text.xhp">Hiding Text</topic> <topic id="swriter/text/swriter/guide/header_pagestyles.xhp">Defining Different Headers and Footers</topic> |