summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-11-26 15:57:11 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-11-26 15:57:11 +0000
commit5ccd1d319b38120437fe69a3b6884e00cf22ee4e (patch)
tree3fbc437a38c99a98250c39533659836eeae1c4c9
parentf01f267f5bf6a19106771b39ad3253913efb0001 (diff)
CWS-TOOLING: integrate CWS hcshared19
-rw-r--r--helpcontent2/helpers/help_hid.lst117
-rwxr-xr-xhelpcontent2/source/auxiliary/swriter.tree3
-rw-r--r--helpcontent2/source/text/sbasic/guide/makefile.mk2
-rw-r--r--helpcontent2/source/text/sbasic/shared/01/06130000.xhp5
-rw-r--r--helpcontent2/source/text/sbasic/shared/01/makefile.mk2
-rw-r--r--helpcontent2/source/text/sbasic/shared/01030200.xhp5
-rwxr-xr-xhelpcontent2/source/text/sbasic/shared/01030400.xhp5
-rw-r--r--helpcontent2/source/text/sbasic/shared/02/makefile.mk2
-rwxr-xr-xhelpcontent2/source/text/sbasic/shared/03102600.xhp22
-rwxr-xr-xhelpcontent2/source/text/sbasic/shared/keys.xhp4
-rw-r--r--helpcontent2/source/text/sbasic/shared/makefile.mk2
-rw-r--r--helpcontent2/source/text/scalc/00/00000404.xhp8
-rw-r--r--helpcontent2/source/text/scalc/00/00000412.xhp5
-rw-r--r--helpcontent2/source/text/scalc/00/makefile.mk2
-rw-r--r--helpcontent2/source/text/scalc/01/01120000.xhp4
-rw-r--r--helpcontent2/source/text/scalc/01/02210000.xhp4
-rw-r--r--helpcontent2/source/text/scalc/01/04040000.xhp45
-rw-r--r--helpcontent2/source/text/scalc/01/04050000.xhp51
-rw-r--r--helpcontent2/source/text/scalc/01/04060000.xhp55
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060100.xhp23
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060101.xhp298
-rw-r--r--helpcontent2/source/text/scalc/01/04060102.xhp42
-rw-r--r--helpcontent2/source/text/scalc/01/04060103.xhp282
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060104.xhp265
-rw-r--r--helpcontent2/source/text/scalc/01/04060105.xhp45
-rw-r--r--helpcontent2/source/text/scalc/01/04060106.xhp18
-rw-r--r--helpcontent2/source/text/scalc/01/04060107.xhp68
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060108.xhp71
-rw-r--r--helpcontent2/source/text/scalc/01/04060109.xhp192
-rw-r--r--helpcontent2/source/text/scalc/01/04060110.xhp117
-rw-r--r--helpcontent2/source/text/scalc/01/04060111.xhp46
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060115.xhp75
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060116.xhp164
-rw-r--r--helpcontent2/source/text/scalc/01/04060118.xhp130
-rw-r--r--helpcontent2/source/text/scalc/01/04060119.xhp94
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060181.xhp108
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060182.xhp67
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060183.xhp52
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060184.xhp79
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060185.xhp11
-rw-r--r--helpcontent2/source/text/scalc/01/04070100.xhp28
-rw-r--r--helpcontent2/source/text/scalc/01/04070400.xhp30
-rw-r--r--helpcontent2/source/text/scalc/01/05050100.xhp34
-rw-r--r--helpcontent2/source/text/scalc/01/05080300.xhp30
-rwxr-xr-xhelpcontent2/source/text/scalc/01/05110000.xhp26
-rw-r--r--helpcontent2/source/text/scalc/01/05120000.xhp25
-rw-r--r--helpcontent2/source/text/scalc/01/06040000.xhp27
-rw-r--r--helpcontent2/source/text/scalc/01/06080000.xhp23
-rw-r--r--helpcontent2/source/text/scalc/01/06130000.xhp4
-rw-r--r--helpcontent2/source/text/scalc/01/12010000.xhp28
-rwxr-xr-xhelpcontent2/source/text/scalc/01/12040000.xhp24
-rwxr-xr-xhelpcontent2/source/text/scalc/01/12040201.xhp27
-rw-r--r--helpcontent2/source/text/scalc/01/12040300.xhp24
-rw-r--r--helpcontent2/source/text/scalc/01/12060000.xhp64
-rw-r--r--helpcontent2/source/text/scalc/01/12070000.xhp27
-rw-r--r--helpcontent2/source/text/scalc/01/12090102.xhp66
-rwxr-xr-xhelpcontent2/source/text/scalc/01/12120100.xhp4
-rw-r--r--helpcontent2/source/text/scalc/01/func_datevalue.xhp4
-rw-r--r--helpcontent2/source/text/scalc/01/makefile.mk2
-rw-r--r--helpcontent2/source/text/scalc/01/text2columns.xhp19
-rw-r--r--helpcontent2/source/text/scalc/02/makefile.mk2
-rwxr-xr-xhelpcontent2/source/text/scalc/04/01020000.xhp138
-rw-r--r--helpcontent2/source/text/scalc/04/makefile.mk2
-rwxr-xr-xhelpcontent2/source/text/scalc/05/02140000.xhp4
-rw-r--r--helpcontent2/source/text/scalc/05/makefile.mk2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/auto_off.xhp24
-rw-r--r--helpcontent2/source/text/scalc/guide/background.xhp91
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/calc_series.xhp4
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/csv_files.xhp27
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/csv_formula.xhp31
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/datapilot_createtable.xhp4
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/edit_multitables.xhp6
-rw-r--r--helpcontent2/source/text/scalc/guide/finding.xhp4
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/format_table.xhp4
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/formula_copy.xhp11
-rw-r--r--helpcontent2/source/text/scalc/guide/keyboard.xhp8
-rw-r--r--helpcontent2/source/text/scalc/guide/makefile.mk2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/mark_cells.xhp7
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/matrixformula.xhp5
-rw-r--r--helpcontent2/source/text/scalc/guide/move_dragdrop.xhp64
-rw-r--r--helpcontent2/source/text/scalc/guide/multitables.xhp8
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/print_landscape.xhp5
-rw-r--r--helpcontent2/source/text/scalc/guide/rename_table.xhp52
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/scenario.xhp4
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/sorted_list.xhp4
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/text_wrap.xhp5
-rwxr-xr-xhelpcontent2/source/text/scalc/main0103.xhp3
-rw-r--r--helpcontent2/source/text/scalc/makefile.mk2
-rw-r--r--helpcontent2/source/text/schart/00/makefile.mk2
-rw-r--r--helpcontent2/source/text/schart/01/04050000.xhp19
-rw-r--r--helpcontent2/source/text/schart/01/05040201.xhp6
-rw-r--r--helpcontent2/source/text/schart/01/makefile.mk2
-rw-r--r--helpcontent2/source/text/schart/01/type_xy.xhp36
-rw-r--r--helpcontent2/source/text/schart/02/makefile.mk2
-rwxr-xr-xhelpcontent2/source/text/schart/04/01020000.xhp4
-rw-r--r--helpcontent2/source/text/schart/04/makefile.mk2
-rw-r--r--helpcontent2/source/text/schart/makefile.mk2
-rw-r--r--helpcontent2/source/text/sdraw/00/makefile.mk2
-rw-r--r--helpcontent2/source/text/sdraw/01/makefile.mk2
-rwxr-xr-xhelpcontent2/source/text/sdraw/04/01020000.xhp305
-rw-r--r--helpcontent2/source/text/sdraw/04/makefile.mk2
-rw-r--r--helpcontent2/source/text/sdraw/guide/cross_fading.xhp4
-rw-r--r--helpcontent2/source/text/sdraw/guide/draw_sector.xhp5
-rw-r--r--helpcontent2/source/text/sdraw/guide/keyboard.xhp8
-rwxr-xr-xhelpcontent2/source/text/sdraw/guide/main.xhp20
-rw-r--r--helpcontent2/source/text/sdraw/guide/makefile.mk2
-rw-r--r--helpcontent2/source/text/sdraw/guide/rotate_object.xhp32
-rwxr-xr-xhelpcontent2/source/text/sdraw/main0103.xhp3
-rwxr-xr-xhelpcontent2/source/text/sdraw/main0210.xhp3
-rw-r--r--helpcontent2/source/text/sdraw/makefile.mk2
-rw-r--r--helpcontent2/source/text/shared/00/00000001.xhp133
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000005.xhp10
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000021.xhp12
-rw-r--r--helpcontent2/source/text/shared/00/00000401.xhp110
-rw-r--r--helpcontent2/source/text/shared/00/00000402.xhp20
-rw-r--r--helpcontent2/source/text/shared/00/00000403.xhp5
-rw-r--r--helpcontent2/source/text/shared/00/00000406.xhp60
-rw-r--r--helpcontent2/source/text/shared/00/00040501.xhp14
-rw-r--r--helpcontent2/source/text/shared/00/makefile.mk2
-rw-r--r--helpcontent2/source/text/shared/01/01010100.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/01020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/01050000.xhp26
-rwxr-xr-xhelpcontent2/source/text/shared/01/01100100.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/01/01100300.xhp56
-rw-r--r--helpcontent2/source/text/shared/01/01110100.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/01110101.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/01130000.xhp100
-rw-r--r--helpcontent2/source/text/shared/01/01160200.xhp19
-rw-r--r--helpcontent2/source/text/shared/01/02070000.xhp109
-rw-r--r--helpcontent2/source/text/shared/01/02100000.xhp119
-rwxr-xr-xhelpcontent2/source/text/shared/01/02100100.xhp24
-rw-r--r--helpcontent2/source/text/shared/01/02230401.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/03010000.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/03110000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/01/03990000.xhp72
-rw-r--r--helpcontent2/source/text/shared/01/04050000.xhp17
-rw-r--r--helpcontent2/source/text/shared/01/05020100.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/05020301.xhp615
-rwxr-xr-xhelpcontent2/source/text/shared/01/05030300.xhp62
-rwxr-xr-xhelpcontent2/source/text/shared/01/05030700.xhp23
-rwxr-xr-xhelpcontent2/source/text/shared/01/05040200.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/05040300.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/05040400.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/05070000.xhp21
-rw-r--r--helpcontent2/source/text/shared/01/05070100.xhp19
-rw-r--r--helpcontent2/source/text/shared/01/05070200.xhp22
-rw-r--r--helpcontent2/source/text/shared/01/05070300.xhp31
-rw-r--r--helpcontent2/source/text/shared/01/05070400.xhp26
-rw-r--r--helpcontent2/source/text/shared/01/05070500.xhp22
-rw-r--r--helpcontent2/source/text/shared/01/05070600.xhp26
-rw-r--r--helpcontent2/source/text/shared/01/05100100.xhp77
-rw-r--r--helpcontent2/source/text/shared/01/05100200.xhp89
-rw-r--r--helpcontent2/source/text/shared/01/05100500.xhp55
-rw-r--r--helpcontent2/source/text/shared/01/05100600.xhp55
-rw-r--r--helpcontent2/source/text/shared/01/05100700.xhp55
-rwxr-xr-xhelpcontent2/source/text/shared/01/05110000.xhp3
-rw-r--r--helpcontent2/source/text/shared/01/05110600.xhp62
-rw-r--r--helpcontent2/source/text/shared/01/05110600m.xhp76
-rw-r--r--helpcontent2/source/text/shared/01/05120600.xhp76
-rwxr-xr-xhelpcontent2/source/text/shared/01/05200200.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/01/05200300.xhp26
-rwxr-xr-xhelpcontent2/source/text/shared/01/05210300.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/01/05210400.xhp26
-rwxr-xr-xhelpcontent2/source/text/shared/01/05210500.xhp26
-rw-r--r--helpcontent2/source/text/shared/01/05250000.xhp24
-rw-r--r--helpcontent2/source/text/shared/01/05250200.xhp22
-rw-r--r--helpcontent2/source/text/shared/01/05250300.xhp25
-rw-r--r--helpcontent2/source/text/shared/01/05260000.xhp21
-rw-r--r--helpcontent2/source/text/shared/01/05260100.xhp25
-rw-r--r--helpcontent2/source/text/shared/01/05260300.xhp27
-rw-r--r--helpcontent2/source/text/shared/01/05260600.xhp23
-rw-r--r--helpcontent2/source/text/shared/01/05340300.xhp14
-rw-r--r--helpcontent2/source/text/shared/01/05340400.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/05350500.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/06010000.xhp39
-rwxr-xr-xhelpcontent2/source/text/shared/01/06010500.xhp43
-rw-r--r--helpcontent2/source/text/shared/01/06040200.xhp27
-rw-r--r--helpcontent2/source/text/shared/01/06040300.xhp27
-rw-r--r--helpcontent2/source/text/shared/01/06050600.xhp12
-rw-r--r--helpcontent2/source/text/shared/01/06130000.xhp115
-rw-r--r--helpcontent2/source/text/shared/01/06130010.xhp56
-rw-r--r--helpcontent2/source/text/shared/01/06140200.xhp54
-rw-r--r--helpcontent2/source/text/shared/01/06150000.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/08060100.xhp29
-rw-r--r--helpcontent2/source/text/shared/01/about_meta_tags.xhp43
-rw-r--r--helpcontent2/source/text/shared/01/gallery.xhp26
-rwxr-xr-xhelpcontent2/source/text/shared/01/grid.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/01/guides.xhp5
-rw-r--r--helpcontent2/source/text/shared/01/makefile.mk10
-rwxr-xr-xhelpcontent2/source/text/shared/01/packagemanager.xhp16
-rw-r--r--helpcontent2/source/text/shared/01/password_dlg.xhp53
-rw-r--r--helpcontent2/source/text/shared/01/ref_pdf_export.xhp18
-rw-r--r--helpcontent2/source/text/shared/01/selectcertificate.xhp21
-rw-r--r--helpcontent2/source/text/shared/01/xformsdata.xhp126
-rw-r--r--helpcontent2/source/text/shared/02/01170000.xhp223
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170004.xhp10
-rw-r--r--helpcontent2/source/text/shared/02/01170100.xhp6
-rw-r--r--helpcontent2/source/text/shared/02/01170101.xhp4
-rw-r--r--helpcontent2/source/text/shared/02/01170102.xhp321
-rw-r--r--helpcontent2/source/text/shared/02/01170600.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170802.xhp32
-rw-r--r--helpcontent2/source/text/shared/02/01170900.xhp30
-rw-r--r--helpcontent2/source/text/shared/02/01230000.xhp4
-rw-r--r--helpcontent2/source/text/shared/02/02130000.xhp4
-rw-r--r--helpcontent2/source/text/shared/02/02140000.xhp7
-rw-r--r--helpcontent2/source/text/shared/02/03200000.xhp20
-rw-r--r--helpcontent2/source/text/shared/02/04210000.xhp81
-rw-r--r--helpcontent2/source/text/shared/02/06100000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/06110000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/07080000.xhp37
-rw-r--r--helpcontent2/source/text/shared/02/10100000.xhp4
-rw-r--r--helpcontent2/source/text/shared/02/12100200.xhp155
-rw-r--r--helpcontent2/source/text/shared/02/13020000.xhp5
-rw-r--r--helpcontent2/source/text/shared/02/20050000.xhp4
-rw-r--r--helpcontent2/source/text/shared/02/24100000.xhp6
-rw-r--r--helpcontent2/source/text/shared/02/makefile.mk3
-rwxr-xr-xhelpcontent2/source/text/shared/02/paintbrush.xhp32
-rwxr-xr-xhelpcontent2/source/text/shared/04/01010000.xhp590
-rwxr-xr-xhelpcontent2/source/text/shared/04/01020000.xhp28
-rw-r--r--helpcontent2/source/text/shared/04/makefile.mk2
-rwxr-xr-xhelpcontent2/source/text/shared/05/00000001.xhp25
-rw-r--r--helpcontent2/source/text/shared/05/00000110.xhp6
-rw-r--r--helpcontent2/source/text/shared/05/makefile.mk2
-rw-r--r--helpcontent2/source/text/shared/07/makefile.mk2
-rw-r--r--helpcontent2/source/text/shared/autokorr/makefile.mk2
-rw-r--r--helpcontent2/source/text/shared/autopi/01010000.xhp37
-rw-r--r--helpcontent2/source/text/shared/autopi/01020000.xhp35
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090000.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090100.xhp79
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01090210.xhp35
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01100000.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01100100.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01120000.xhp57
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01130000.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01170000.xhp64
-rw-r--r--helpcontent2/source/text/shared/autopi/makefile.mk2
-rw-r--r--helpcontent2/source/text/shared/autopi/startup.xhp30
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/webwizard00.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/02010100.xhp4
-rw-r--r--helpcontent2/source/text/shared/explorer/database/05020000.xhp26
-rw-r--r--helpcontent2/source/text/shared/explorer/database/11030000.xhp31
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp51
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz00.xhp39
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz01.xhp38
-rw-r--r--helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp28
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp21
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp20
-rw-r--r--helpcontent2/source/text/shared/explorer/database/makefile.mk2
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard00.xhp26
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard01.xhp29
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/querywizard05.xhp29
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/tablewizard00.xhp27
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/tablewizard01.xhp41
-rwxr-xr-xhelpcontent2/source/text/shared/guide/aaa_start.xhp27
-rwxr-xr-xhelpcontent2/source/text/shared/guide/autocorr_url.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/autohide.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/guide/breaking_lines.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp8
-rw-r--r--helpcontent2/source/text/shared/guide/copytext2application.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ctl.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/guide/data_addressbook.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/data_search2.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/guide/digital_signatures.xhp72
-rw-r--r--helpcontent2/source/text/shared/guide/doc_open.xhp51
-rw-r--r--helpcontent2/source/text/shared/guide/doc_save.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/dragdrop.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/guide/dragdrop_gallery.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/dragdrop_graphic.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/filternavigator.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/floating_toolbar.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/guide/gallery_insert.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/guide/hyperlink_edit.xhp7
-rw-r--r--helpcontent2/source/text/shared/guide/insert_bitmap.xhp30
-rw-r--r--helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp142
-rwxr-xr-xhelpcontent2/source/text/shared/guide/insert_specialchar.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/keyboard.xhp52
-rw-r--r--helpcontent2/source/text/shared/guide/makefile.mk3
-rwxr-xr-xhelpcontent2/source/text/shared/guide/microsoft_terms.xhp14
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ms_doctypes.xhp30
-rw-r--r--helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp327
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ms_user.xhp55
-rwxr-xr-xhelpcontent2/source/text/shared/guide/paintbrush.xhp65
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_accept.xhp23
-rwxr-xr-xhelpcontent2/source/text/shared/guide/scripting.xhp25
-rwxr-xr-xhelpcontent2/source/text/shared/guide/space_hyphen.xhp8
-rw-r--r--helpcontent2/source/text/shared/guide/startcenter.xhp83
-rw-r--r--helpcontent2/source/text/shared/makefile.mk2
-rw-r--r--helpcontent2/source/text/shared/optionen/01010200.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01010301.xhp20
-rw-r--r--helpcontent2/source/text/shared/optionen/01010400.xhp91
-rw-r--r--helpcontent2/source/text/shared/optionen/01010500.xhp20
-rw-r--r--helpcontent2/source/text/shared/optionen/01010800.xhp4
-rw-r--r--helpcontent2/source/text/shared/optionen/01040600.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01041000.xhp60
-rw-r--r--helpcontent2/source/text/shared/optionen/01060100.xhp91
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01060400.xhp24
-rw-r--r--helpcontent2/source/text/shared/optionen/01070500.xhp27
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01130100.xhp12
-rw-r--r--helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp26
-rw-r--r--helpcontent2/source/text/shared/optionen/makefile.mk2
-rw-r--r--helpcontent2/source/text/simpress/00/makefile.mk2
-rw-r--r--helpcontent2/source/text/simpress/01/02120000.xhp125
-rw-r--r--helpcontent2/source/text/simpress/01/04030000m.xhp58
-rw-r--r--helpcontent2/source/text/simpress/01/04040000m.xhp58
-rw-r--r--helpcontent2/source/text/simpress/01/05090000m.xhp59
-rw-r--r--helpcontent2/source/text/simpress/01/05110500m.xhp69
-rw-r--r--helpcontent2/source/text/simpress/01/05120500m.xhp70
-rw-r--r--helpcontent2/source/text/simpress/01/05150000.xhp24
-rw-r--r--helpcontent2/source/text/simpress/01/06100000.xhp95
-rw-r--r--helpcontent2/source/text/simpress/01/makefile.mk7
-rwxr-xr-xhelpcontent2/source/text/simpress/01/taskpanel.xhp54
-rw-r--r--helpcontent2/source/text/simpress/02/10030200.xhp167
-rw-r--r--helpcontent2/source/text/simpress/02/10080000.xhp9
-rw-r--r--helpcontent2/source/text/simpress/02/10100000.xhp319
-rw-r--r--helpcontent2/source/text/simpress/02/13030000.xhp5
-rw-r--r--helpcontent2/source/text/simpress/02/13040000.xhp5
-rw-r--r--helpcontent2/source/text/simpress/02/makefile.mk2
-rwxr-xr-xhelpcontent2/source/text/simpress/04/01020000.xhp21
-rw-r--r--helpcontent2/source/text/simpress/04/makefile.mk2
-rw-r--r--helpcontent2/source/text/simpress/guide/gluepoints.xhp79
-rw-r--r--helpcontent2/source/text/simpress/guide/keyboard.xhp6
-rwxr-xr-xhelpcontent2/source/text/simpress/guide/main.xhp17
-rw-r--r--helpcontent2/source/text/simpress/guide/makefile.mk3
-rwxr-xr-xhelpcontent2/source/text/simpress/guide/select_object.xhp6
-rw-r--r--helpcontent2/source/text/simpress/guide/table_insert.xhp71
-rwxr-xr-xhelpcontent2/source/text/simpress/main0103.xhp4
-rwxr-xr-xhelpcontent2/source/text/simpress/main0210.xhp8
-rw-r--r--helpcontent2/source/text/simpress/makefile.mk2
-rw-r--r--helpcontent2/source/text/smath/00/makefile.mk2
-rwxr-xr-xhelpcontent2/source/text/smath/01/06010000.xhp24
-rw-r--r--helpcontent2/source/text/smath/01/makefile.mk2
-rw-r--r--helpcontent2/source/text/smath/02/makefile.mk2
-rw-r--r--helpcontent2/source/text/smath/04/makefile.mk2
-rw-r--r--helpcontent2/source/text/smath/guide/makefile.mk2
-rwxr-xr-xhelpcontent2/source/text/smath/main0103.xhp3
-rw-r--r--helpcontent2/source/text/smath/makefile.mk2
-rw-r--r--helpcontent2/source/text/swriter/00/00000405.xhp164
-rw-r--r--helpcontent2/source/text/swriter/00/makefile.mk2
-rw-r--r--helpcontent2/source/text/swriter/01/01160300.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/02120000.xhp22
-rw-r--r--helpcontent2/source/text/swriter/01/04060000.xhp7
-rw-r--r--helpcontent2/source/text/swriter/01/04090001.xhp116
-rw-r--r--helpcontent2/source/text/swriter/01/04090002.xhp126
-rw-r--r--helpcontent2/source/text/swriter/01/04090003.xhp66
-rw-r--r--helpcontent2/source/text/swriter/01/04090004.xhp80
-rw-r--r--helpcontent2/source/text/swriter/01/04090005.xhp105
-rw-r--r--helpcontent2/source/text/swriter/01/04090006.xhp74
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120212.xhp4
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04130100.xhp8
-rw-r--r--helpcontent2/source/text/swriter/01/04200000.xhp32
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05030200.xhp65
-rw-r--r--helpcontent2/source/text/swriter/01/05040500.xhp16
-rw-r--r--helpcontent2/source/text/swriter/01/05060200.xhp58
-rw-r--r--helpcontent2/source/text/swriter/01/05060201.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/05090201.xhp18
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05100000.xhp12
-rw-r--r--helpcontent2/source/text/swriter/01/05100100.xhp58
-rw-r--r--helpcontent2/source/text/swriter/01/05100200.xhp72
-rw-r--r--helpcontent2/source/text/swriter/01/05100500.xhp55
-rw-r--r--helpcontent2/source/text/swriter/01/05100600.xhp55
-rw-r--r--helpcontent2/source/text/swriter/01/05100700.xhp55
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05110000.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/05110600.xhp57
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05120000.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/05120600.xhp57
-rw-r--r--helpcontent2/source/text/swriter/01/05130100.xhp24
-rw-r--r--helpcontent2/source/text/swriter/01/makefile.mk9
-rw-r--r--helpcontent2/source/text/swriter/02/04210000.xhp79
-rw-r--r--helpcontent2/source/text/swriter/02/makefile.mk3
-rwxr-xr-xhelpcontent2/source/text/swriter/04/01020000.xhp540
-rw-r--r--helpcontent2/source/text/swriter/04/makefile.mk2
-rw-r--r--helpcontent2/source/text/swriter/guide/arrange_chapters.xhp35
-rw-r--r--helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp4
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/form_letters_main.xhp23
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/insert_beforetable.xhp6
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/keyboard.xhp4
-rw-r--r--helpcontent2/source/text/swriter/guide/load_styles.xhp19
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/main.xhp18
-rw-r--r--helpcontent2/source/text/swriter/guide/makefile.mk3
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/navigator.xhp29
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/para_style_quickuse.xhp81
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/references.xhp18
-rw-r--r--helpcontent2/source/text/swriter/guide/ruler.xhp36
-rw-r--r--helpcontent2/source/text/swriter/guide/sections.xhp5
-rw-r--r--helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp28
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/table_cells.xhp22
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/table_delete.xhp5
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/table_insert.xhp4
-rw-r--r--helpcontent2/source/text/swriter/guide/table_select.xhp5
-rw-r--r--helpcontent2/source/text/swriter/guide/table_sizing.xhp50
-rw-r--r--helpcontent2/source/text/swriter/guide/templates_styles.xhp21
-rw-r--r--helpcontent2/source/text/swriter/guide/text_emphasize.xhp26
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/text_nav_keyb.xhp87
-rw-r--r--helpcontent2/source/text/swriter/guide/using_hyphen.xhp5
-rw-r--r--helpcontent2/source/text/swriter/guide/using_thesaurus.xhp22
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/word_completion.xhp4
-rw-r--r--helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp4
-rwxr-xr-xhelpcontent2/source/text/swriter/main0103.xhp3
-rwxr-xr-xhelpcontent2/source/text/swriter/main0110.xhp18
-rwxr-xr-xhelpcontent2/source/text/swriter/main0204.xhp34
-rwxr-xr-xhelpcontent2/source/text/swriter/main0503.xhp26
-rw-r--r--helpcontent2/source/text/swriter/makefile.mk2
-rw-r--r--helpcontent2/util/sbasic/makefile.mk10
-rw-r--r--helpcontent2/util/scalc/makefile.mk10
-rw-r--r--helpcontent2/util/schart/makefile.mk10
-rw-r--r--helpcontent2/util/sdatabase/makefile.mk10
-rw-r--r--helpcontent2/util/sdraw/makefile.mk16
-rw-r--r--helpcontent2/util/simpress/makefile.mk16
-rw-r--r--helpcontent2/util/smath/makefile.mk10
-rw-r--r--helpcontent2/util/swriter/makefile.mk19
412 files changed, 8428 insertions, 7310 deletions
diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index d6b826e038..2a40ed6e50 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -1,6 +1,6 @@
0,0,
1,1,
-DEV300.m14,010101010101010,
+DEV300.m35,010101010101010,
DLG_INSERT_PAGES_OBJS,938,
DLG_JOIN_TABADD,19214,
FID_ADJUST_PRINTZOOM,26652,.uno:AdjustPrintZoom
@@ -373,6 +373,7 @@ FN_REMOVE_DIRECT_CHAR_FORMATS,21759,
FN_REPAGINATE,20161,.uno:Repaginate
FN_REPEAT_SEARCH,20150,.uno:RepeatSearch
FN_RULER,20211,.uno:Ruler
+FN_SAVE_GRAPHIC,21760,
FN_SBA_BRW_INSERT,21408,.uno:SwBrwInsert
FN_SBA_BRW_MERGE,21409,.uno:SwMailMerge
FN_SBA_BRW_UPDATE,21407,.uno:SwUpdate
@@ -396,6 +397,7 @@ FN_SHOW_MULTIPLE_PAGES,21252,.uno:ShowMultiplePages
FN_SHOW_TWO_PAGES,21251,.uno:ShowTwoPages
FN_SHRINK_FONT_SIZE,20404,.uno:Shrink
FN_SORTING_DLG,20614,.uno:SortDialog
+FN_SPELL_GRAMMAR_DIALOG,22305,
FN_START_DOC_DIRECT,20978,.uno:JumpToStartOfDoc
FN_START_OF_COLUMN,20917,.uno:GoToStartOfColumn
FN_START_OF_DOCUMENT,20907,.uno:GoToStartOfDoc
@@ -1067,24 +1069,24 @@ HID_COLORPAGE_CALCPAGEBREAK_CB,39960,
HID_COLORPAGE_CALCPAGEBREAK_LB,39920,
HID_COLORPAGE_CALCREFERENCE_CB,39965,
HID_COLORPAGE_CALCREFERENCE_LB,39925,
-HID_COLORPAGE_DBCOLUMNFOOTER_CB,40060,
-HID_COLORPAGE_DBCOLUMNFOOTER_LB,40069,
-HID_COLORPAGE_DBCOLUMNHEADER_CB,40059,
-HID_COLORPAGE_DBCOLUMNHEADER_LB,40068,
-HID_COLORPAGE_DBDETAIL_CB,40061,
-HID_COLORPAGE_DBDETAIL_LB,40070,
-HID_COLORPAGE_DBGROUPFOOTER_CB,40058,
-HID_COLORPAGE_DBGROUPFOOTER_LB,40067,
-HID_COLORPAGE_DBGROUPHEADER_CB,40057,
-HID_COLORPAGE_DBGROUPHEADER_LB,40066,
-HID_COLORPAGE_DBPAGEFOOTER_CB,40056,
-HID_COLORPAGE_DBPAGEFOOTER_LB,40065,
-HID_COLORPAGE_DBPAGEHEADER_CB,40055,
-HID_COLORPAGE_DBPAGEHEADER_LB,40064,
-HID_COLORPAGE_DBREPORTFOOTER_CB,40054,
-HID_COLORPAGE_DBREPORTFOOTER_LB,40063,
-HID_COLORPAGE_DBREPORTHEADER_CB,40053,
-HID_COLORPAGE_DBREPORTHEADER_LB,40062,
+HID_COLORPAGE_DBCOLUMNFOOTER_CB,40064,
+HID_COLORPAGE_DBCOLUMNFOOTER_LB,40073,
+HID_COLORPAGE_DBCOLUMNHEADER_CB,40063,
+HID_COLORPAGE_DBCOLUMNHEADER_LB,40072,
+HID_COLORPAGE_DBDETAIL_CB,40065,
+HID_COLORPAGE_DBDETAIL_LB,40074,
+HID_COLORPAGE_DBGROUPFOOTER_CB,40062,
+HID_COLORPAGE_DBGROUPFOOTER_LB,40071,
+HID_COLORPAGE_DBGROUPHEADER_CB,40061,
+HID_COLORPAGE_DBGROUPHEADER_LB,40070,
+HID_COLORPAGE_DBPAGEFOOTER_CB,40060,
+HID_COLORPAGE_DBPAGEFOOTER_LB,40069,
+HID_COLORPAGE_DBPAGEHEADER_CB,40059,
+HID_COLORPAGE_DBPAGEHEADER_LB,40068,
+HID_COLORPAGE_DBREPORTFOOTER_CB,40058,
+HID_COLORPAGE_DBREPORTFOOTER_LB,40067,
+HID_COLORPAGE_DBREPORTHEADER_CB,40057,
+HID_COLORPAGE_DBREPORTHEADER_LB,40066,
HID_COLORPAGE_DOCBOUNDARIES_CB,39938,
HID_COLORPAGE_DOCBOUNDARIES_LB,39898,
HID_COLORPAGE_DOCCOLOR_CB,39937,
@@ -1175,6 +1177,8 @@ HID_CTL_TABBROWSER,38786,
HID_CTL_TABLEEDIT,38885,
HID_CTL_TREEVIEW,38788,
HID_CTRL_COLOR,33856,
+HID_CTRL_CUSTOMPROPERTIES,33393,
+HID_CTRL_CUSTOMPROPS_YES_NO,33394,
HID_DAI_FUNC_DAYSINMONTH,59188,
HID_DAI_FUNC_DAYSINYEAR,59189,
HID_DAI_FUNC_DIFFMONTHS,59191,
@@ -2758,6 +2762,7 @@ HID_NUMBERFORMAT_LB_FORMAT,34004,
HID_NUMBERFORMAT_TBI_ADD,33916,
HID_NUMBERFORMAT_TBI_INFO,34003,
HID_NUMBERFORMAT_TBI_REMOVE,33917,
+HID_NUMBERFORMAT_WND_NUMBER_PREVIEW,40075,
HID_NUMBERINGOPT_SEL_GRF_FROM_FILE,39879,
HID_NUMPARA,53214,
HID_NUM_FORMAT_BTN,53003,
@@ -3290,6 +3295,7 @@ HID_RPT_POPUP_COLOR,64472,
HID_RPT_POPUP_COLOR_CTRL,64471,
HID_RPT_PROPDLG_TAB_DATA,64476,
HID_RPT_PROPDLG_TAB_GENERAL,64475,
+HID_RPT_PROP_AREA,64488,
HID_RPT_PROP_BACKCOLOR,64511,
HID_RPT_PROP_BACKTRANSPARENT,64527,
HID_RPT_PROP_CANGROW,64480,
@@ -3390,12 +3396,25 @@ HID_SCH_STARTING_ANGLE_DIAL,63374,
HID_SCH_STATISTIK_BIGERROR,63349,
HID_SCH_STATISTIK_BIGERROR_VALUE,63352,
HID_SCH_STATISTIK_CONSTERROR,63350,
+HID_SCH_STATISTIK_FUNCTION,63382,
+HID_SCH_STATISTIK_FUNCTION_LB,63384,
HID_SCH_STATISTIK_MEANVALUE,63344,
HID_SCH_STATISTIK_MINUS_VALUE,63354,
+HID_SCH_STATISTIK_NEGATIVE_RANGE,63389,
+HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER,63390,
+HID_SCH_STATISTIK_NEGATIVE_VALUE,63388,
HID_SCH_STATISTIK_NO_ERROR,63345,
HID_SCH_STATISTIK_PERCENT,63348,
HID_SCH_STATISTIK_PERCENT_VALUE,63351,
HID_SCH_STATISTIK_PLUS_VALUE,63353,
+HID_SCH_STATISTIK_POSITIVE_RANGE,63386,
+HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER,63387,
+HID_SCH_STATISTIK_POSITIVE_VALUE,63385,
+HID_SCH_STATISTIK_RANGE,63383,
+HID_SCH_STATISTIK_SAME_FOR_BOTH,63391,
+HID_SCH_STATISTIK_SHOW_BOTH,63392,
+HID_SCH_STATISTIK_SHOW_NEGATIVE,63394,
+HID_SCH_STATISTIK_SHOW_POSITIVE,63393,
HID_SCH_STATISTIK_SIGMA,63347,
HID_SCH_STATISTIK_VARIANT,63346,
HID_SCH_TBI_DATA_DELETE_COL,63306,
@@ -3506,15 +3525,19 @@ HID_SC_HF_FILE,58902,
HID_SC_HF_FLC,58845,
HID_SC_HF_FLL,58844,
HID_SC_HF_FLR,58846,
+HID_SC_HF_FL_DEFINED,59026,
HID_SC_HF_FRC,58848,
HID_SC_HF_FRL,58847,
HID_SC_HF_FRR,58849,
+HID_SC_HF_FR_DEFINED,59027,
HID_SC_HF_HLC,58839,
HID_SC_HF_HLL,58838,
HID_SC_HF_HLR,58840,
+HID_SC_HF_HL_DEFINED,59024,
HID_SC_HF_HRC,58842,
HID_SC_HF_HRL,58841,
HID_SC_HF_HRR,58843,
+HID_SC_HF_HR_DEFINED,59025,
HID_SC_HF_PAGE,58904,
HID_SC_HF_PAGES,58905,
HID_SC_HF_TABLE,58903,
@@ -4050,8 +4073,10 @@ HID_SPELLDLG_SETWORD,34074,
HID_SPLDLG_BUTTON_CHANGE,39887,
HID_SPLDLG_BUTTON_CHANGEALL,39888,
HID_SPLDLG_BUTTON_CLOSE,39884,
+HID_SPLDLG_BUTTON_EXPLAIN,39898,
HID_SPLDLG_BUTTON_IGNORE,39885,
HID_SPLDLG_BUTTON_IGNOREALL,39886,
+HID_SPLDLG_CHECKBOX_CHECKGRAMMAR,39899,
HID_SPLDLG_EDIT_NEWWORD,39894,
HID_SQLERROR_EXCHAIN_ERRORS,38909,
HID_SQLERROR_EXCHAIN_TEXT,38910,
@@ -4226,6 +4251,7 @@ HID_TPSHADOW_CTRL,33990,
HID_TPSIZE_CTRL,33993,
HID_TP_BUSINESS_DATA,53248,
HID_TP_COMMONPRINTOPTIONS,33343,
+HID_TP_CUSTOMPROPERTIES,33392,
HID_TP_LICENSE,64357,
HID_TP_MAILCONFIG,54978,
HID_TP_OUTLINE_NUM,53227,
@@ -4361,6 +4387,7 @@ RID_MATH_TOOLBOX,20050,
RID_MN_FORMAT_STYLE,25031,
RID_SVX_EXTRUSION_BAR,10986,
RID_SVX_FONTWORK_BAR,10987,
+RID_TABPAGE_PARA_NUMBERING,20976,
RID_TBXCTL_INSCELLS,25039,
RID_TBXCTL_INSERT,25038,
RID_TBXCTL_INSOBJ,25040,
@@ -4399,6 +4426,7 @@ SID_3D_VIEW,30527,
SID_3D_WIN,10644,.uno:Window3D
SID_ABOUT,5301,.uno:About
SID_ACTIVATE,5525,.uno:Activate
+SID_ACTIVATE_STYLE_APPLY,6715,
SID_ACTIVE_OBJ_NAME,26655,.uno:SelectedObjectName
SID_ADDONHELP,6684,.uno:AddonHelp
SID_ADDONS,6678,.uno:Addons
@@ -5152,6 +5180,7 @@ SID_FM_RECORD_TEXT,10624,.uno:RecText
SID_FM_RECORD_TOTAL,10626,.uno:RecTotal
SID_FM_RECORD_UNDO,10630,.uno:RecUndo
SID_FM_REFRESH,10724,.uno:Refresh
+SID_FM_REFRESH_FORM_CONTROL,10775,
SID_FM_REMOVE_FILTER_SORT,10711,.uno:RemoveFilterSort
SID_FM_RENAME_OBJECT,10609,
SID_FM_SCROLLBAR,10768,.uno:ScrollBar
@@ -5449,6 +5478,7 @@ SID_MODIFY_FIELD,27362,.uno:ModifyField
SID_MODIFY_FRAME,5651,.uno:ModifyFrame
SID_MOREBACK,27032,.uno:Backward
SID_MOREFRONT,27031,.uno:Forward
+SID_MORE_DICTIONARIES,6714,
SID_MOVETO,27250,.uno:MoveTo
SID_NAME_GROUP,27027,.uno:NameGroup
SID_NAVIGATOR,10366,.uno:Navigator
@@ -6073,6 +6103,7 @@ UID_RPT_PROP_DLG_LINE_STYLE,64508,
UID_RPT_PROP_DLG_LINKFIELDS,64530,
UID_RPT_REPORTWINDOW,64451,
UID_RPT_RPT_APP_VIEW,64449,
+UID_RPT_RPT_PROP_DLG_AREA,64489,
UID_RPT_RPT_PROP_DLG_FONT_TYPE,64525,
UID_RPT_SCROLLWINDOW,64450,
UID_RPT_SECTIONSWINDOW,64453,
@@ -6274,6 +6305,9 @@ chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Y_PERCENT,551780867,
chart2_RadioButton_TP_CHARTTYPE_RB_STACK_Z,551780868,
chart2_RadioButton_TP_OPTIONS_RBT_OPT_AXIS_1,551748098,
chart2_RadioButton_TP_OPTIONS_RBT_OPT_AXIS_2,551748099,
+chart2_RadioButton_TP_OPTIONS_RB_ASSUME_ZERO,551748109,
+chart2_RadioButton_TP_OPTIONS_RB_CONTINUE_LINE,551748110,
+chart2_RadioButton_TP_OPTIONS_RB_DONT_PAINT,551748108,
chart2_RadioButton_TP_RANGECHOOSER_RB_DATACOLS,551797250,
chart2_RadioButton_TP_RANGECHOOSER_RB_DATAROWS,551797249,
chart2_SpinField_TP_SCALE_Y_EDT_MAX,551670786,
@@ -6428,7 +6462,7 @@ dbaccess_TabPage_TP_MIGRATE,851476480,
dbaccess_TabPage_TP_PREPARE,851443712,
dbaccess_TabPage_TP_SAVE_DBDOC_AS,851460096,
dbaccess_TabPage_TP_SUMMARY,851492864,
-desktop_CheckBox_RID_DLG_UPDATE_RID_DLG_UPDATE_ALL,1106658309,
+desktop_CheckBox_RID_DLG_UPDATE_RID_DLG_UPDATE_ALL,1106674693,
desktop_CheckBox_TP_MIGRATION_CB_MIGRATION,586105859,
desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK,586155011,
desktop_Edit_TP_USER_ED_USER_FATHER,586123282,
@@ -6441,7 +6475,7 @@ desktop_ModalDialog_RID_DLG_DEPENDENCIES,1106526208,
desktop_ModalDialog_RID_DLG_LICENSE,1180237824,
desktop_MultiLineEdit_RID_DLG_LICENSE_ML_LICENSE,1180240435,
desktop_MultiLineEdit_RID_DLG_UPDATEINSTALL_RID_DLG_UPDATE_INSTALL_INFO,1106840076,
-desktop_MultiLineEdit_RID_DLG_UPDATE_RID_DLG_UPDATE_DESCRIPTIONS,1106659847,
+desktop_MultiLineEdit_RID_DLG_UPDATE_RID_DLG_UPDATE_DESCRIPTIONS,1106676231,
desktop_MultiLineEdit_TP_LICENSE_ML_LICENSE,586140166,
desktop_PushButton_RID_DLG_EXTENSION_MANAGER_RID_EM_BTN_ADD,2180354572,
desktop_PushButton_RID_DLG_EXTENSION_MANAGER_RID_EM_BTN_CHECK_UPDATES,2180354573,
@@ -6453,7 +6487,7 @@ desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ENABLE,2180256278,
desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_EXPORT,2180256280,
desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_OPTIONS,2180256282,
desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_REMOVE,2180256277,
-desktop_PushButton_RID_DLG_UPDATE_RID_DLG_UPDATE_OK,1106661898,
+desktop_PushButton_RID_DLG_UPDATE_RID_DLG_UPDATE_OK,1106678282,
desktop_PushButton_TP_LICENSE_PB_LICENSE_DOWN,586142215,
desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER,586088966,
desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER,586088967,
@@ -6612,10 +6646,8 @@ filter_CheckBox_RID_PDF_TAB_LINKS_CB_CNV_OOO_DOCTOPDF,868025499,
filter_CheckBox_RID_PDF_TAB_LINKS_CB_ENAB_RELLINKFSYS,868025494,
filter_CheckBox_RID_PDF_TAB_LINKS_CB_EXP_BMRK_TO_DEST,868025500,
filter_CheckBox_RID_PDF_TAB_OPNFTR_CB_PGLY_FIRSTLEFT,867877986,
-filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENAB_ACCESS,867894411,
-filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENDAB_COPY,867894410,
-filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEC_ENCRYPT,867894392,
-filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEL_PERMISSIONS,867894397,
+filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENAB_ACCESS,867894416,
+filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENDAB_COPY,867894415,
filter_CheckBox_RID_PDF_TAB_VPREFER_CB_DISPDOCTITLE,867861608,
filter_CheckBox_RID_PDF_TAB_VPREFER_CB_TRANSITIONEFFECTS,867861614,
filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVMENUBAR,867861610,
@@ -6634,8 +6666,8 @@ filter_ModalDialog_RID_PDF_ERROR_DLG,1404878848,
filter_NumericField_DLG_OPTIONS_NUM_FLD_QUALITY,1090525185,
filter_NumericField_RID_PDF_TAB_OPNFTR_NUM_MAGNF_INITIAL_PAGE,867883100,
filter_NumericField_RID_PDF_TAB_VPREFER_NUM_BOOKMARKLEVELS,867866738,
-filter_PushButton_RID_PDF_TAB_SECURITY_BTN_OWNER_PWD,867897982,
-filter_PushButton_RID_PDF_TAB_SECURITY_BTN_USER_PWD,867897978,
+filter_PushButton_RID_PDF_TAB_SECURITY_BTN_OWNER_PWD,867897983,
+filter_PushButton_RID_PDF_TAB_SECURITY_BTN_USER_PWD,867897976,
filter_RadioButton_RID_PDF_TAB_GENER_RB_ALL,867844610,
filter_RadioButton_RID_PDF_TAB_GENER_RB_JPEGCOMPRESSION,867844619,
filter_RadioButton_RID_PDF_TAB_GENER_RB_LOSSLESSCOMPRESSION,867844618,
@@ -6656,14 +6688,14 @@ filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_CONT,867877472,
filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_CONTFAC,867877473,
filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_DEFAULT,867877470,
filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_SINGPG,867877471,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_ANY_NOCOPY,867893897,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_COMMENT,867893896,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_FILLFORM,867893895,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_INSDEL,867893894,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_NONE,867893893,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_HIGHRES,867893891,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_LOWRES,867893890,
-filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_NONE,867893889,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_ANY_NOCOPY,867893902,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_COMMENT,867893901,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_FILLFORM,867893900,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_INSDEL,867893899,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_NONE,867893898,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_HIGHRES,867893896,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_LOWRES,867893895,
+filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_NONE,867893894,
filter_RadioButton_RID_PDF_TAB_VPREFER_RB_ALLBOOKMARKLEVELS,867861104,
filter_RadioButton_RID_PDF_TAB_VPREFER_RB_VISIBLEBOOKMARKLEVELS,867861105,
fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_AUTO_EXTENSION,1334641706,
@@ -7117,7 +7149,6 @@ sc_ImageButton_RID_SCTAB_FUNCTION_IB_FUNCTION,958262789,
sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289,
sc_ListBox_FID_FUNCTION_BOX_DDLB_FUNC,3651276291,
sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290,
-sc_ListBox_RID_HFBASE_LB_DEFINED,957140509,
sc_ListBox_RID_SCDLG_AREAS_LB_PRINTAREA,2568277517,
sc_ListBox_RID_SCDLG_AREAS_LB_REPEATCOL,2568277537,
sc_ListBox_RID_SCDLG_AREAS_LB_REPEATROW,2568277527,
@@ -7550,6 +7581,7 @@ sd_MultiListBox_DLG_DEFINE_CUSTOMSHOW_LB_PAGES,1088326657,
sd_NumericField_DLG_COPY_NUM_FLD_COPIES,1085659137,
sd_NumericField_DLG_VECTORIZE_NM_LAYERS,1084463105,
sd_NumericField_FLT_WIN_ANIMATION_NUM_FLD_BITMAP,3231373313,
+sd_NumericField_RID_TABPAGE_PARA_NUMBERING_NF_NEW_START,880547843,
sd_PushButton_DLG_ASS_BUT_LAST,1088492035,
sd_PushButton_DLG_ASS_BUT_NEXT,1088492036,
sd_PushButton_DLG_ASS_PB_PAGE1_OPEN,1088492049,
@@ -7648,6 +7680,8 @@ sd_TimeField_DLG_ASS_TMF_PAGE3_TIME,1088495666,
sd_TimeField_DLG_PUBLISHING_PAGE2_DURATION_TMF,1085857829,
sd_TimeField_DLG_START_PRESENTATION_TMF_PAUSE,1401479169,
sd_TimeField_FLT_WIN_ANIMATION_TIME_FIELD,3231375361,
+sd_TriStateBox_RID_TABPAGE_PARA_NUMBERING_CB_NEW_START,880543233,
+sd_TriStateBox_RID_TABPAGE_PARA_NUMBERING_CB_NUMBER_NEW_START,880543234,
sfx2_CheckBox_DLG_NEW_FILE_BTN_PREVIEW,1107379251,
sfx2_CheckBox_DLG_NEW_FILE_CB_FRAME_STYLE,1107379234,
sfx2_CheckBox_DLG_NEW_FILE_CB_MERGE_STYLE,1107379237,
@@ -7773,6 +7807,7 @@ sfx2_PushButton_TP_CONFIG_ACCEL_BTN_ACC_REMOVE,575017476,
sfx2_PushButton_TP_CONFIG_ACCEL_BTN_LOAD,575017512,
sfx2_PushButton_TP_CONFIG_ACCEL_BTN_RESET,575017492,
sfx2_PushButton_TP_CONFIG_ACCEL_BTN_SAVE,575017513,
+sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830,
sfx2_PushButton_TP_DOCINFODOC_BTN_DELETE,541200958,
sfx2_PushButton_TP_DOCINFODOC_BTN_SIGNATURE,541200975,
sfx2_PushButton_TP_DOCINFORELOAD_PB_BROWSEURL,541348426,
@@ -8013,6 +8048,7 @@ svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_READONLY,1368851481,
svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_RELEVANT,1368851477,
svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_REQUIRED,1368851475,
svx_CheckBox_RID_SVXDLG_ADD_INSTANCE_CB_INST_LINKINST,1368949776,
+svx_CheckBox_RID_SVXDLG_ADD_MODEL_CB_MODIFIES_DOCUMENT,1368933377,
svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_1,3391947777,
svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_2,3391947780,
svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_3,3391947779,
@@ -8040,6 +8076,7 @@ svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_RECOMMENDPWD,1242498072,
svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_REMOVEINFO,1242498070,
svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_SAVESENDDOCS,1242498061,
svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_SIGNDOCS,1242498063,
+svx_CheckBox_RID_SVXDLG_SPELLCHECK_CB_CHECK_GRAMMAR,2311849014,
svx_CheckBox_RID_SVXDLG_ZOOM_CHK_BOOK,1237582874,
svx_CheckBox_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ACCESSIBILITY_TOOL,704807947,
svx_CheckBox_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ANIMATED_GRAPHICS,704807943,
@@ -8738,6 +8775,7 @@ svx_ModalDialog_RID_SVXDLG_GALLERY_THEMEID,1243627520,
svx_ModalDialog_RID_SVXDLG_IMAPURL,1244987392,
svx_ModalDialog_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE,1241268224,
svx_ModalDialog_RID_SVXDLG_SETFORM,1368735744,
+svx_ModalDialog_RID_SVXPAGE_IMPROVEMENT,1242529792,
svx_ModalDialog_RID_SVX_DLG_INPUTRECORDNO,1368817664,
svx_ModalDialog_RID_SVX_DLG_SHOWGRIDCOLUMNS,1368834048,
svx_ModalDialog_RID_SVX_MDLG_EXTRUSION_DEPTH,1237630976,
@@ -8909,6 +8947,7 @@ svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_AUTOCORR,2311852586,
svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_CHANGE,2311852584,
svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_CHANGEALL,2311852585,
svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_CLOSE,2311852591,
+svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_EXPLAIN,2311852599,
svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_IGNORE,2311852581,
svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_IGNOREALL,2311852582,
svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_OPTIONS,2311852588,
@@ -8945,6 +8984,7 @@ svx_PushButton_RID_SVXPAGE_HATCH_BTN_ADD,701649409,
svx_PushButton_RID_SVXPAGE_HATCH_BTN_DELETE,701649412,
svx_PushButton_RID_SVXPAGE_HATCH_BTN_MODIFY,701649411,
svx_PushButton_RID_SVXPAGE_HEADER_BTN_EXTRAS,701157928,
+svx_PushButton_RID_SVXPAGE_IMPROVEMENT_PB_SHOWDATA,705663507,
svx_PushButton_RID_SVXPAGE_INET_MAIL_PB_MAILERURL,703255045,
svx_PushButton_RID_SVXPAGE_INET_SEARCH_PB_ADD,703337015,
svx_PushButton_RID_SVXPAGE_INET_SEARCH_PB_CHANGE,703337013,
@@ -9054,6 +9094,8 @@ svx_RadioButton_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_MAIL,704463362,
svx_RadioButton_RID_SVXPAGE_HYPERLINK_MAIL_RB_LINKTYP_NEWS,704463363,
svx_RadioButton_RID_SVXPAGE_HYPERLINK_NEWDOCUMENT_RB_EDITLATER,704496131,
svx_RadioButton_RID_SVXPAGE_HYPERLINK_NEWDOCUMENT_RB_EDITNOW,704496130,
+svx_RadioButton_RID_SVXPAGE_IMPROVEMENT_RB_NO,705659405,
+svx_RadioButton_RID_SVXPAGE_IMPROVEMENT_RB_YES,705659404,
svx_RadioButton_RID_SVXPAGE_INET_PROXY_RB_DNS_AUTO,703283818,
svx_RadioButton_RID_SVXPAGE_INET_PROXY_RB_DNS_MANUAL,703283819,
svx_RadioButton_RID_SVXPAGE_INET_SEARCH_RB_AND,703332907,
@@ -9099,6 +9141,7 @@ svx_TabPage_RID_OFAPAGE_MSFILTEROPT,809172992,
svx_TabPage_RID_OFAPAGE_MSFILTEROPT2,809189376,
svx_TabPage_RID_OFA_TP_INTERNATIONAL,811335680,
svx_TabPage_RID_SFXPAGE_DBREGISTER,809222144,
+svx_TabPage_RID_SVXPAGE_IMPROVEMENT,705658880,
svx_TabPage_RID_SVXPAGE_INET_MOZPLUGIN,736116736,
svx_TabPage_RID_SVXPAGE_INET_SECURITY,703987712,
svx_TabPage_RID_SVXPAGE_MACROASSIGN,705560576,
diff --git a/helpcontent2/source/auxiliary/swriter.tree b/helpcontent2/source/auxiliary/swriter.tree
index b4602e24e4..9dc9d21964 100755
--- a/helpcontent2/source/auxiliary/swriter.tree
+++ b/helpcontent2/source/auxiliary/swriter.tree
@@ -77,7 +77,7 @@
<topic id="swriter/text/swriter/guide/section_edit.xhp">Editing Sections</topic>
<topic id="swriter/text/swriter/guide/section_insert.xhp">Inserting Sections</topic>
</node>
- <node id="0208" title="Tables of Content and Indexes">
+ <node id="0208" title="Tables of Contents and Indexes">
<topic id="swriter/text/swriter/guide/chapter_numbering.xhp">Outline Numbering</topic>
<topic id="swriter/text/swriter/guide/indices_userdef.xhp">User-Defined Indexes</topic>
<topic id="swriter/text/swriter/guide/indices_toc.xhp">Creating a Table of Contents</topic>
@@ -160,7 +160,6 @@
<topic id="swriter/text/swriter/guide/autotext.xhp">Using AutoText</topic>
<topic id="swriter/text/swriter/guide/auto_numbering.xhp">Creating Numbered or Bulleted Lists as You Type</topic>
<topic id="swriter/text/swriter/guide/auto_off.xhp">Turning Off AutoFormat and AutoCorrect</topic>
-<topic id="swriter/text/swriter/guide/link_edit.xhp">Editing Hyperlinks</topic>
<topic id="swriter/text/swriter/guide/auto_spellcheck.xhp">Automatically Check Spelling</topic>
<topic id="swriter/text/swriter/guide/number_date_conv.xhp">Turning Number Recognition On or Off in Tables</topic>
<topic id="swriter/text/swriter/guide/select_language.xhp">Checking Spelling in Other Languages</topic>
diff --git a/helpcontent2/source/text/sbasic/guide/makefile.mk b/helpcontent2/source/text/sbasic/guide/makefile.mk
index 0c59fe0713..25ae34a978 100644
--- a/helpcontent2/source/text/sbasic/guide/makefile.mk
+++ b/helpcontent2/source/text/sbasic/guide/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.9.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/sbasic/shared/01/06130000.xhp b/helpcontent2/source/text/sbasic/shared/01/06130000.xhp
index 1510199e2b..090992be04 100644
--- a/helpcontent2/source/text/sbasic/shared/01/06130000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01/06130000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06130000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -70,8 +70,7 @@
<paragraph role="heading" id="hd_id3166447" xml-lang="en-US" level="3" l10n="U" oldref="29">Module/Dialog</paragraph>
<paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_BASICIDE_MODULES_TREE">Lists the existing macros and dialogs.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3149922" xml-lang="en-US" l10n="CHG" oldref="31">You can drag-and-drop a module or a dialog between libraries.</paragraph>
-<paragraph role="paragraph" id="par_id3159333" xml-lang="en-US" l10n="CHG" oldref="33">To copy a dialog or a module, hold down the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl </defaultinline></switchinline> key while you drag-and-drop.</paragraph>
+<paragraph role="paragraph" id="par_id3159333" xml-lang="en-US" l10n="CHG" oldref="33">To copy a dialog or a module, hold down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while you drag-and-drop.</paragraph>
<paragraph role="heading" id="hd_id3147131" xml-lang="en-US" level="3" l10n="U" oldref="34">Edit</paragraph>
<paragraph role="paragraph" id="par_id3149816" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_EDIT">Opens the selected macro or dialog for editing.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3151214" xml-lang="en-US" level="3" l10n="CHG" oldref="36">New</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/01/makefile.mk b/helpcontent2/source/text/sbasic/shared/01/makefile.mk
index 5528414cae..5147038f19 100644
--- a/helpcontent2/source/text/sbasic/shared/01/makefile.mk
+++ b/helpcontent2/source/text/sbasic/shared/01/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/sbasic/shared/01030200.xhp b/helpcontent2/source/text/sbasic/shared/01030200.xhp
index 46dc689f04..53eb10bbab 100644
--- a/helpcontent2/source/text/sbasic/shared/01030200.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01030200.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01030200.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -53,8 +53,7 @@
<bookmark_value>continuation;long lines in editor</bookmark_value>
</bookmark><comment>mw deleted "Basic;"</comment><paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/01030200.xhp" name="The Basic Editor">The Basic Editor</link></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" oldref="3">The Basic Editor provides the standard editing functions you are familiar with when working in a text document. It supports the functions of the <emph>Edit</emph> menu (Cut, Delete, Paste), the ability to select text with the Shift key, as well as cursor positioning functions (for example, moving from word to word with <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and the arrow keys).</paragraph>
+<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" oldref="3">The Basic Editor provides the standard editing functions you are familiar with when working in a text document. It supports the functions of the <emph>Edit</emph> menu (Cut, Delete, Paste), the ability to select text with the Shift key, as well as cursor positioning functions (for example, moving from word to word with <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and the arrow keys).</paragraph>
<paragraph role="paragraph" id="par_id3154686" xml-lang="en-US" l10n="CHG" oldref="31">Long lines can be split into several parts by inserting a space and an underline character _ as the last two characters of a line. This connects the line with the following line to one logical line. (If "Option Compatible" is used in the same Basic module, the line continuation feature is also valid for comment lines.)</paragraph>
<paragraph role="paragraph" id="par_id3151042" xml-lang="en-US" l10n="CHG" oldref="32">If you press the <emph>Run BASIC</emph> icon on the <emph>Macro</emph> bar, program execution starts at the first line of the Basic editor. The program executes the first Sub or Function and then program execution stops. The "Sub Main" does not take precedence on program execution.</paragraph>
<paragraph role="tip" id="par_id59816" xml-lang="en-US" l10n="NEW">Insert your Basic code between the Sub Main and End Sub lines that you see when you first open the IDE. Alternatively, delete all lines and then enter your own Basic code.</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/01030400.xhp b/helpcontent2/source/text/sbasic/shared/01030400.xhp
index 6c1d97e7d7..93cba25b83 100755
--- a/helpcontent2/source/text/sbasic/shared/01030400.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01030400.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01030400.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -180,8 +180,7 @@
<paragraph role="listitem" id="par_id3149319" xml-lang="en-US" l10n="CHG" oldref="38">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph> and click <emph>Organizer</emph> or click the <emph>Select Module</emph> icon in the Basic IDE to open the <emph>Macro Organizer</emph> dialog.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145637" xml-lang="en-US" l10n="U" oldref="39">To move a module or dialog to another document, click the corresponding object in the list and drag it to the desired position. A horizontal line indicates the target position of the current object while dragging. Hold the <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while dragging to copy the object instead of moving it.</paragraph>
+<paragraph role="listitem" id="par_id3145637" xml-lang="en-US" l10n="U" oldref="39">To move a module or dialog to another document, click the corresponding object in the list and drag it to the desired position. A horizontal line indicates the target position of the current object while dragging. Hold the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while dragging to copy the object instead of moving it.</paragraph>
</listitem>
</list>
</body>
diff --git a/helpcontent2/source/text/sbasic/shared/02/makefile.mk b/helpcontent2/source/text/sbasic/shared/02/makefile.mk
index 1e278b7e4d..1acf4753bd 100644
--- a/helpcontent2/source/text/sbasic/shared/02/makefile.mk
+++ b/helpcontent2/source/text/sbasic/shared/02/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.9.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/sbasic/shared/03102600.xhp b/helpcontent2/source/text/sbasic/shared/03102600.xhp
index cef437831d..d05e5a93ad 100755
--- a/helpcontent2/source/text/sbasic/shared/03102600.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03102600.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 03102600.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsbasicshared03102600xml" indexer="include" status="PUBLISH">
+<topic id="textsbasicshared03102600xml" indexer="include">
<title id="tit" xml-lang="en-US">IsNull Function [Runtime]</title>
<filename>/text/sbasic/shared/03102600.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-04-25T12:13:15">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="isnull">
@@ -48,7 +46,7 @@
<bookmark_value>Null value</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3155555" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/03102600.xhp" name="IsNull Function [Runtime]">IsNull Function [Runtime]</link></paragraph>
-<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="2">Tests if a Variant contains the special Null value, indicating that the variable does not contains data.</paragraph>
+<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="2">Tests if a Variant contains the special Null value, indicating that the variable does not contain data.</paragraph>
</section>
<paragraph role="heading" id="hd_id3150670" xml-lang="en-US" level="2" l10n="U" oldref="3">Syntax:</paragraph>
<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="4">IsNull (Var)</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/keys.xhp b/helpcontent2/source/text/sbasic/shared/keys.xhp
index 7f9f56c3a8..dd631b4921 100755
--- a/helpcontent2/source/text/sbasic/shared/keys.xhp
+++ b/helpcontent2/source/text/sbasic/shared/keys.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: keys.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -118,6 +118,6 @@
</tablerow>
</table>
-<paragraph role="paragraph" id="par_id3154702" xml-lang="en-US" l10n="U" oldref="21">A running macro can be aborted with Shift+Ctrl+Q, also from outside of the Basic IDE. If you are inside the Basic IDE and the macro halts at a breakpoint, Shift+Ctrl+Q stops execution of the macro, but you can recognize this only after the next F5, F8, or Shift+F8.</paragraph>
+<paragraph role="paragraph" id="par_id3154702" xml-lang="en-US" l10n="U" oldref="21">A running macro can be aborted with Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Q, also from outside of the Basic IDE. If you are inside the Basic IDE and the macro halts at a breakpoint, Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Q stops execution of the macro, but you can recognize this only after the next F5, F8, or Shift+F8.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/sbasic/shared/makefile.mk b/helpcontent2/source/text/sbasic/shared/makefile.mk
index b33bca7559..1ae2d0bf4d 100644
--- a/helpcontent2/source/text/sbasic/shared/makefile.mk
+++ b/helpcontent2/source/text/sbasic/shared/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.10.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/scalc/00/00000404.xhp b/helpcontent2/source/text/scalc/00/00000404.xhp
index a2fd58ea06..389164e91f 100644
--- a/helpcontent2/source/text/scalc/00/00000404.xhp
+++ b/helpcontent2/source/text/scalc/00/00000404.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000404.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -143,8 +143,7 @@
<section id="eifu">
<paragraph role="paragraph" id="par_id3155115" xml-lang="en-US" l10n="U" oldref="14">Choose <emph>Insert - Function</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3152582" xml-lang="en-US" l10n="U" oldref="34"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F2</paragraph>
+<paragraph role="paragraph" id="par_id3152582" xml-lang="en-US" l10n="U" oldref="34"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F2</paragraph>
<paragraph role="paragraph" id="par_id3153269" xml-lang="en-US" l10n="U" oldref="15">On <emph>Formula Bar</emph>, click</paragraph>
<section id="syfunktionsautopilot">
<table id="tbl_id3145258">
@@ -195,8 +194,7 @@
<section id="einafe">
<paragraph role="paragraph" id="par_id3143222" xml-lang="en-US" l10n="U" oldref="29">Choose <emph>Insert - Names - Define</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3149385" xml-lang="en-US" l10n="U" oldref="35"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
+<paragraph role="paragraph" id="par_id3149385" xml-lang="en-US" l10n="U" oldref="35"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
</section>
<paragraph role="paragraph" id="par_id3145214" xml-lang="en-US" l10n="U" oldref="30"><variable id="einaei">Choose <emph>Insert - Names - Insert</emph>
</variable></paragraph>
diff --git a/helpcontent2/source/text/scalc/00/00000412.xhp b/helpcontent2/source/text/scalc/00/00000412.xhp
index afd4e68021..9254a4aa93 100644
--- a/helpcontent2/source/text/scalc/00/00000412.xhp
+++ b/helpcontent2/source/text/scalc/00/00000412.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000412.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -176,8 +176,7 @@
<section id="dnglgra">
<paragraph role="paragraph" id="par_id3146781" xml-lang="en-US" l10n="U" oldref="37">Choose <emph>Data - Group and Outline - Ungroup</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3150892" xml-lang="en-US" l10n="U" oldref="52"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F12</paragraph>
+<paragraph role="paragraph" id="par_id3150892" xml-lang="en-US" l10n="U" oldref="52"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F12</paragraph>
<paragraph role="paragraph" id="par_id3155097" xml-lang="en-US" l10n="CHG" oldref="38">On <emph>Tools</emph> bar, click</paragraph>
<section id="sygruppierungaufheben">
<table id="tbl_id3143223">
diff --git a/helpcontent2/source/text/scalc/00/makefile.mk b/helpcontent2/source/text/scalc/00/makefile.mk
index c8b119b841..464c9fdb32 100644
--- a/helpcontent2/source/text/scalc/00/makefile.mk
+++ b/helpcontent2/source/text/scalc/00/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/scalc/01/01120000.xhp b/helpcontent2/source/text/scalc/01/01120000.xhp
index 6839a33ba2..075833d26c 100644
--- a/helpcontent2/source/text/scalc/01/01120000.xhp
+++ b/helpcontent2/source/text/scalc/01/01120000.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01120000.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -52,7 +52,7 @@
<embed href="text/shared/00/00000401.xhp#ansicht"/>
</section>
<paragraph role="paragraph" id="par_id3145847" xml-lang="en-US" l10n="NEW">Use the icons on the <emph>Page Preview Bar</emph> to scroll through the pages of the document or to print the document.</paragraph>
-<paragraph role="paragraph" id="par_id9838862" xml-lang="en-US" l10n="NEW">You can also press Ctrl+Page Up and Ctrl+Page Down keys to scroll through the pages.</paragraph>
+<paragraph role="paragraph" id="par_id9838862" xml-lang="en-US" l10n="NEW">You can also press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up and Ctrl+Page Down keys to scroll through the pages.</paragraph>
<paragraph role="note" id="par_id7211828" xml-lang="en-US" l10n="NEW">You cannot edit your document while you are in the page preview.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_PREVIEW_CLOSE" id="bm_id9368395" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ClosePreview" id="bm_id2166814" localize="false"/><paragraph role="paragraph" id="par_id460829" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">To exit the page preview, click the <emph>Close Preview</emph> button.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/scalc/01/02210000.xhp b/helpcontent2/source/text/scalc/01/02210000.xhp
index c8cfc54347..9932eaa2c7 100644
--- a/helpcontent2/source/text/scalc/01/02210000.xhp
+++ b/helpcontent2/source/text/scalc/01/02210000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02210000.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -47,6 +47,6 @@
<bookmark branch="hid/.uno:SelectTables" xml-lang="en-US" id="bm_id3154758"/><paragraph role="heading" level="1" id="hd_id3156023" l10n="U" xml-lang="en-US" oldref="5">Selecting Sheets</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3147265" xml-lang="en-US" oldref="1"><variable id="tabellenauswaehlen"><ahelp hid=".uno:SelectTables" visibility="visible">Selects multiple sheets.</ahelp>.</variable></paragraph>
<bookmark branch="hid/HID_SELECTTABLES" xml-lang="en-US" id="bm_id3154126"/><paragraph role="heading" level="2" id="hd_id3125863" l10n="U" xml-lang="en-US" oldref="2">Selected Sheets</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3153969" xml-lang="en-US" oldref="3"><ahelp hid="HID_SELECTTABLES" visibility="visible">Lists the sheets in the current document. To select a sheet, press the up or down arrow keys to move to a sheet in the list. To add a sheet to the selection, hold down Ctrl while pressing the arrow keys and then press Spacebar. To select a range of sheets, hold down Shift and press the arrow keys. </ahelp></paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3153969" xml-lang="en-US" oldref="3"><ahelp hid="HID_SELECTTABLES" visibility="visible">Lists the sheets in the current document. To select a sheet, press the up or down arrow keys to move to a sheet in the list. To add a sheet to the selection, hold down Ctrl (Mac: Command) while pressing the arrow keys and then press Spacebar. To select a range of sheets, hold down Shift and press the arrow keys. </ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04040000.xhp b/helpcontent2/source/text/scalc/01/04040000.xhp
index 0cfec57ba4..eabb8fcd6c 100644
--- a/helpcontent2/source/text/scalc/01/04040000.xhp
+++ b/helpcontent2/source/text/scalc/01/04040000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04040000.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,27 +30,29 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textscalc0104040000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Columns</title>
+<topic id="textscalc0104040000xml" indexer="include">
+<title id="tit" xml-lang="en-US">Columns</title>
<filename>/text/scalc/01/04040000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
- <section id="spalten">
- <bookmark branch="index" xml-lang="en-US" id="bm_id3155628"><bookmark_value>spreadsheets; inserting columns</bookmark_value><bookmark_value>inserting; columns</bookmark_value><bookmark_value>columns; inserting</bookmark_value></bookmark><bookmark xml-lang="en-US" branch="hid/FN_TABLE_INSERT_COL" id="bm_id601010" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:InsertColumns" xml-lang="en-US" id="bm_id3155922"/><paragraph l10n="U" role="heading" level="1" id="hd_id3155628" oldref="1" xml-lang="en-US"> <link href="text/scalc/01/04040000.xhp" name="Columns">Columns</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150791" xml-lang="en-US" oldref="2"><ahelp hid=".uno:InsertColumns" visibility="visible">Inserts a new column to the left of the active cell.</ahelp>The number of columns inserted correspond to the number of columns selected. The existing columns are moved to the right.</paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/scalc/00/00000404.xhp#eispa"/>
+<section id="spalten">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3155628"><bookmark_value>spreadsheets; inserting columns</bookmark_value>
+<bookmark_value>inserting; columns</bookmark_value>
+<bookmark_value>columns; inserting</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_INSERT_COL" id="bm_id601010" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertColumns" id="bm_id3155922" localize="false"/>
+<paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/04040000.xhp" name="Columns">Columns</link></paragraph>
+<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:InsertColumns">Inserts a new column to the left of the active cell.</ahelp> The number of columns inserted corresponds to the number of columns selected. The existing columns are moved to the right.</paragraph>
</section>
- </body>
+<section id="howtoget">
+<embed href="text/scalc/00/00000404.xhp#eispa"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04050000.xhp b/helpcontent2/source/text/scalc/01/04050000.xhp
index 73c0409c3a..9dfb952df9 100644
--- a/helpcontent2/source/text/scalc/01/04050000.xhp
+++ b/helpcontent2/source/text/scalc/01/04050000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04050000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104050000xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104050000xml" indexer="include">
<title id="tit" xml-lang="en-US">Insert Sheet</title>
<filename>/text/scalc/01/04050000.xhp</filename>
</topic>
@@ -48,33 +46,44 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SC:MODALDIALOG:RID_SCDLG_INSERT_TABLE" id="bm_id3151384" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FID_INS_TABLE" id="bm_id1669896" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Insert" id="bm_id3153896" localize="false"/><paragraph role="heading" id="hd_id3155629" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Sheet</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Insert" id="bm_id3153896" localize="false"/>
+<paragraph role="heading" id="hd_id3155629" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Sheet</paragraph>
<paragraph role="paragraph" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="2"><variable id="tabelleeinfuegentext"><ahelp hid=".uno:Insert">Defines the options to be used to insert a new sheet.</ahelp> You can create a new sheet, or insert an existing sheet from a file.
</variable></paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000404.xhp#eitab"/>
+<embed href="text/scalc/00/00000404.xhp#eitab"/>
</section>
<paragraph role="heading" id="hd_id3154684" xml-lang="en-US" level="2" l10n="U" oldref="19">Position</paragraph>
<paragraph role="paragraph" id="par_id3156281" xml-lang="en-US" l10n="U" oldref="20">Specifies where the new sheet is to be inserted into your document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSERT_TABLE:RB_BEFORE" id="bm_id3155131" localize="false"/><paragraph role="heading" id="hd_id3154123" xml-lang="en-US" level="3" l10n="U" oldref="21">Before current sheet</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSERT_TABLE:RB_BEFORE" id="bm_id3155131" localize="false"/>
+<paragraph role="heading" id="hd_id3154123" xml-lang="en-US" level="3" l10n="U" oldref="21">Before current sheet</paragraph>
<paragraph role="paragraph" id="par_id3145787" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSERT_TABLE:RB_BEFORE">Inserts a new sheet directly before the current sheet.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSERT_TABLE:RB_BEHIND" id="bm_id3147434" localize="false"/><paragraph role="heading" id="hd_id3155414" xml-lang="en-US" level="3" l10n="U" oldref="23">After current sheet</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSERT_TABLE:RB_BEHIND" id="bm_id3147434" localize="false"/>
+<paragraph role="heading" id="hd_id3155414" xml-lang="en-US" level="3" l10n="U" oldref="23">After current sheet</paragraph>
<paragraph role="paragraph" id="par_id3145271" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSERT_TABLE:RB_BEHIND">Inserts a new sheet directly after the current sheet.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="2" l10n="U" oldref="25">Create</paragraph>
<paragraph role="paragraph" id="par_id3154012" xml-lang="en-US" l10n="U" oldref="26">Specifies whether a new sheet or an existing sheet is inserted into the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCDLG_INSERT_TABLE_RB_NEW" id="bm_id3145750" localize="false"/><paragraph role="heading" id="hd_id3147350" xml-lang="en-US" level="2" l10n="U" oldref="3">Create</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCDLG_INSERT_TABLE_RB_NEW" id="bm_id3145750" localize="false"/>
+<paragraph role="heading" id="hd_id3147350" xml-lang="en-US" level="2" l10n="U" oldref="3">Create</paragraph>
<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="SC_RADIOBUTTON_RID_SCDLG_INSERT_TABLE_RB_NEW">Creates a new sheet. Enter a sheet name in the <emph>Name</emph> field. Allowed characters are letters, numbers, spaces, and the underline character.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCDLG_INSERT_TABLE:NF_COUNT" id="bm_id3153157" localize="false"/><paragraph role="heading" id="hd_id3155418" xml-lang="en-US" level="3" l10n="U" oldref="27">No. of Sheets</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCDLG_INSERT_TABLE:NF_COUNT" id="bm_id3153157" localize="false"/>
+<paragraph role="heading" id="hd_id3155418" xml-lang="en-US" level="3" l10n="U" oldref="27">No. of Sheets</paragraph>
<paragraph role="paragraph" id="par_id3148457" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SC:NUMERICFIELD:RID_SCDLG_INSERT_TABLE:NF_COUNT">Specifies the number of sheets to be created.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_INSERT_TABLE:ED_TABNAME" id="bm_id3154510" localize="false"/><paragraph role="heading" id="hd_id3149379" xml-lang="en-US" level="3" l10n="U" oldref="7">Name</paragraph>
-<paragraph role="paragraph" id="par_id3150718" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SC:EDIT:RID_SCDLG_INSERT_TABLE:ED_TABNAME">Specifies the name of the new sheet. Allowed characters are letters, numbers, spaces, and the underline character.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCDLG_INSERT_TABLE_RB_FROMFILE" id="bm_id3150328" localize="false"/><paragraph role="heading" id="hd_id3155066" xml-lang="en-US" level="2" l10n="U" oldref="9">From File</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_INSERT_TABLE:ED_TABNAME" id="bm_id3154510" localize="false"/>
+<paragraph role="heading" id="hd_id3149379" xml-lang="en-US" level="3" l10n="U" oldref="7">Name</paragraph>
+<paragraph role="paragraph" id="par_id3150718" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SC:EDIT:RID_SCDLG_INSERT_TABLE:ED_TABNAME">Specifies the name of the new sheet.</ahelp></paragraph>
+<embed href="text/scalc/guide/rename_table.xhp#rename_table"/>
+<bookmark xml-lang="en-US" branch="hid/SC_RADIOBUTTON_RID_SCDLG_INSERT_TABLE_RB_FROMFILE" id="bm_id3150328" localize="false"/>
+<paragraph role="heading" id="hd_id3155066" xml-lang="en-US" level="2" l10n="U" oldref="9">From File</paragraph>
<paragraph role="paragraph" id="par_id3153714" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC_RADIOBUTTON_RID_SCDLG_INSERT_TABLE_RB_FROMFILE">Inserts a sheet from an existing file into the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_INSERT_TABLE:BTN_BROWSE" id="bm_id3150044" localize="false"/><paragraph role="heading" id="hd_id3149020" xml-lang="en-US" level="3" l10n="U" oldref="15">Browse</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_INSERT_TABLE:BTN_BROWSE" id="bm_id3150044" localize="false"/>
+<paragraph role="heading" id="hd_id3149020" xml-lang="en-US" level="3" l10n="U" oldref="15">Browse</paragraph>
<paragraph role="paragraph" id="par_id3159267" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_INSERT_TABLE:BTN_BROWSE">Opens a dialog for selecting a file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:MULTILISTBOX:RID_SCDLG_INSERT_TABLE:LB_TABLES" id="bm_id3146314" localize="false"/><paragraph role="heading" id="hd_id3149255" xml-lang="en-US" level="3" l10n="U" oldref="29">Available Sheets</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:MULTILISTBOX:RID_SCDLG_INSERT_TABLE:LB_TABLES" id="bm_id3146314" localize="false"/>
+<paragraph role="heading" id="hd_id3149255" xml-lang="en-US" level="3" l10n="U" oldref="29">Available Sheets</paragraph>
<paragraph role="paragraph" id="par_id3155336" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SC:MULTILISTBOX:RID_SCDLG_INSERT_TABLE:LB_TABLES">If you selected a file by using the <emph>Browse</emph> button, the sheets contained in it are displayed in the list box. The file path is displayed below this box. Select the sheet to be inserted from the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_INSERT_TABLE_CB_LINK" id="bm_id3149814" localize="false"/><paragraph role="heading" id="hd_id3145791" xml-lang="en-US" level="3" l10n="U" oldref="17">Link</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_INSERT_TABLE_CB_LINK" id="bm_id3149814" localize="false"/>
+<paragraph role="heading" id="hd_id3145791" xml-lang="en-US" level="3" l10n="U" oldref="17">Link</paragraph>
<paragraph role="paragraph" id="par_id3152580" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SC_CHECKBOX_RID_SCDLG_INSERT_TABLE_CB_LINK">Select to insert the sheet as a link instead as a copy. The links can be updated to show the current contents.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060000.xhp b/helpcontent2/source/text/scalc/01/04060000.xhp
index 28ffec64b0..9678b90697 100644
--- a/helpcontent2/source/text/scalc/01/04060000.xhp
+++ b/helpcontent2/source/text/scalc/01/04060000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060000.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060000xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060000xml" indexer="include">
<title id="tit" xml-lang="en-US">Function Wizard</title>
<filename>/text/scalc/01/04060000.xhp</filename>
</topic>
@@ -50,7 +48,8 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_INSWIN_CALC" id="bm_id3145750" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_OPENDLG_FUNCTION" id="bm_id1185225" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:FunctionDialog" id="bm_id3148577" localize="false"/><paragraph role="heading" id="hd_id3147426" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/04060000.xhp" name="AutoPilot: Functions">Function Wizard</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FunctionDialog" id="bm_id3148577" localize="false"/>
+<paragraph role="heading" id="hd_id3147426" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/04060000.xhp" name="AutoPilot: Functions">Function Wizard</link></paragraph>
</section>
<paragraph role="paragraph" id="par_id3145271" xml-lang="en-US" l10n="U" oldref="2"><variable id="funktionsautopilottext"><ahelp hid=".uno:FunctionDialog">Opens the <emph>Function Wizard</emph>, which helps you to interactively create formulas.</ahelp>
</variable> Before you start the Wizard, select a cell or a range of cells from the current sheet, in order to determine the position at which the formula will be inserted.</paragraph>
@@ -61,41 +60,44 @@
<paragraph role="paragraph" id="par_id3159153" xml-lang="en-US" l10n="U" oldref="60">The <emph>Function Wizard</emph> has two tabs: <emph>Functions</emph> is used to create formulas, and <emph>Structure</emph> is used to check the formula build.</paragraph>
<paragraph role="heading" id="hd_id3154490" xml-lang="en-US" level="2" l10n="U" oldref="3">Functions Tab</paragraph>
<paragraph role="paragraph" id="par_id3149378" xml-lang="en-US" l10n="U" oldref="5"><link href="text/scalc/01/04060100.xhp" name="List of Categories and Functions">List of Categories and Functions</link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCTAB_FUNCTION:LB_CATEGORY" id="bm_id3155602" localize="false"/><paragraph role="heading" id="hd_id3154730" xml-lang="en-US" level="3" l10n="U" oldref="36">Category</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCTAB_FUNCTION:LB_CATEGORY" id="bm_id3155602" localize="false"/>
+<paragraph role="heading" id="hd_id3154730" xml-lang="en-US" level="3" l10n="U" oldref="36">Category</paragraph>
<paragraph role="paragraph" id="par_id3153417" xml-lang="en-US" l10n="U" oldref="37"><variable id="kategorienliste"><ahelp hid="SC:LISTBOX:RID_SCTAB_FUNCTION:LB_CATEGORY">Lists all the categories to which the different functions are assigned. Select a category to view the appropriate functions in the list field below.</ahelp> Select "All" to view all functions in alphabetical order, irrespective of category. "Last Used" lists the functions you have most recently used.
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCTAB_FUNCTION:LB_FUNCTION" id="bm_id3153714" localize="false"/><paragraph role="heading" id="hd_id3150749" xml-lang="en-US" level="3" l10n="U" oldref="6">Function</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCTAB_FUNCTION:LB_FUNCTION" id="bm_id3153714" localize="false"/>
+<paragraph role="heading" id="hd_id3150749" xml-lang="en-US" level="3" l10n="U" oldref="6">Function</paragraph>
<paragraph role="paragraph" id="par_id3155445" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SC:LISTBOX:RID_SCTAB_FUNCTION:LB_FUNCTION">Displays the functions found under the selected category. Double-click to select a function.</ahelp> A single-click displays a short function description.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_FORMULA:BTN_MATRIX" id="bm_id3156385" localize="false"/><paragraph role="heading" id="hd_id3159264" xml-lang="en-US" level="3" l10n="U" oldref="8">Array</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_FORMULA:BTN_MATRIX" id="bm_id3156385" localize="false"/>
+<paragraph role="heading" id="hd_id3159264" xml-lang="en-US" level="3" l10n="U" oldref="8">Array</paragraph>
<paragraph role="paragraph" id="par_id3149566" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SC:CHECKBOX:RID_SCDLG_FORMULA:BTN_MATRIX">Specifies that the selected function is inserted into the selected cell range as an array formula. </ahelp> Array formulas operate on multiple cells. Each cell in the array contains the formula, not as a copy but as a common formula shared by all matrix cells.</paragraph>
-<paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="U" oldref="61">The <emph>Array</emph> option is identical to the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter command, which is used to enter and confirm formulas in the sheet. The formula is inserted as a matrix formula indicated by two braces { }.</paragraph>
+<paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="U" oldref="61">The <emph>Array</emph> option is identical to the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter command, which is used to enter and confirm formulas in the sheet. The formula is inserted as a matrix formula indicated by two braces { }.</paragraph>
<paragraph role="note" id="par_id3152993" xml-lang="en-US" l10n="U" oldref="40">The maximum size of an array range is 128 by 128 cells.</paragraph>
<paragraph role="heading" id="hd_id3150367" xml-lang="en-US" level="3" l10n="U" oldref="41">Argument Input Fields</paragraph>
<paragraph role="paragraph" id="par_id3145587" xml-lang="en-US" l10n="CHG" oldref="15">When you double-click a function, the argument input field(s) appear on the right side of the dialog. To select a cell reference as an argument, click directly into the cell, or drag across the required range on the sheet while holding down the mouse button. You can also enter numerical and other values or references directly into the corresponding fields in the dialog. When using <link href="text/scalc/01/04060102.xhp" name="date entries">date entries</link>, make sure you use the correct format. Click OK to insert the result into the spreadsheet.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_FORMULA:RB_REF" id="bm_id3154488" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF1" id="bm_id3146981" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF2" id="bm_id3146111" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF3" id="bm_id3146114" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF4" id="bm_id3156290" localize="false"/><embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
<paragraph role="heading" id="hd_id3149408" xml-lang="en-US" level="3" l10n="U" oldref="18">Function Result</paragraph>
<paragraph role="paragraph" id="par_id3155809" xml-lang="en-US" l10n="U" oldref="19">As soon you enter arguments in the function, the result is calculated. This preview informs you if the calculation can be carried out with the arguments given. If the arguments result in an error, the corresponding <link href="text/scalc/05/02140000.xhp" name="error code">error code</link> is displayed.</paragraph>
<paragraph role="paragraph" id="par_id3148700" xml-lang="en-US" l10n="CHG" oldref="23">The required arguments are indicated by names in bold print.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_FX1" id="bm_id3146866" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_FX2" id="bm_id3146870" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_FX3" id="bm_id3151240" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_FX4" id="bm_id3153912" localize="false"/><paragraph role="heading" id="hd_id3153064" xml-lang="en-US" level="3" l10n="CHG" oldref="22">f(x) (depending on the selected function)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_FX4" id="bm_id3153912" localize="false"/>
+<paragraph role="heading" id="hd_id3153064" xml-lang="en-US" level="3" l10n="CHG" oldref="22">f(x) (depending on the selected function)</paragraph>
<paragraph role="paragraph" id="par_id3157980" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="HID_SC_FAP_BTN_FX4">Allows you to access a subordinate level of the <emph>Function Wizard</emph> in order to nest another function within the function, instead of a value or reference.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_FORMULA:ED_REF" id="bm_id3147073" localize="false"/><paragraph role="heading" id="hd_id3145076" xml-lang="en-US" level="3" l10n="CHG" oldref="25">Argument/Parameter/Cell Reference (depending on the selected function)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_FORMULA:ED_REF" id="bm_id3147073" localize="false"/>
+<paragraph role="heading" id="hd_id3145076" xml-lang="en-US" level="3" l10n="CHG" oldref="25">Argument/Parameter/Cell Reference (depending on the selected function)</paragraph>
<paragraph role="paragraph" id="par_id3159097" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SC:EDIT:RID_SCDLG_FORMULA:ED_REF">The number of visible text fields depends on the function. Enter arguments either directly into the argument fields or by clicking a cell in the table.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154957" xml-lang="en-US" level="3" l10n="U" oldref="51">Result</paragraph>
<paragraph role="paragraph" id="par_id3150211" xml-lang="en-US" l10n="U" oldref="52">Displays the calculation result or an error message.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_FORMULA" id="bm_id3155384" localize="false"/><paragraph role="heading" id="hd_id3151304" xml-lang="en-US" level="3" l10n="U" oldref="43">Formula</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_FORMULA" id="bm_id3155384" localize="false"/>
+<paragraph role="heading" id="hd_id3151304" xml-lang="en-US" level="3" l10n="U" oldref="43">Formula</paragraph>
<paragraph role="paragraph" id="par_id3149898" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="HID_SC_FAP_FORMULA">Displays the created formula. Type your entries directly, or create the formula using the wizard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_FORMULA:BTN_BACKWARD" id="bm_id3153973" localize="false"/><paragraph role="heading" id="hd_id3153249" xml-lang="en-US" level="3" l10n="U" oldref="45">Back</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_FORMULA:BTN_BACKWARD" id="bm_id3153973" localize="false"/>
+<paragraph role="heading" id="hd_id3153249" xml-lang="en-US" level="3" l10n="U" oldref="45">Back</paragraph>
<paragraph role="paragraph" id="par_id3152869" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_FORMULA:BTN_BACKWARD">Moves the focus back through the formula components, marking them as it does so.</ahelp></paragraph>
<paragraph role="tip" id="par_id3146966" xml-lang="en-US" l10n="U" oldref="56">To select a single function from a complex formula consisting of several functions, double-click the function in the formula window.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_FORMULA:BTN_FORWARD" id="bm_id3151194" localize="false"/><paragraph role="heading" id="hd_id3155762" xml-lang="en-US" level="3" l10n="U" oldref="54">Next</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_FORMULA:BTN_FORWARD" id="bm_id3151194" localize="false"/>
+<paragraph role="heading" id="hd_id3155762" xml-lang="en-US" level="3" l10n="U" oldref="54">Next</paragraph>
<paragraph role="paragraph" id="par_id3149316" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_FORMULA:BTN_FORWARD">Moves forward through the formula components in the formula window.</ahelp> This button can also be used to assign functions to the formula. If you select a function and click the <emph>Next </emph>button, the selection appears in the formula window.</paragraph>
<paragraph role="tip" id="par_id3159262" xml-lang="en-US" l10n="U" oldref="57">Double-click a function in the selection window to transfer it to the formula window.</paragraph>
<paragraph role="heading" id="hd_id3148745" xml-lang="en-US" level="3" l10n="U" oldref="58">Cancel</paragraph>
@@ -106,7 +108,8 @@
<paragraph role="heading" id="hd_id3147610" xml-lang="en-US" level="2" l10n="U" oldref="47">Structure tab</paragraph>
<paragraph role="paragraph" id="par_id3153122" xml-lang="en-US" l10n="U" oldref="48">On this page, you can view the structure of the function.</paragraph>
<paragraph role="note" id="par_id3149350" xml-lang="en-US" l10n="U" oldref="4">If you start the <emph>Function Wizard</emph> while the cell cursor is positioned in a cell that already contains a function, the <emph>Structure</emph> tab is opened and shows the composition of the current formula.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_STRUCT" id="bm_id3150464" localize="false"/><paragraph role="heading" id="hd_id3149014" xml-lang="en-US" level="3" l10n="U" oldref="49">Structure</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_STRUCT" id="bm_id3150464" localize="false"/>
+<paragraph role="heading" id="hd_id3149014" xml-lang="en-US" level="3" l10n="U" oldref="49">Structure</paragraph>
<paragraph role="paragraph" id="par_id3150481" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="HID_SC_FAP_STRUCT">Displays a hierarchical representation of the current function.</ahelp> You can hide or show the arguments by a click on the plus or minus sign in front.</paragraph>
<paragraph role="note" id="par_id3148886" xml-lang="en-US" l10n="U" oldref="63">Blue dots denote correctly entered arguments. Red dots indicate incorrect data types. For example: if the SUM function has one argument entered as text, this is highlighted in red as SUM only permits number entries.</paragraph>
</body>
diff --git a/helpcontent2/source/text/scalc/01/04060100.xhp b/helpcontent2/source/text/scalc/01/04060100.xhp
index 8d96344365..81c4c07bd8 100755
--- a/helpcontent2/source/text/scalc/01/04060100.xhp
+++ b/helpcontent2/source/text/scalc/01/04060100.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060100.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060100xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060100xml" indexer="include">
<title id="tit" xml-lang="en-US">Functions by Category</title>
<filename>/text/scalc/01/04060100.xhp</filename>
</topic>
@@ -46,7 +44,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3148575"><bookmark_value>functions;listed by category</bookmark_value>
<bookmark_value>categories of functions</bookmark_value>
<bookmark_value>list of functions</bookmark_value>
-</bookmark><comment>MW deleted "Calc functions"</comment><paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="1" l10n="CHG" oldref="16">Functions by Category</paragraph>
+</bookmark><comment>MW deleted "Calc functions"</comment>
+<paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="1" l10n="CHG" oldref="16">Functions by Category</paragraph>
<paragraph role="paragraph" id="par_id3149378" xml-lang="en-US" l10n="CHG" oldref="2">This section describes the functions of $[officename] Calc. The various functions are divided into categories in the Function Wizard.</paragraph>
<paragraph role="heading" id="hd_id3146972" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/scalc/01/04060101.xhp" name="Database">Database</link></paragraph>
<embed href="text/scalc/01/04060101.xhp#datenbanktext"/>
@@ -71,5 +70,9 @@
<paragraph role="heading" id="hd_id3156449" xml-lang="en-US" level="2" l10n="U" oldref="13"><link href="text/scalc/01/04060111.xhp" name="Add-in">Add-in</link></paragraph>
<embed href="text/scalc/01/04060111.xhp#addintext"/>
<paragraph role="paragraph" id="par_id3150715" xml-lang="en-US" l10n="U" oldref="14"><link href="text/scalc/01/04060199.xhp" name="Operators">Operators</link> are also available.</paragraph>
+<section id="relatedtopics">
+<paragraph role="paragraph" id="par_id0902200809540918" xml-lang="en-US" l10n="NEW"><variable id="drking"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_by_category">Calc functions in the OpenOffice.org Wiki</link>
+</variable></paragraph>
+</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060101.xhp b/helpcontent2/source/text/scalc/01/04060101.xhp
index ab36c3a436..1bf874be9d 100755
--- a/helpcontent2/source/text/scalc/01/04060101.xhp
+++ b/helpcontent2/source/text/scalc/01/04060101.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060101.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060101xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060101xml" indexer="include">
<title id="tit" xml-lang="en-US">Database Functions</title>
<filename>/text/scalc/01/04060101.xhp</filename>
</topic>
@@ -56,416 +54,443 @@
<paragraph role="paragraph" id="par_id3155766" xml-lang="en-US" l10n="U" oldref="3">The range A1:E10 lists the children invited to Joe's birthday party. The following information is given for each entry: column A shows the name, B the grade, then age in years, distance to school in meters and weight in kilograms.</paragraph>
<table id="tbl_id3159264">
<tablerow>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="tablehead" id="par_id3145232" xml-lang="en-US" l10n="U" oldref="4">A</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3146316" xml-lang="en-US" l10n="U" oldref="5">B</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150297" xml-lang="en-US" l10n="U" oldref="6">C</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150344" xml-lang="en-US" l10n="U" oldref="7">D</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150785" xml-lang="en-US" l10n="U" oldref="8">E</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150090" xml-lang="en-US" l10n="U" oldref="9">1</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152992" xml-lang="en-US" l10n="U" oldref="10">
<item type="input">Name</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155532" xml-lang="en-US" l10n="U" oldref="11">
<item type="input">Grade</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156448" xml-lang="en-US" l10n="U" oldref="12">
<item type="input">Age</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154486" xml-lang="en-US" l10n="U" oldref="13">
<item type="input">Distance to School</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152899" xml-lang="en-US" l10n="U" oldref="14">
<item type="input">Weight</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153816" xml-lang="en-US" l10n="U" oldref="15">2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151240" xml-lang="en-US" l10n="U" oldref="16">
<item type="input">Andy</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156016" xml-lang="en-US" l10n="U" oldref="17">
<item type="input">3</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145073" xml-lang="en-US" l10n="U" oldref="18">
<item type="input">9</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154956" xml-lang="en-US" l10n="U" oldref="19">
<item type="input">150</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153976" xml-lang="en-US" l10n="U" oldref="20">
<item type="input">40</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150894" xml-lang="en-US" l10n="U" oldref="21">3</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152870" xml-lang="en-US" l10n="U" oldref="22">
<item type="input">Betty</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149692" xml-lang="en-US" l10n="U" oldref="23">
<item type="input">4</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154652" xml-lang="en-US" l10n="U" oldref="24">
<item type="input">10</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149381" xml-lang="en-US" l10n="U" oldref="25">
<item type="input">1000</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153812" xml-lang="en-US" l10n="U" oldref="26">
<item type="input">42</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146965" xml-lang="en-US" l10n="U" oldref="27">4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155596" xml-lang="en-US" l10n="U" oldref="28">
<item type="input">Charles</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147244" xml-lang="en-US" l10n="U" oldref="29">
<item type="input">3</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149871" xml-lang="en-US" l10n="U" oldref="30">
<item type="input">10</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155752" xml-lang="en-US" l10n="U" oldref="31">
<item type="input">300</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149052" xml-lang="en-US" l10n="U" oldref="32">
<item type="input">51</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146097" xml-lang="en-US" l10n="U" oldref="33">5</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147296" xml-lang="en-US" l10n="U" oldref="34">
<item type="input">Daniel</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150393" xml-lang="en-US" l10n="U" oldref="35">
<item type="input">5</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145236" xml-lang="en-US" l10n="U" oldref="36">
<item type="input">11</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150534" xml-lang="en-US" l10n="U" oldref="37">
<item type="input">1200</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150375" xml-lang="en-US" l10n="U" oldref="38">
<item type="input">48</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159121" xml-lang="en-US" l10n="U" oldref="39">6</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150456" xml-lang="en-US" l10n="U" oldref="40">
<item type="input">Eva</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146886" xml-lang="en-US" l10n="U" oldref="41">
<item type="input">2</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149945" xml-lang="en-US" l10n="U" oldref="42">
<item type="input">8</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3157904" xml-lang="en-US" l10n="U" oldref="43">
<item type="input">650</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149352" xml-lang="en-US" l10n="U" oldref="44">
<item type="input">33</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150028" xml-lang="en-US" l10n="U" oldref="45">7</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145826" xml-lang="en-US" l10n="U" oldref="46">
-<item type="input">Frank</item>
+<item type="input">F</item>
+<item type="input">rank</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150743" xml-lang="en-US" l10n="U" oldref="47">
<item type="input">2</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154844" xml-lang="en-US" l10n="U" oldref="48">
<item type="input">7</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148435" xml-lang="en-US" l10n="U" oldref="49">
-<item type="input">300</item>
+<item type="input">3</item>
+<item type="input">00</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148882" xml-lang="en-US" l10n="U" oldref="50">
-<item type="input">42</item>
+<item type="input">4</item>
+<item type="input">2</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150140" xml-lang="en-US" l10n="U" oldref="51">8</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="52">
<item type="input">Greta</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148739" xml-lang="en-US" l10n="U" oldref="53">
<item type="input">1</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148583" xml-lang="en-US" l10n="U" oldref="54">
<item type="input">7</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154556" xml-lang="en-US" l10n="U" oldref="55">
<item type="input">200</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155255" xml-lang="en-US" l10n="U" oldref="56">
<item type="input">36</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145141" xml-lang="en-US" l10n="U" oldref="57">9</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153078" xml-lang="en-US" l10n="U" oldref="58">
<item type="input">Harry</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149955" xml-lang="en-US" l10n="U" oldref="59">
<item type="input">3</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150005" xml-lang="en-US" l10n="U" oldref="60">
<item type="input">9</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155951" xml-lang="en-US" l10n="U" oldref="61">
<item type="input">1200</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145169" xml-lang="en-US" l10n="U" oldref="62">
<item type="input">44</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153571" xml-lang="en-US" l10n="U" oldref="63">10</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148761" xml-lang="en-US" l10n="U" oldref="64">
<item type="input">Irene</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="65">
<item type="input">2</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154327" xml-lang="en-US" l10n="U" oldref="66">
<item type="input">8</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155435" xml-lang="en-US" l10n="U" oldref="67">
<item type="input">1000</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145353" xml-lang="en-US" l10n="U" oldref="68">
<item type="input">42</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150662" xml-lang="en-US" l10n="U" oldref="69">11</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150568" xml-lang="en-US" l10n="U" oldref="70">12</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149393" xml-lang="en-US" l10n="U" oldref="71">13</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153544" xml-lang="en-US" l10n="U" oldref="72">
<item type="input">Name</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3158414" xml-lang="en-US" l10n="U" oldref="73">
<item type="input">Grade</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152820" xml-lang="en-US" l10n="U" oldref="74">
<item type="input">Age</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154866" xml-lang="en-US" l10n="U" oldref="75">
<item type="input">Distance to School</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150471" xml-lang="en-US" l10n="U" oldref="76">
<item type="input">Weight</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153920" xml-lang="en-US" l10n="U" oldref="77">14</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="tablecontent" id="par_id3148429" xml-lang="en-US" l10n="U" oldref="78">
<item type="input">&gt;600</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
+<tablecell>
+</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152588" xml-lang="en-US" l10n="U" oldref="79">15</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3083286" xml-lang="en-US" l10n="U" oldref="80">16</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3163823" xml-lang="en-US" l10n="U" oldref="81">
<item type="input">DCOUNT</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145083" xml-lang="en-US" l10n="U" oldref="82">
<item type="input">5</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3149282" xml-lang="en-US" l10n="U" oldref="83">The formula in cell B16 is =DCOUNT(A1:E10;0;A13:E14)</paragraph>
<paragraph role="heading" id="hd_id3150962" xml-lang="en-US" level="3" l10n="U" oldref="192">Database Function Parameters:</paragraph>
<paragraph role="paragraph" id="par_id3155837" xml-lang="en-US" l10n="U" oldref="84">The following items are the parameter definitions for all database functions:</paragraph>
@@ -478,11 +503,13 @@
<emph>SearchCriteria</emph> is the cell range containing search criteria. If you write several criteria in one row they are connected by AND. If you write the criteria in different rows they are connected by OR. Empty cells in the search criteria range will be ignored.</paragraph>
<paragraph role="paragraph" id="par_id3151188" xml-lang="en-US" l10n="U" oldref="188">Choose <link href="text/shared/optionen/01060500.xhp" name="Tools - Options - Spreadsheet - Calculate">Tools - Options - %PRODUCTNAME Calc - Calculate</link> to define how $[officename] Calc acts when searching for identical entries.</paragraph>
<paragraph role="paragraph" id="par_id3882869" xml-lang="en-US" l10n="NEW">See also the Wiki page about <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Conditional_Counting_and_Summation">Conditional Counting and Summation</link>.</paragraph>
-<sort order="asc"><section id="Section1">
+<sort order="asc">
+<section id="Section1">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150882"><bookmark_value>DCOUNT function</bookmark_value>
<bookmark_value>counting rows;with numeric values</bookmark_value>
</bookmark><comment>mw added "counting rows;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBANZAHL" id="bm_id3152926" localize="false"/><paragraph role="heading" id="hd_id3150882" xml-lang="en-US" level="2" l10n="U" oldref="88">DCOUNT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBANZAHL" id="bm_id3152926" localize="false"/>
+<paragraph role="heading" id="hd_id3150882" xml-lang="en-US" level="2" l10n="U" oldref="88">DCOUNT</paragraph>
<paragraph role="paragraph" id="par_id3156133" xml-lang="en-US" l10n="U" oldref="89"><ahelp hid="HID_FUNC_DBANZAHL">DCOUNT counts the number of rows (records) in a database that match the specified search criteria and contain numerical values.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3156099" xml-lang="en-US" level="3" l10n="U" oldref="90">Syntax</paragraph>
@@ -500,7 +527,8 @@
<bookmark_value>records;counting in Calc databases</bookmark_value>
<bookmark_value>counting rows;with numeric or alphanumeric values</bookmark_value>
</bookmark><comment>mw added "records;" and "counting rows;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBANZAHL2" id="bm_id3154055" localize="false"/><paragraph role="heading" id="hd_id3156123" xml-lang="en-US" level="2" l10n="U" oldref="97">DCOUNTA</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBANZAHL2" id="bm_id3154055" localize="false"/>
+<paragraph role="heading" id="hd_id3156123" xml-lang="en-US" level="2" l10n="U" oldref="97">DCOUNTA</paragraph>
<paragraph role="paragraph" id="par_id3156110" xml-lang="en-US" l10n="U" oldref="98"><ahelp hid="HID_FUNC_DBANZAHL2">DCOUNTA counts the number of rows (records) in a database that match the specified search conditions, and contain numeric or alphanumeric values.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3143228" xml-lang="en-US" level="3" l10n="U" oldref="99">Syntax</paragraph>
@@ -514,7 +542,8 @@
<bookmark_value>cell contents;searching in Calc databases</bookmark_value>
<bookmark_value>searching;cell contents in Calc databases</bookmark_value>
</bookmark><comment>mw added "cell contents;" and "searching;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBAUSZUG" id="bm_id3149198" localize="false"/><paragraph role="heading" id="hd_id3147256" xml-lang="en-US" level="2" l10n="U" oldref="104">DGET</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBAUSZUG" id="bm_id3149198" localize="false"/>
+<paragraph role="heading" id="hd_id3147256" xml-lang="en-US" level="2" l10n="U" oldref="104">DGET</paragraph>
<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="105"><ahelp hid="HID_FUNC_DBAUSZUG">DGET returns the contents of the referenced cell in a database which matches the specified search criteria.</ahelp> In case of an error, the function returns either #VALUE! for no row found, or Err502 for more than one cell found.</paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3159344" xml-lang="en-US" level="3" l10n="U" oldref="106">Syntax</paragraph>
@@ -537,7 +566,8 @@
<bookmark_value>maximum values in Calc databases</bookmark_value>
<bookmark_value>searching;maximum values in columns</bookmark_value>
</bookmark><comment>mw added "maximum..." and "searching;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBMAX" id="bm_id3158401" localize="false"/><paragraph role="heading" id="hd_id3149766" xml-lang="en-US" level="2" l10n="U" oldref="115">DMAX</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBMAX" id="bm_id3158401" localize="false"/>
+<paragraph role="heading" id="hd_id3149766" xml-lang="en-US" level="2" l10n="U" oldref="115">DMAX</paragraph>
<paragraph role="paragraph" id="par_id3154903" xml-lang="en-US" l10n="U" oldref="116"><ahelp hid="HID_FUNC_DBMAX">DMAX returns the maximum content of a cell (field) in a database (all records) that matches the specified search conditions.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3150771" xml-lang="en-US" level="3" l10n="U" oldref="117">Syntax</paragraph>
@@ -555,7 +585,8 @@
<bookmark_value>minimum values in Calc databases</bookmark_value>
<bookmark_value>searching;minimum values in columns</bookmark_value>
</bookmark><comment>mw added "minimum..." and "searching;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBMIN" id="bm_id3159152" localize="false"/><paragraph role="heading" id="hd_id3159141" xml-lang="en-US" level="2" l10n="U" oldref="123">DMIN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBMIN" id="bm_id3159152" localize="false"/>
+<paragraph role="heading" id="hd_id3159141" xml-lang="en-US" level="2" l10n="U" oldref="123">DMIN</paragraph>
<paragraph role="paragraph" id="par_id3154261" xml-lang="en-US" l10n="U" oldref="124"><ahelp hid="HID_FUNC_DBMIN">DMIN returns the minimum content of a cell (field) in a database that matches the specified search criteria.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3147238" xml-lang="en-US" level="3" l10n="U" oldref="125">Syntax</paragraph>
@@ -573,7 +604,8 @@
<bookmark_value>averages; in Calc databases</bookmark_value>
<bookmark_value>calculating;averages in Calc databases</bookmark_value>
</bookmark><comment>mw added "averages;..." and "calculating;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBMITTELWERT" id="bm_id3166435" localize="false"/><paragraph role="heading" id="hd_id3154274" xml-lang="en-US" level="2" l10n="U" oldref="131">DAVERAGE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBMITTELWERT" id="bm_id3166435" localize="false"/>
+<paragraph role="heading" id="hd_id3154274" xml-lang="en-US" level="2" l10n="U" oldref="131">DAVERAGE</paragraph>
<paragraph role="paragraph" id="par_id3166453" xml-lang="en-US" l10n="U" oldref="132"><ahelp hid="HID_FUNC_DBMITTELWERT">DAVERAGE returns the average of the values of all cells (fields) in all rows (database records) that match the specified search criteria.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3146955" xml-lang="en-US" level="3" l10n="U" oldref="133">Syntax</paragraph>
@@ -590,7 +622,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3159269"><bookmark_value>DPRODUCT function</bookmark_value>
<bookmark_value>multiplying;cell contents in Calc databases</bookmark_value>
</bookmark><comment>mw added "multiplying..."</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBPRODUKT" id="bm_id3159281" localize="false"/><paragraph role="heading" id="hd_id3159269" xml-lang="en-US" level="2" l10n="U" oldref="139">DPRODUCT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBPRODUKT" id="bm_id3159281" localize="false"/>
+<paragraph role="heading" id="hd_id3159269" xml-lang="en-US" level="2" l10n="U" oldref="139">DPRODUCT</paragraph>
<paragraph role="paragraph" id="par_id3152879" xml-lang="en-US" l10n="U" oldref="140"><ahelp hid="HID_FUNC_DBPRODUKT">DPRODUCT multiplies all cells of a data range where the cell contents match the search criteria.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3149966" xml-lang="en-US" level="3" l10n="U" oldref="141">Syntax</paragraph>
@@ -603,7 +636,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3148462"><bookmark_value>DSTDEV function</bookmark_value>
<bookmark_value>standard deviations in databases;based on a sample</bookmark_value>
</bookmark><comment>mw added "standard deviations...;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBSTDABW" id="bm_id3145370" localize="false"/><paragraph role="heading" id="hd_id3148462" xml-lang="en-US" level="2" l10n="U" oldref="145">DSTDEV</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBSTDABW" id="bm_id3145370" localize="false"/>
+<paragraph role="heading" id="hd_id3148462" xml-lang="en-US" level="2" l10n="U" oldref="145">DSTDEV</paragraph>
<paragraph role="paragraph" id="par_id3154605" xml-lang="en-US" l10n="U" oldref="146"><ahelp hid="HID_FUNC_DBSTDABW">DSTDEV calculates the standard deviation of a population based on a sample, using the numbers in a database column that match the given conditions.</ahelp> The records are treated as a sample of data. That means that the children in the example represent a cross section of all children. Note that a representative result can not be obtained from a sample of less than one thousand.</paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3149427" xml-lang="en-US" level="3" l10n="U" oldref="147">Syntax</paragraph>
@@ -620,7 +654,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3150429"><bookmark_value>DSTDEVP function</bookmark_value>
<bookmark_value>standard deviations in databases;based on populations</bookmark_value>
</bookmark><comment>mw added "standard deviations...;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBSTDABWN" id="bm_id3149523" localize="false"/><paragraph role="heading" id="hd_id3150429" xml-lang="en-US" level="2" l10n="U" oldref="153">DSTDEVP</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBSTDABWN" id="bm_id3149523" localize="false"/>
+<paragraph role="heading" id="hd_id3150429" xml-lang="en-US" level="2" l10n="U" oldref="153">DSTDEVP</paragraph>
<paragraph role="paragraph" id="par_id3145598" xml-lang="en-US" l10n="U" oldref="154"><ahelp hid="HID_FUNC_DBSTDABWN">DSTDEVP calculates the standard deviation of a population based on all cells of a data range which match the search criteria.</ahelp> The records from the example are treated as the whole population.</paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3145307" xml-lang="en-US" level="3" l10n="U" oldref="155">Syntax</paragraph>
@@ -638,7 +673,8 @@
<bookmark_value>calculating;sums in Calc databases</bookmark_value>
<bookmark_value>sums;cells in Calc databases</bookmark_value>
</bookmark><comment>mw added "calculating;" and "sums;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBSUMME" id="bm_id3148687" localize="false"/><paragraph role="heading" id="hd_id3154794" xml-lang="en-US" level="2" l10n="U" oldref="161">DSUM</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBSUMME" id="bm_id3148687" localize="false"/>
+<paragraph role="heading" id="hd_id3154794" xml-lang="en-US" level="2" l10n="U" oldref="161">DSUM</paragraph>
<paragraph role="paragraph" id="par_id3149591" xml-lang="en-US" l10n="U" oldref="162"><ahelp hid="HID_FUNC_DBSUMME">DSUM returns the total of all cells in a database field in all rows (records) that match the specified search criteria.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3146128" xml-lang="en-US" level="3" l10n="U" oldref="163">Syntax</paragraph>
@@ -655,7 +691,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3155614"><bookmark_value>DVAR function</bookmark_value>
<bookmark_value>variances;based on samples</bookmark_value>
</bookmark><comment>mw added "variances;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBVARIANZ" id="bm_id3159391" localize="false"/><paragraph role="heading" id="hd_id3155614" xml-lang="en-US" level="2" l10n="U" oldref="170">DVAR</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBVARIANZ" id="bm_id3159391" localize="false"/>
+<paragraph role="heading" id="hd_id3155614" xml-lang="en-US" level="2" l10n="U" oldref="170">DVAR</paragraph>
<paragraph role="paragraph" id="par_id3154418" xml-lang="en-US" l10n="U" oldref="171"><ahelp hid="HID_FUNC_DBVARIANZ">DVAR returns the variance of all cells of a database field in all records that match the specified search criteria.</ahelp> The records from the example are treated as a sample of data. A representative result cannot be obtained from a sample population of less than one thousand.</paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3154825" xml-lang="en-US" level="3" l10n="U" oldref="172">Syntax</paragraph>
@@ -672,7 +709,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3153880"><bookmark_value>DVARP function</bookmark_value>
<bookmark_value>variances;based on populations</bookmark_value>
</bookmark><comment>mw added "variances;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBVARIANZEN" id="bm_id3153891" localize="false"/><paragraph role="heading" id="hd_id3153880" xml-lang="en-US" level="2" l10n="U" oldref="178">DVARP</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DBVARIANZEN" id="bm_id3153891" localize="false"/>
+<paragraph role="heading" id="hd_id3153880" xml-lang="en-US" level="2" l10n="U" oldref="178">DVARP</paragraph>
<paragraph role="paragraph" id="par_id3155119" xml-lang="en-US" l10n="U" oldref="179"><ahelp hid="HID_FUNC_DBVARIANZEN">DVARP calculates the variance of all cell values in a database field in all records that match the specified search criteria.</ahelp> The records are from the example are treated as an entire population.</paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3145774" xml-lang="en-US" level="3" l10n="U" oldref="180">Syntax</paragraph>
@@ -685,5 +723,9 @@
</paragraph>
<paragraph role="paragraph" id="par_id3146902" xml-lang="en-US" l10n="U" oldref="185">In row 14, under Age, enter <item type="input">7, 8, 9,</item> and so on, one after the other. The variance of the weight values for all children of this age attending Joe's birthday party appears.</paragraph>
</section>
-</sort></body>
+</sort>
+<section id="relatedtopics">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060102.xhp b/helpcontent2/source/text/scalc/01/04060102.xhp
index d5903009cf..f7f84be54a 100644
--- a/helpcontent2/source/text/scalc/01/04060102.xhp
+++ b/helpcontent2/source/text/scalc/01/04060102.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060102.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060102xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060102xml" indexer="include">
<title id="tit" xml-lang="en-US">Date &amp; Time Functions</title>
<filename>/text/scalc/01/04060102.xhp</filename>
</topic>
@@ -61,45 +59,47 @@
<paragraph role="paragraph" id="par_id9988402" xml-lang="en-US" l10n="NEW">Dates are calculated as offsets from a starting day zero. You can set the day zero to be one of the following:</paragraph>
<table id="tbl_id1661427">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id6401257" xml-lang="en-US" l10n="NEW">Date base</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id5841242" xml-lang="en-US" l10n="NEW">Use</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id6794030" xml-lang="en-US" l10n="CHG">'12/30/1899'</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id7096774" xml-lang="en-US" l10n="NEW">(default)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id5699942" xml-lang="en-US" l10n="CHG">'01/01/1900'</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id6420484" xml-lang="en-US" l10n="NEW">(used in former StarCalc 1.0)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id6986602" xml-lang="en-US" l10n="CHG">'01/01/1904'</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id616779" xml-lang="en-US" l10n="NEW">(used in Apple software)</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id791039" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Options - %PRODUCTNAME Calc - Calculate</emph> to select the date base.</paragraph>
<paragraph role="warning" id="par_id1953489" xml-lang="en-US" l10n="NEW">When you copy and paste cells containing date values between different spreadsheets, both spreadsheet documents must be set to the same date base. If date bases differ, the displayed date values will change!</paragraph>
<paragraph role="heading" id="hd_id757469" xml-lang="en-US" level="2" l10n="NEW">Two digits years</paragraph>
<paragraph role="paragraph" id="par_id3149720" xml-lang="en-US" l10n="U" oldref="183">In <emph>Tools - Options - $[officename] - General</emph> you find the area <emph>Year (two digits)</emph>. This sets the period for which two-digit information applies. Note that changes made here have an effect on some of the following functions.</paragraph>
<paragraph role="note" id="par_id3150654" xml-lang="en-US" l10n="U" oldref="185">When entering dates, slashes or dashes used as date separators may be interpreted as arithmetic operators. Therefore, dates entered in this format are not always recognized as dates and result in erroneous calculations. To keep dates from being interpreted as parts of formulas, place them in quotation marks, for example, "07/20/54".</paragraph>
<paragraph role="heading" id="par_idN1067A" xml-lang="en-US" level="2" l10n="NEW">Functions</paragraph>
-<sort order="asc"><section id="workday">
+<sort order="asc">
+<section id="workday">
<paragraph role="paragraph" id="par_idN10683" xml-lang="en-US" l10n="NEW">
<embedvar href="text/scalc/01/func_workday.xhp#workday"/>
</paragraph>
@@ -214,5 +214,9 @@
<embedvar href="text/scalc/01/func_timevalue.xhp#timevalue"/>
</paragraph>
</section>
-</sort></body>
+</sort>
+<section id="relatedtopics">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060103.xhp b/helpcontent2/source/text/scalc/01/04060103.xhp
index 2db72cc2f6..38180da3e1 100644
--- a/helpcontent2/source/text/scalc/01/04060103.xhp
+++ b/helpcontent2/source/text/scalc/01/04060103.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060103.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060103xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060103xml" indexer="include">
<title id="tit" xml-lang="en-US">Financial Functions Part One</title>
<filename>/text/scalc/01/04060103.xhp</filename>
</topic>
@@ -47,14 +45,17 @@
<bookmark_value>functions; financial functions</bookmark_value>
<bookmark_value>Function Wizard; financial</bookmark_value>
<bookmark_value>amortizations, see also depreciations</bookmark_value>
-</bookmark><comment>mw added one entry</comment><paragraph role="heading" id="hd_id3143284" xml-lang="en-US" level="1" l10n="U" oldref="1">Financial Functions Part One</paragraph>
+</bookmark><comment>mw added one entry</comment>
+<paragraph role="heading" id="hd_id3143284" xml-lang="en-US" level="1" l10n="U" oldref="1">Financial Functions Part One</paragraph>
<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="finanztext">This category contains the mathematical finance functions of <item type="productname">%PRODUCTNAME</item> Calc.
</variable></paragraph>
-<sort order="asc"><section id="amordegrc">
+<sort order="asc">
+<section id="amordegrc">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153366"><bookmark_value>AMORDEGRC function</bookmark_value>
<bookmark_value>depreciations;degressive amortizations</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_AMORDEGRC" id="bm_id3152578" localize="false"/><paragraph role="heading" id="hd_id3153366" xml-lang="en-US" level="2" l10n="U" oldref="359">AMORDEGRC</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_AMORDEGRC" id="bm_id3152578" localize="false"/>
+<paragraph role="heading" id="hd_id3153366" xml-lang="en-US" level="2" l10n="U" oldref="359">AMORDEGRC</paragraph>
<paragraph role="paragraph" id="par_id3147434" xml-lang="en-US" l10n="U" oldref="360"><ahelp hid="HID_AAI_FUNC_AMORDEGRC">Calculates the amount of depreciation for a settlement period as degressive amortization.</ahelp> Unlike AMORLINC, a depreciation coefficient that is independent of the depreciable life is used here.</paragraph>
<paragraph role="heading" id="hd_id3155855" xml-lang="en-US" level="3" l10n="U" oldref="361">Syntax</paragraph>
<paragraph role="code" id="par_id3147427" xml-lang="en-US" l10n="U" oldref="362">AMORDEGRC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate; Basis)</paragraph>
@@ -76,7 +77,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3153765"><bookmark_value>AMORLINC function</bookmark_value>
<bookmark_value>depreciations;linear amortizations</bookmark_value>
</bookmark><comment>mw added "depreciations;..."</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_AMORLINC" id="bm_id3153711" localize="false"/><paragraph role="heading" id="hd_id3153765" xml-lang="en-US" level="2" l10n="U" oldref="369">AMORLINC</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_AMORLINC" id="bm_id3153711" localize="false"/>
+<paragraph role="heading" id="hd_id3153765" xml-lang="en-US" level="2" l10n="U" oldref="369">AMORLINC</paragraph>
<paragraph role="paragraph" id="par_id3159264" xml-lang="en-US" l10n="U" oldref="370"><ahelp hid="HID_AAI_FUNC_AMORLINC">Calculates the amount of depreciation for a settlement period as linear amortization. If the capital asset is purchased during the settlement period, the proportional amount of depreciation is considered.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150044" xml-lang="en-US" level="3" l10n="U" oldref="371">Syntax</paragraph>
<paragraph role="code" id="par_id3147363" xml-lang="en-US" l10n="U" oldref="372">AMORLINC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate; Basis)</paragraph>
@@ -97,9 +99,11 @@
<section id="accrint">
<bookmark xml-lang="en-US" branch="index" id="bm_id3145257"><bookmark_value>ACCRINT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ACCRINT" id="bm_id3149815" localize="false"/><paragraph role="heading" id="hd_id3145257" xml-lang="en-US" level="2" l10n="U" oldref="335">ACCRINT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ACCRINT" id="bm_id3149815" localize="false"/>
+<paragraph role="heading" id="hd_id3145257" xml-lang="en-US" level="2" l10n="U" oldref="335">ACCRINT</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3151276"><bookmark_value>accrued interests;periodic payments</bookmark_value>
-</bookmark><comment>mw changed "accrued interests"</comment><paragraph role="paragraph" id="par_id3151276" xml-lang="en-US" l10n="U" oldref="336"><ahelp hid="HID_AAI_FUNC_ACCRINT">Calculates the accrued interest of a security in the case of periodic payments.</ahelp></paragraph>
+</bookmark><comment>mw changed "accrued interests"</comment>
+<paragraph role="paragraph" id="par_id3151276" xml-lang="en-US" l10n="U" oldref="336"><ahelp hid="HID_AAI_FUNC_ACCRINT">Calculates the accrued interest of a security in the case of periodic payments.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152581" xml-lang="en-US" level="3" l10n="U" oldref="337">Syntax</paragraph>
<paragraph role="code" id="par_id3159092" xml-lang="en-US" l10n="U" oldref="338">ACCRINT(Issue; FirstInterest; Settlement; Rate; Par; Frequency; Basis)</paragraph>
<paragraph role="paragraph" id="par_id3150519" xml-lang="en-US" l10n="U" oldref="339">
@@ -124,7 +128,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3151240"><bookmark_value>ACCRINTM function</bookmark_value>
<bookmark_value>accrued interests;one-off payments</bookmark_value>
</bookmark><comment>mw added one index entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ACCRINTM" id="bm_id3148866" localize="false"/><paragraph role="heading" id="hd_id3151240" xml-lang="en-US" level="2" l10n="U" oldref="348">ACCRINTM</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ACCRINTM" id="bm_id3148866" localize="false"/>
+<paragraph role="heading" id="hd_id3151240" xml-lang="en-US" level="2" l10n="U" oldref="348">ACCRINTM</paragraph>
<paragraph role="paragraph" id="par_id3157981" xml-lang="en-US" l10n="U" oldref="349"><ahelp hid="HID_AAI_FUNC_ACCRINTM">Calculates the accrued interest of a security in the case of one-off payment at the settlement date.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3159097" xml-lang="en-US" level="3" l10n="U" oldref="350">Syntax</paragraph>
<paragraph role="code" id="par_id3147074" xml-lang="en-US" l10n="U" oldref="351">ACCRINTM(Issue; Settlement; Rate; Par; Basis)</paragraph>
@@ -146,7 +151,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3145753"><bookmark_value>RECEIVED function</bookmark_value>
<bookmark_value>amount received for fixed-interest securities</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_RECEIVED" id="bm_id3143218" localize="false"/><paragraph role="heading" id="hd_id3145753" xml-lang="en-US" level="2" l10n="U" oldref="390">RECEIVED</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_RECEIVED" id="bm_id3143218" localize="false"/>
+<paragraph role="heading" id="hd_id3145753" xml-lang="en-US" level="2" l10n="U" oldref="390">RECEIVED</paragraph>
<paragraph role="paragraph" id="par_id3150051" xml-lang="en-US" l10n="U" oldref="391"><ahelp hid="HID_AAI_FUNC_RECEIVED">Calculates the amount received that is paid for a fixed-interest security at a given point in time.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149385" xml-lang="en-US" level="3" l10n="U" oldref="392">Syntax</paragraph>
<paragraph role="code" id="par_id3145362" xml-lang="en-US" l10n="U" oldref="393">RECEIVED("Settlement"; "Maturity"; Investment; Discount; Basis)</paragraph>
@@ -170,7 +176,8 @@
<bookmark_value>present values</bookmark_value>
<bookmark_value>calculating; present values</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BW" id="bm_id3153072" localize="false"/><paragraph role="heading" id="hd_id3147556" xml-lang="en-US" level="2" l10n="U" oldref="3">PV</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BW" id="bm_id3153072" localize="false"/>
+<paragraph role="heading" id="hd_id3147556" xml-lang="en-US" level="2" l10n="U" oldref="3">PV</paragraph>
<paragraph role="paragraph" id="par_id3153301" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_FUNC_BW">Returns the present value of an investment resulting from a series of regular payments.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3146099" xml-lang="en-US" l10n="U" oldref="5">Use this function to calculate the amount of money needed to be invested at a fixed rate today, to receive a specific amount, an annuity, over a specified number of periods. You can also determine how much money is to remain after the elapse of the period. Specify as well if the amount is to be paid out at the beginning or at the end of each period.</paragraph>
<paragraph role="paragraph" id="par_id3153334" xml-lang="en-US" l10n="U" oldref="6">Enter these values either as numbers, expressions or references. If, for example, interest is paid annually at 8%, but you want to use month as your period, enter 8%/12 under <emph>Rate</emph> and <item type="productname">%PRODUCTNAME</item> Calc with automatically calculate the correct factor.</paragraph>
@@ -201,7 +208,8 @@
<bookmark_value>depreciations; arithmetic declining</bookmark_value>
<bookmark_value>arithmetic declining depreciations</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DIA" id="bm_id3157905" localize="false"/><paragraph role="heading" id="hd_id3152978" xml-lang="en-US" level="2" l10n="U" oldref="19">SYD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DIA" id="bm_id3157905" localize="false"/>
+<paragraph role="heading" id="hd_id3152978" xml-lang="en-US" level="2" l10n="U" oldref="19">SYD</paragraph>
<paragraph role="paragraph" id="par_id3148732" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_FUNC_DIA">Returns the arithmetic-declining depreciation rate.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3149886" xml-lang="en-US" l10n="U" oldref="21">Use this function to calculate the depreciation amount for one period of the total depreciation span of an object. Arithmetic declining depreciation reduces the depreciation amount from period to period by a fixed sum.</paragraph>
<paragraph role="heading" id="hd_id3149431" xml-lang="en-US" level="3" l10n="U" oldref="22">Syntax</paragraph>
@@ -221,272 +229,313 @@
<paragraph role="paragraph" id="par_id3146142" xml-lang="en-US" l10n="U" oldref="31">To have an overview of depreciation rates per period, it is best to define a depreciation table. By entering the different depreciation formulas available in <item type="productname">%PRODUCTNAME</item> Calc next to each other, you can see which depreciation form is the most appropriate. Enter the table as follows:</paragraph>
<table id="tbl_id3149189">
<tablerow>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="tablehead" id="par_id3155258" xml-lang="en-US" l10n="U" oldref="32">
<emph>A</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154558" xml-lang="en-US" l10n="U" oldref="33">
<emph>B</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="34">
<emph>C</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149949" xml-lang="en-US" l10n="U" oldref="35">
<emph>D</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3145123" xml-lang="en-US" l10n="U" oldref="36">
<emph>E</emph>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149504" xml-lang="en-US" l10n="U" oldref="37">1</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153778" xml-lang="en-US" l10n="U" oldref="38">
<item type="input">Initial Cost</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159083" xml-lang="en-US" l10n="U" oldref="39">
<item type="input">Salvage Value</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150002" xml-lang="en-US" l10n="U" oldref="40">
<item type="input">Useful Life</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153006" xml-lang="en-US" l10n="U" oldref="41">
<item type="input">Time Period</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154505" xml-lang="en-US" l10n="U" oldref="42">
<item type="input">Deprec. SYD</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150336" xml-lang="en-US" l10n="U" oldref="43">2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155926" xml-lang="en-US" l10n="U" oldref="44">
<item type="input">50,000 currency units</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153736" xml-lang="en-US" l10n="U" oldref="45">
<item type="input">10,000 currency units</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150131" xml-lang="en-US" l10n="U" oldref="46">
<item type="input">5</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148766" xml-lang="en-US" l10n="U" oldref="47">
<item type="input">1</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159136" xml-lang="en-US" l10n="U" oldref="48">
<item type="input">13,333.33 currency units</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151018" xml-lang="en-US" l10n="U" oldref="49">3</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="tablecontent" id="par_id3148397" xml-lang="en-US" l10n="U" oldref="50">
<item type="input">2</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146907" xml-lang="en-US" l10n="U" oldref="51">
-<item type="input">10,666.67 currency units</item>
+<item type="input">10,666.67 </item>
+<item type="input">currency units</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147356" xml-lang="en-US" l10n="U" oldref="52">4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="tablecontent" id="par_id3150267" xml-lang="en-US" l10n="U" oldref="53">
<item type="input">3</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145628" xml-lang="en-US" l10n="U" oldref="54">
<item type="input">8,000.00 currency units</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149004" xml-lang="en-US" l10n="U" oldref="55">5</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="tablecontent" id="par_id3153545" xml-lang="en-US" l10n="U" oldref="56">
<item type="input">4</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154634" xml-lang="en-US" l10n="U" oldref="57">
<item type="input">5,333.33 currency units</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147537" xml-lang="en-US" l10n="U" oldref="58">6</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="tablecontent" id="par_id3155085" xml-lang="en-US" l10n="U" oldref="59">
<item type="input">5</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3158413" xml-lang="en-US" l10n="U" oldref="60">
<item type="input">2,666.67 currency units</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154866" xml-lang="en-US" l10n="U" oldref="61">7</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="tablecontent" id="par_id3155404" xml-lang="en-US" l10n="U" oldref="62">
<item type="input">6</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148431" xml-lang="en-US" l10n="U" oldref="63">
<item type="input">0.00 currency units</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156261" xml-lang="en-US" l10n="U" oldref="64">8</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="tablecontent" id="par_id3083286" xml-lang="en-US" l10n="U" oldref="65">
<item type="input">7</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
+<tablecell>
+</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="67">9</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="tablecontent" id="par_id3154815" xml-lang="en-US" l10n="U" oldref="68">
<item type="input">8</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
+<tablecell>
+</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145082" xml-lang="en-US" l10n="U" oldref="70">10</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="tablecontent" id="par_id3156307" xml-lang="en-US" l10n="U" oldref="71">
<item type="input">9</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
+<tablecell>
+</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147564" xml-lang="en-US" l10n="U" oldref="73">11</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="tablecontent" id="par_id3146856" xml-lang="en-US" l10n="U" oldref="74">
<item type="input">10</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
+<tablecell>
+</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150880" xml-lang="en-US" l10n="U" oldref="76">12</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145208" xml-lang="en-US" l10n="U" oldref="77">13</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="78">
<item type="input">&gt;0</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="tablecontent" id="par_id3153625" xml-lang="en-US" l10n="U" oldref="79">
<item type="input">Total</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151297" xml-lang="en-US" l10n="U" oldref="80">
<item type="input">40,000.00 currency units</item>
</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3149979" xml-lang="en-US" l10n="U" oldref="81">The formula in E2 is as follows:</paragraph>
<paragraph role="paragraph" id="par_id3155849" xml-lang="en-US" l10n="U" oldref="82">
<item type="input">=SYD($A$2;$B$2;$C$2;D2)</item>
@@ -503,7 +552,8 @@
<bookmark_value>allowances</bookmark_value>
<bookmark_value>discounts</bookmark_value>
</bookmark><comment>mw added "discounts" and "allowances"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DISC" id="bm_id3149290" localize="false"/><paragraph role="heading" id="hd_id3155104" xml-lang="en-US" level="2" l10n="U" oldref="379">DISC</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DISC" id="bm_id3149290" localize="false"/>
+<paragraph role="heading" id="hd_id3155104" xml-lang="en-US" level="2" l10n="U" oldref="379">DISC</paragraph>
<paragraph role="paragraph" id="par_id3153891" xml-lang="en-US" l10n="U" oldref="380"><ahelp hid="HID_AAI_FUNC_DISC">Calculates the allowance (discount) of a security as a percentage.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153982" xml-lang="en-US" level="3" l10n="U" oldref="381">Syntax</paragraph>
<paragraph role="code" id="par_id3149756" xml-lang="en-US" l10n="U" oldref="382">DISC("Settlement"; "Maturity"; Price; Redemption; Basis)</paragraph>
@@ -526,7 +576,8 @@
<bookmark_value>Microsoft Excel functions</bookmark_value>
<bookmark_value>durations;fixed interest securities</bookmark_value>
</bookmark><comment>mw added two entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DURATION" id="bm_id3159344" localize="false"/><paragraph role="heading" id="hd_id3154695" xml-lang="en-US" level="2" l10n="U" oldref="402">DURATION_ADD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DURATION" id="bm_id3159344" localize="false"/>
+<paragraph role="heading" id="hd_id3154695" xml-lang="en-US" level="2" l10n="U" oldref="402">DURATION_ADD</paragraph>
<paragraph role="paragraph" id="par_id3145768" xml-lang="en-US" l10n="U" oldref="403"><ahelp hid="HID_AAI_FUNC_DURATION">Calculates the duration of a fixed interest security in years.</ahelp></paragraph>
<embed href="text/scalc/01/04060102.xhp#ADD_note"/>
<paragraph role="heading" id="hd_id3153904" xml-lang="en-US" level="3" l10n="U" oldref="404">Syntax</paragraph>
@@ -554,7 +605,8 @@
<bookmark_value>net annual interest rates</bookmark_value>
<bookmark_value>EFFECTIVE function</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_EFFEKTIV" id="bm_id3154290" localize="false"/><paragraph role="heading" id="hd_id3159147" xml-lang="en-US" level="2" l10n="U" oldref="88">EFFECTIVE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_EFFEKTIV" id="bm_id3154290" localize="false"/>
+<paragraph role="heading" id="hd_id3159147" xml-lang="en-US" level="2" l10n="U" oldref="88">EFFECTIVE</paragraph>
<paragraph role="paragraph" id="par_id3154204" xml-lang="en-US" l10n="U" oldref="89"><ahelp hid="HID_FUNC_EFFEKTIV">Returns the net annual interest rate for a nominal interest rate.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3145417" xml-lang="en-US" l10n="U" oldref="90">Nominal interest refers to the amount of interest due at the end of a calculation period. Effective interest increases with the number of payments made. In other words, interest is often paid in installments (for example, monthly or quarterly) before the end of the calculation period.</paragraph>
<paragraph role="heading" id="hd_id3150510" xml-lang="en-US" level="3" l10n="U" oldref="91">Syntax</paragraph>
@@ -572,7 +624,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3147241"><bookmark_value>effective interest rates</bookmark_value>
<bookmark_value>EFFECT_ADD function</bookmark_value>
</bookmark><comment>mw changed "effective rates"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_EFFECT" id="bm_id3147515" localize="false"/><paragraph role="heading" id="hd_id3147241" xml-lang="en-US" level="2" l10n="U" oldref="414">EFFECT_ADD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_EFFECT" id="bm_id3147515" localize="false"/>
+<paragraph role="heading" id="hd_id3147241" xml-lang="en-US" level="2" l10n="U" oldref="414">EFFECT_ADD</paragraph>
<paragraph role="paragraph" id="par_id3147524" xml-lang="en-US" l10n="U" oldref="415"><ahelp hid="HID_AAI_FUNC_EFFECT">Calculates the effective annual rate of interest on the basis of the nominal interest rate and the number of interest payments per annum.</ahelp></paragraph>
<embed href="text/scalc/01/04060102.xhp#ADD_note"/>
<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="3" l10n="U" oldref="416">Syntax</paragraph>
@@ -592,7 +645,8 @@
<bookmark_value>depreciations;arithmetic-degressive</bookmark_value>
<bookmark_value>DDB function</bookmark_value>
</bookmark><comment>mw corrected two typos and added "depreciations;..."</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GDA" id="bm_id3149176" localize="false"/><paragraph role="heading" id="hd_id3149998" xml-lang="en-US" level="2" l10n="U" oldref="99">DDB</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GDA" id="bm_id3149176" localize="false"/>
+<paragraph role="heading" id="hd_id3149998" xml-lang="en-US" level="2" l10n="U" oldref="99">DDB</paragraph>
<paragraph role="paragraph" id="par_id3159190" xml-lang="en-US" l10n="U" oldref="100"><ahelp hid="HID_FUNC_GDA">Returns the depreciation of an asset for a specified period using the arithmetic-declining method.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="101">Use this form of depreciation if you require a higher initial depreciation value as opposed to linear depreciation. The depreciation value gets less with each period and is usually used for assets whose value loss is higher shortly after purchase (for example, vehicles, computers). Please note that the book value will never reach zero under this calculation type.</paragraph>
<paragraph role="heading" id="hd_id3156038" xml-lang="en-US" level="3" l10n="U" oldref="102">Syntax</paragraph>
@@ -618,7 +672,8 @@
<bookmark_value>depreciations;geometric-degressive</bookmark_value>
<bookmark_value>DB function</bookmark_value>
</bookmark><comment>mw added "depreciations;.."</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GDA2" id="bm_id3149973" localize="false"/><paragraph role="heading" id="hd_id3149962" xml-lang="en-US" level="2" l10n="U" oldref="113">DB</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GDA2" id="bm_id3149973" localize="false"/>
+<paragraph role="heading" id="hd_id3149962" xml-lang="en-US" level="2" l10n="U" oldref="113">DB</paragraph>
<paragraph role="paragraph" id="par_id3148989" xml-lang="en-US" l10n="U" oldref="114"><ahelp hid="HID_FUNC_GDA2">Returns the depreciation of an asset for a specified period using the double-declining balance method.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3156213" xml-lang="en-US" l10n="U" oldref="115">This form of depreciation is used if you want to get a higher depreciation value at the beginning of the depreciation (as opposed to linear depreciation). The depreciation value is reduced with every depreciation period by the depreciation already deducted from the initial cost.</paragraph>
<paragraph role="heading" id="hd_id3149807" xml-lang="en-US" level="3" l10n="U" oldref="116">Syntax</paragraph>
@@ -644,7 +699,8 @@
<bookmark_value>calculating;internal rates of return, regular payments</bookmark_value>
<bookmark_value>internal rates of return;regular payments</bookmark_value>
</bookmark><comment>mw changed "calculating;..." and "internal rates"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_IKV" id="bm_id3148419" localize="false"/><paragraph role="heading" id="hd_id3153948" xml-lang="en-US" level="2" l10n="U" oldref="128">IRR</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_IKV" id="bm_id3148419" localize="false"/>
+<paragraph role="heading" id="hd_id3153948" xml-lang="en-US" level="2" l10n="U" oldref="128">IRR</paragraph>
<paragraph role="paragraph" id="par_id3143282" xml-lang="en-US" l10n="U" oldref="129"><ahelp hid="HID_FUNC_IKV">Calculates the internal rate of return for an investment.</ahelp> The values represent cash flow values at regular intervals, at least one value must be negative (payments), and at least one value must be positive (income).</paragraph>
<paragraph role="heading" id="hd_id3150599" xml-lang="en-US" level="3" l10n="U" oldref="130">Syntax</paragraph>
<paragraph role="code" id="par_id3155427" xml-lang="en-US" l10n="U" oldref="131">IRR(Values; Guess)</paragraph>
@@ -660,7 +716,8 @@
<bookmark_value>interests for unchanged amortization installments</bookmark_value>
<bookmark_value>ISPMT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISPMT" id="bm_id3149491" localize="false"/><paragraph role="heading" id="hd_id3151012" xml-lang="en-US" level="2" l10n="U" oldref="314">ISPMT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISPMT" id="bm_id3149491" localize="false"/>
+<paragraph role="heading" id="hd_id3151012" xml-lang="en-US" level="2" l10n="U" oldref="314">ISPMT</paragraph>
<paragraph role="paragraph" id="par_id3148693" xml-lang="en-US" l10n="U" oldref="315"><ahelp hid="HID_FUNC_ISPMT">Calculates the level of interest for unchanged amortization installments.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154661" xml-lang="en-US" level="3" l10n="U" oldref="316">Syntax</paragraph>
<paragraph role="code" id="par_id3146070" xml-lang="en-US" l10n="U" oldref="317">ISPMT(Rate; Period; TotalPeriods; Invest)</paragraph>
@@ -680,5 +737,6 @@
</sort>
<paragraph role="paragraph" id="par_id3146812" xml-lang="en-US" l10n="U" oldref="426"><link href="text/scalc/01/04060119.xhp" name="Forward to Financial Functions Part Two">Financial Functions Part Two</link></paragraph>
<paragraph role="paragraph" id="par_id3154411" xml-lang="en-US" l10n="U" oldref="427"><link href="text/scalc/01/04060118.xhp" name="Forward to Financial Functions Part Three">Financial Functions Part Three</link></paragraph>
+<embed href="text/scalc/01/04060100.xhp#drking"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060104.xhp b/helpcontent2/source/text/scalc/01/04060104.xhp
index bbdcd65ff9..3905697600 100755
--- a/helpcontent2/source/text/scalc/01/04060104.xhp
+++ b/helpcontent2/source/text/scalc/01/04060104.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060104.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060104xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060104xml" indexer="include">
<title id="tit" xml-lang="en-US">Information Functions</title>
<filename>/text/scalc/01/04060104.xhp</filename>
</topic>
@@ -51,158 +49,229 @@
<paragraph role="paragraph" id="par_id3147499" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="informationtext">This category contains the <emph>Information</emph> functions.
</variable></paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000404.xhp#eikain"/>
+<embed href="text/scalc/00/00000404.xhp#eikain"/>
</section>
<paragraph role="paragraph" id="par_id3159128" xml-lang="en-US" l10n="U" oldref="3">The data in the following table serves as the basis for some of the examples in the function descriptions:</paragraph>
<table id="tbl_id3157876">
<tablerow>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="tablehead" id="par_id3146885" xml-lang="en-US" l10n="U" oldref="4">C</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149944" xml-lang="en-US" l10n="U" oldref="5">D</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150457" xml-lang="en-US" l10n="U" oldref="6">
<emph>2</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150024" xml-lang="en-US" l10n="U" oldref="7">x <item type="input">value</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148725" xml-lang="en-US" l10n="U" oldref="8">y <item type="input">value</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150480" xml-lang="en-US" l10n="U" oldref="9">
<emph>3</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148440" xml-lang="en-US" l10n="U" oldref="10">
<item type="input">-5</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148888" xml-lang="en-US" l10n="U" oldref="11">
<item type="input">-3</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153034" xml-lang="en-US" l10n="U" oldref="12">
<emph>4</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150139" xml-lang="en-US" l10n="U" oldref="13">
<item type="input">-2</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149542" xml-lang="en-US" l10n="U" oldref="14">
<item type="input">0</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149188" xml-lang="en-US" l10n="U" oldref="15">
<emph>5</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153329" xml-lang="en-US" l10n="U" oldref="16">
<item type="input">-1</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155257" xml-lang="en-US" l10n="U" oldref="17">
<item type="input">1</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145142" xml-lang="en-US" l10n="U" oldref="18">
<emph>6</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149956" xml-lang="en-US" l10n="U" oldref="19">
<item type="input">0</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145594" xml-lang="en-US" l10n="U" oldref="20">
<item type="input">3</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153113" xml-lang="en-US" l10n="U" oldref="21">
<emph>7</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148573" xml-lang="en-US" l10n="U" oldref="22">
<item type="input">2</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145166" xml-lang="en-US" l10n="U" oldref="23">
<item type="input">4</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3157998" xml-lang="en-US" l10n="U" oldref="24">
<emph>8</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150018" xml-lang="en-US" l10n="U" oldref="25">
<item type="input">4</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150129" xml-lang="en-US" l10n="U" oldref="26">
<item type="input">6</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145245" xml-lang="en-US" l10n="U" oldref="27">
<emph>9</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148389" xml-lang="en-US" l10n="U" oldref="28">
<item type="input">6</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156068" xml-lang="en-US" l10n="U" oldref="29">
<item type="input">8</item>
</paragraph>
</tablecell>
</tablerow>
</table>
-<sort order="asc"><section id="current">
+
+<sort order="asc">
+<section id="info">
+<bookmark xml-lang="en-US" branch="index" id="bm_id3691824"><bookmark_value>INFO function</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_INFO" id="bm_id5369426" localize="false"/>
+<paragraph role="heading" id="hd_id5787224" xml-lang="en-US" level="2" l10n="NEW">INFO</paragraph>
+<paragraph role="paragraph" id="par_id1507309" xml-lang="en-US" l10n="NEW">Returns specific information about the current working environment. The function receives a single text argument and returns data depending on that parameter.</paragraph>
+<paragraph role="heading" id="hd_id7693411" xml-lang="en-US" level="3" l10n="NEW">Syntax</paragraph>
+<paragraph role="code" id="par_id3928952" xml-lang="en-US" l10n="NEW">INFO("Type")</paragraph>
+<paragraph role="paragraph" id="par_id5206762" xml-lang="en-US" l10n="NEW">The following table lists the values for the text parameter <item type="literal">Type</item> and the return values of the INFO function.</paragraph>
+<table id="tbl_id1342204">
+<tablerow>
+<tablecell>
+<paragraph role="tablehead" id="par_id5735953" xml-lang="en-US" l10n="NEW">Value for "Type"<comment>Do not translate the text values in this column below</comment></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id8360850" xml-lang="en-US" l10n="NEW">Return value</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id9648731" xml-lang="en-US" l10n="NEW">"osversion"</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id908841" xml-lang="en-US" l10n="NEW">Always "Windows (32-bit) NT 5.01", for compatibility reasons</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id8193914" xml-lang="en-US" l10n="NEW">"system"</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id9841608" xml-lang="en-US" l10n="NEW">The type of the operating system. <br/>"WNT" for Microsoft Windows <br/>"LINUX" for Linux <br/>"SOLARIS" for Solaris</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id2701803" xml-lang="en-US" l10n="NEW">"release"</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id2136295" xml-lang="en-US" l10n="NEW">The product release identifier, for example "300m25(Build:9876)"</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id9200109" xml-lang="en-US" l10n="NEW">"numfile"</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id4186223" xml-lang="en-US" l10n="NEW">Always 1, for compatibility reasons</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id5766472" xml-lang="en-US" l10n="NEW">"recalc"</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1491134" xml-lang="en-US" l10n="NEW">Current formula recalculation mode, either "Automatic" or "Manual" (localized into %PRODUCTNAME language)</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+<paragraph role="note" id="par_id1161534" xml-lang="en-US" l10n="NEW">Other spreadsheet applications may accept localized values for the <item type="literal">Type</item> parameter, but %PRODUCTNAME Calc will only accept the English values.</paragraph>
+<paragraph role="heading" id="hd_id5459456" xml-lang="en-US" level="3" l10n="NEW">Example</paragraph>
+<paragraph role="paragraph" id="par_id3994567" xml-lang="en-US" l10n="NEW">
+<item type="input">=INFO("release")</item> returns the product release number of the %PRODUCTNAME in use.<comment>Do not translate "release"</comment></paragraph>
+<paragraph role="paragraph" id="par_id2873622" xml-lang="en-US" l10n="NEW">
+<item type="input">=INFO(D5)</item> with cell <item type="literal">D5</item> containing a text string <item type="literal">system</item> returns the operation system type.<comment>Do not translate the hlp_literal system</comment></paragraph>
+</section>
+<section id="current">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155625"><bookmark_value>CURRENT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_AKTUELL" id="bm_id3145295" localize="false"/><paragraph role="heading" id="hd_id3155625" xml-lang="en-US" level="2" l10n="U" oldref="30">CURRENT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_AKTUELL" id="bm_id3145295" localize="false"/>
+<paragraph role="heading" id="hd_id3155625" xml-lang="en-US" level="2" l10n="U" oldref="30">CURRENT</paragraph>
<paragraph role="paragraph" id="par_id3157975" xml-lang="en-US" l10n="CHG" oldref="31"><ahelp hid="HID_FUNC_AKTUELL">This function returns the result to date of evaluating the formula of which it is a part (in other words the result as far as that evaluation has got). Its main use is together with the STYLE() function to apply selected styles to a cell depending on the cell contents.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148880" xml-lang="en-US" level="3" l10n="U" oldref="32">Syntax</paragraph>
<paragraph role="code" id="par_id3150930" xml-lang="en-US" l10n="U" oldref="33">CURRENT()</paragraph>
@@ -225,7 +294,8 @@
<bookmark_value>formula cells;displaying formulas in other cells</bookmark_value>
<bookmark_value>displaying;formulas at any position</bookmark_value>
</bookmark><comment>mw added "formula cells;" and "displaying;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FORMEL" id="bm_id3155373" localize="false"/><paragraph role="heading" id="hd_id3150688" xml-lang="en-US" level="2" l10n="U" oldref="147">FORMULA</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FORMEL" id="bm_id3155373" localize="false"/>
+<paragraph role="heading" id="hd_id3150688" xml-lang="en-US" level="2" l10n="U" oldref="147">FORMULA</paragraph>
<paragraph role="paragraph" id="par_id3158417" xml-lang="en-US" l10n="CHG" oldref="148"><ahelp hid="HID_FUNC_FORMEL">Displays the formula of a formula cell as a text string.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154954" xml-lang="en-US" level="3" l10n="U" oldref="149">Syntax</paragraph>
<paragraph role="code" id="par_id3147535" xml-lang="en-US" l10n="CHG" oldref="150">FORMULA(Reference)</paragraph>
@@ -242,7 +312,8 @@
<bookmark_value>references;testing cell contents</bookmark_value>
<bookmark_value>cell contents;testing for references</bookmark_value>
</bookmark><comment>mw added "references;" and "cell contents;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTBEZUG" id="bm_id3149774" localize="false"/><paragraph role="heading" id="hd_id3155409" xml-lang="en-US" level="2" l10n="U" oldref="37">ISREF</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTBEZUG" id="bm_id3149774" localize="false"/>
+<paragraph role="heading" id="hd_id3155409" xml-lang="en-US" level="2" l10n="U" oldref="37">ISREF</paragraph>
<paragraph role="paragraph" id="par_id3153723" xml-lang="en-US" l10n="CHG" oldref="38"><ahelp hid="HID_FUNC_ISTBEZUG">Tests if the argument is a reference.</ahelp> Returns TRUE if the argument is a reference, returns FALSE otherwise. When given a reference this function does not examine the value being referenced.<comment>i82565</comment></paragraph>
<embed href="text/shared/00/00000001.xhp#wahr"/>
<paragraph role="heading" id="hd_id3147175" xml-lang="en-US" level="3" l10n="U" oldref="39">Syntax</paragraph>
@@ -265,7 +336,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3154812"><bookmark_value>ISERR function</bookmark_value>
<bookmark_value>error codes;controlling</bookmark_value>
</bookmark><comment>mw added "error codes,"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTFEHL" id="bm_id3145081" localize="false"/><paragraph role="heading" id="hd_id3154812" xml-lang="en-US" level="2" l10n="U" oldref="45">ISERR</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTFEHL" id="bm_id3145081" localize="false"/>
+<paragraph role="heading" id="hd_id3154812" xml-lang="en-US" level="2" l10n="U" oldref="45">ISERR</paragraph>
<paragraph role="paragraph" id="par_id3149282" xml-lang="en-US" l10n="CHG" oldref="46"><ahelp hid="HID_FUNC_ISTFEHL">Tests for error conditions, except the #N/A error value, and returns TRUE or FALSE.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#wahr"/>
<paragraph role="heading" id="hd_id3149450" xml-lang="en-US" level="3" l10n="U" oldref="47">Syntax</paragraph>
@@ -282,7 +354,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3147081"><bookmark_value>ISERROR function</bookmark_value>
<bookmark_value>recognizing;general errors</bookmark_value>
</bookmark><comment>mw added "recognizing;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTFEHLER" id="bm_id3145206" localize="false"/><paragraph role="heading" id="hd_id3147081" xml-lang="en-US" level="2" l10n="U" oldref="53">ISERROR</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTFEHLER" id="bm_id3145206" localize="false"/>
+<paragraph role="heading" id="hd_id3147081" xml-lang="en-US" level="2" l10n="U" oldref="53">ISERROR</paragraph>
<paragraph role="paragraph" id="par_id3156316" xml-lang="en-US" l10n="CHG" oldref="54"><ahelp hid="HID_FUNC_ISTFEHLER">Tests for error conditions, including the #N/A error value, and returns TRUE or FALSE.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#wahr"/>
<paragraph role="heading" id="hd_id3147569" xml-lang="en-US" level="3" l10n="U" oldref="55">Syntax</paragraph>
@@ -300,7 +373,8 @@
<bookmark_value>recognizing formula cells</bookmark_value>
<bookmark_value>formula cells;recognizing</bookmark_value>
</bookmark><comment>mw inserted "recognizing..." and "formula cells;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTFORMEL" id="bm_id3154740" localize="false"/><paragraph role="heading" id="hd_id3153618" xml-lang="en-US" level="2" l10n="U" oldref="61">ISFORMULA</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTFORMEL" id="bm_id3154740" localize="false"/>
+<paragraph role="heading" id="hd_id3153618" xml-lang="en-US" level="2" l10n="U" oldref="61">ISFORMULA</paragraph>
<paragraph role="paragraph" id="par_id3149138" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="HID_FUNC_ISTFORMEL">Returns TRUE if a cell is a formula cell.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#wahr"/>
<paragraph role="heading" id="hd_id3155100" xml-lang="en-US" level="3" l10n="U" oldref="63">Syntax</paragraph>
@@ -314,7 +388,8 @@
<section id="iseven_add">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149760"><bookmark_value>ISEVEN_ADD function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ISEVEN" id="bm_id3146094" localize="false"/><paragraph role="heading" id="hd_id3149760" xml-lang="en-US" level="2" oldref="229">ISEVEN_ADD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ISEVEN" id="bm_id3146094" localize="false"/>
+<paragraph role="heading" id="hd_id3149760" xml-lang="en-US" level="2" oldref="229">ISEVEN_ADD</paragraph>
<paragraph role="paragraph" id="par_id3147253" xml-lang="en-US" l10n="CHG" oldref="230"><ahelp hid="HID_AAI_FUNC_ISEVEN">Tests for even numbers. Returns 1 if the number divided by 2 returns a whole number.</ahelp></paragraph>
<embed href="text/scalc/01/04060102.xhp#ADD_note"/>
<paragraph role="heading" id="hd_id3152799" xml-lang="en-US" level="3" l10n="U" oldref="231">Syntax</paragraph>
@@ -331,7 +406,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3154692"><bookmark_value>ISNONTEXT function</bookmark_value>
<bookmark_value>cell contents;no text</bookmark_value>
</bookmark><comment>mw added "cell contents;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTKTEXT" id="bm_id3159342" localize="false"/><paragraph role="heading" id="hd_id3154692" xml-lang="en-US" level="2" l10n="U" oldref="68">ISNONTEXT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTKTEXT" id="bm_id3159342" localize="false"/>
+<paragraph role="heading" id="hd_id3154692" xml-lang="en-US" level="2" l10n="U" oldref="68">ISNONTEXT</paragraph>
<paragraph role="paragraph" id="par_id3155330" xml-lang="en-US" l10n="U" oldref="69"><ahelp hid="HID_FUNC_ISTKTEXT">Tests if the cell contents are text or numbers, and returns FALSE if the contents are text.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id5719779" xml-lang="en-US" l10n="NEW">If an error occurs, the function returns TRUE.</paragraph>
<paragraph role="heading" id="hd_id3154931" xml-lang="en-US" level="3" l10n="U" oldref="70">Syntax</paragraph>
@@ -349,7 +425,8 @@
<bookmark_value>blank cell contents</bookmark_value>
<bookmark_value>empty cells; recognizing</bookmark_value>
</bookmark><comment>mw added "blank..." and "empty cells;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTLEER" id="bm_id3148940" localize="false"/><paragraph role="heading" id="hd_id3159148" xml-lang="en-US" level="2" l10n="U" oldref="77">ISBLANK</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTLEER" id="bm_id3148940" localize="false"/>
+<paragraph role="heading" id="hd_id3159148" xml-lang="en-US" level="2" l10n="U" oldref="77">ISBLANK</paragraph>
<paragraph role="paragraph" id="par_id3148800" xml-lang="en-US" l10n="U" oldref="78"><ahelp hid="HID_FUNC_ISTLEER">Returns TRUE if the reference to a cell is blank.</ahelp> This function is used to determine if the content of a cell is empty. A cell with a formula inside is not empty. </paragraph>
<embed href="text/shared/00/00000001.xhp#wahr"/>
<paragraph role="heading" id="hd_id3159162" xml-lang="en-US" level="3" l10n="U" oldref="79">Syntax</paragraph>
@@ -365,7 +442,8 @@
<bookmark_value>number formats;logical</bookmark_value>
<bookmark_value>logical number formats</bookmark_value>
</bookmark><comment>mw added "number formats;" and "logical..."</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTLOG" id="bm_id3158424" localize="false"/><paragraph role="heading" id="hd_id3155356" xml-lang="en-US" level="2" l10n="U" oldref="85">ISLOGICAL</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTLOG" id="bm_id3158424" localize="false"/>
+<paragraph role="heading" id="hd_id3155356" xml-lang="en-US" level="2" l10n="U" oldref="85">ISLOGICAL</paragraph>
<paragraph role="paragraph" id="par_id3148926" xml-lang="en-US" l10n="CHG" oldref="86"><ahelp hid="HID_FUNC_ISTLOG">Tests for a logical value (TRUE or FALSE).</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3541062" xml-lang="en-US" l10n="NEW">If an error occurs, the function returns FALSE.</paragraph>
<paragraph role="heading" id="hd_id3149162" xml-lang="en-US" level="3" l10n="U" oldref="87">Syntax</paragraph>
@@ -381,7 +459,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3153685"><bookmark_value>ISNA function</bookmark_value>
<bookmark_value>#N/A error;recognizing</bookmark_value>
</bookmark><comment>mw added "#N/A ..."</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTNV" id="bm_id3159273" localize="false"/><paragraph role="heading" id="hd_id3153685" xml-lang="en-US" level="2" l10n="U" oldref="93">ISNA</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTNV" id="bm_id3159273" localize="false"/>
+<paragraph role="heading" id="hd_id3153685" xml-lang="en-US" level="2" l10n="U" oldref="93">ISNA</paragraph>
<paragraph role="paragraph" id="par_id3149105" xml-lang="en-US" l10n="U" oldref="94"><ahelp hid="HID_FUNC_ISTNV">Returns TRUE if a cell contains the #N/A (value not available) error value.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id6018860" xml-lang="en-US" l10n="NEW">If an error occurs, the function returns FALSE.</paragraph>
<paragraph role="heading" id="hd_id3152947" xml-lang="en-US" level="3" l10n="U" oldref="95">Syntax</paragraph>
@@ -396,7 +475,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3149426"><bookmark_value>ISTEXT function</bookmark_value>
<bookmark_value>cell contents;text</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTTEXT" id="bm_id3148468" localize="false"/><paragraph role="heading" id="hd_id3149426" xml-lang="en-US" level="2" l10n="U" oldref="101">ISTEXT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTTEXT" id="bm_id3148468" localize="false"/>
+<paragraph role="heading" id="hd_id3149426" xml-lang="en-US" level="2" l10n="U" oldref="101">ISTEXT</paragraph>
<paragraph role="paragraph" id="par_id3145368" xml-lang="en-US" l10n="U" oldref="102"><ahelp hid="HID_FUNC_ISTTEXT">Returns TRUE if the cell contents refer to text.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id6779686" xml-lang="en-US" l10n="NEW">If an error occurs, the function returns FALSE.</paragraph>
<paragraph role="heading" id="hd_id3154332" xml-lang="en-US" level="3" l10n="U" oldref="103">Syntax</paragraph>
@@ -412,7 +492,8 @@
<section id="isodd_add">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153939"><bookmark_value>ISODD_ADD function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ISODD" id="bm_id3149927" localize="false"/><paragraph role="heading" id="hd_id3153939" xml-lang="en-US" level="2" oldref="236">ISODD_ADD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ISODD" id="bm_id3149927" localize="false"/>
+<paragraph role="heading" id="hd_id3153939" xml-lang="en-US" level="2" oldref="236">ISODD_ADD</paragraph>
<paragraph role="paragraph" id="par_id3153538" xml-lang="en-US" l10n="U" oldref="237"><ahelp hid="HID_AAI_FUNC_ISODD">Returns TRUE (1) if the number does not return a whole number when divided by 2.</ahelp></paragraph>
<embed href="text/scalc/01/04060102.xhp#ADD_note"/>
<paragraph role="heading" id="hd_id3145601" xml-lang="en-US" level="3" l10n="U" oldref="238">Syntax</paragraph>
@@ -427,7 +508,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3148688"><bookmark_value>ISNUMBER function</bookmark_value>
<bookmark_value>cell contents;numbers</bookmark_value>
</bookmark><comment>mw added "cell contents;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTZAHL" id="bm_id3149587" localize="false"/><paragraph role="heading" id="hd_id3148688" xml-lang="en-US" level="2" l10n="U" oldref="110">ISNUMBER</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ISTZAHL" id="bm_id3149587" localize="false"/>
+<paragraph role="heading" id="hd_id3148688" xml-lang="en-US" level="2" l10n="U" oldref="110">ISNUMBER</paragraph>
<paragraph role="paragraph" id="par_id3154618" xml-lang="en-US" l10n="U" oldref="111"><ahelp hid="HID_FUNC_ISTZAHL">Returns TRUE if the value refers to a number.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#wahr"/>
<paragraph role="heading" id="hd_id3152769" xml-lang="en-US" level="3" l10n="U" oldref="112">Syntax</paragraph>
@@ -443,7 +525,8 @@
<section id="n">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153694"><bookmark_value>N function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_N" id="bm_id3153786" localize="false"/><paragraph role="heading" id="hd_id3153694" xml-lang="en-US" level="2" l10n="U" oldref="119">N</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_N" id="bm_id3153786" localize="false"/>
+<paragraph role="heading" id="hd_id3153694" xml-lang="en-US" level="2" l10n="U" oldref="119">N</paragraph>
<paragraph role="paragraph" id="par_id3150405" xml-lang="en-US" l10n="CHG" oldref="120"><ahelp hid="HID_FUNC_N">Returns the numeric value of the given parameter. Returns 0 if parameter is text, FALSE or #NA.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id9115573" xml-lang="en-US" l10n="NEW">If an error occurs, other than #NA, the function returns the error value.</paragraph>
<paragraph role="heading" id="hd_id3145774" xml-lang="en-US" level="3" l10n="U" oldref="121">Syntax</paragraph>
@@ -465,7 +548,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3156275"><bookmark_value>NA function</bookmark_value>
<bookmark_value>#N/A error;assigning to a cell</bookmark_value>
</bookmark><comment>mw added "#N/A error;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_NV" id="bm_id3154569" localize="false"/><paragraph role="heading" id="hd_id3156275" xml-lang="en-US" level="2" l10n="U" oldref="129">NA</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_NV" id="bm_id3154569" localize="false"/>
+<paragraph role="heading" id="hd_id3156275" xml-lang="en-US" level="2" l10n="U" oldref="129">NA</paragraph>
<paragraph role="paragraph" id="par_id3156161" xml-lang="en-US" l10n="U" oldref="130"><ahelp hid="HID_FUNC_NV">Returns the error value #N/A.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147532" xml-lang="en-US" level="3" l10n="U" oldref="131">Syntax</paragraph>
<paragraph role="code" id="par_id3149563" xml-lang="en-US" l10n="U" oldref="132">NA()</paragraph>
@@ -476,7 +560,8 @@
<section id="type">
<bookmark xml-lang="en-US" branch="index" id="bm_id3151255"><bookmark_value>TYPE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_TYP" id="bm_id3146127" localize="false"/><paragraph role="heading" id="hd_id3151255" xml-lang="en-US" level="2" l10n="U" oldref="136">TYPE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_TYP" id="bm_id3146127" localize="false"/>
+<paragraph role="heading" id="hd_id3151255" xml-lang="en-US" level="2" l10n="U" oldref="136">TYPE</paragraph>
<paragraph role="paragraph" id="par_id3155900" xml-lang="en-US" l10n="U" oldref="137"><ahelp hid="HID_FUNC_TYP">Returns the type of value.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#wahr"/>
<paragraph role="heading" id="hd_id3149992" xml-lang="en-US" level="3" l10n="U" oldref="138">Syntax</paragraph>
@@ -494,7 +579,8 @@
<bookmark_value>cell information</bookmark_value>
<bookmark_value>information on cells</bookmark_value>
</bookmark><comment>mw added two entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZELLE" id="bm_id3159412" localize="false"/><paragraph role="heading" id="hd_id3155509" xml-lang="en-US" level="2" l10n="U" oldref="154">CELL</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZELLE" id="bm_id3159412" localize="false"/>
+<paragraph role="heading" id="hd_id3155509" xml-lang="en-US" level="2" l10n="U" oldref="154">CELL</paragraph>
<paragraph role="paragraph" id="par_id3153196" xml-lang="en-US" l10n="U" oldref="155"><ahelp hid="HID_FUNC_ZELLE">Returns information on address, formatting or contents of a cell.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149323" xml-lang="en-US" level="3" l10n="U" oldref="156">Syntax</paragraph>
<paragraph role="code" id="par_id3147355" xml-lang="en-US" l10n="U" oldref="157">CELL("InfoType"; Reference)</paragraph>
@@ -502,48 +588,48 @@
<emph>InfoType</emph> is the character string that specifies the type of information. The character string is always in English. Upper or lower case is optional.</paragraph>
<table id="tbl_id3152470">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150636" xml-lang="en-US" l10n="U" oldref="165">InfoType</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149344" xml-lang="en-US" l10n="U" oldref="166">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3153266" xml-lang="en-US" l10n="U" oldref="167">COL</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156204" xml-lang="en-US" l10n="U" oldref="168">Returns the number of the referenced column.</paragraph>
<paragraph role="tablecontent" id="par_id3150094" xml-lang="en-US" l10n="U" oldref="162">
<item type="input">=CELL("COL";D2)</item> returns 4.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3151276" xml-lang="en-US" l10n="U" oldref="169">ROW</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147583" xml-lang="en-US" l10n="U" oldref="170">Returns the number of the referenced row.</paragraph>
<paragraph role="tablecontent" id="par_id3151222" xml-lang="en-US" l10n="U" oldref="163">
<item type="input">=CELL("ROW";D2)</item> returns 2.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3159217" xml-lang="en-US" l10n="U" oldref="171">SHEET</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151201" xml-lang="en-US" l10n="U" oldref="172">Returns the number of the referenced sheet.</paragraph>
<paragraph role="tablecontent" id="par_id3149169" xml-lang="en-US" l10n="U" oldref="164">
<item type="input">=CELL("Sheet";Sheet3.D2)</item> returns 3.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149431" xml-lang="en-US" l10n="U" oldref="173">ADDRESS</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156054" xml-lang="en-US" l10n="U" oldref="174">Returns the absolute address of the referenced cell.</paragraph>
<paragraph role="tablecontent" id="par_id3154136" xml-lang="en-US" l10n="U" oldref="175">
<item type="input">=CELL("ADDRESS";D2)</item> returns $D$2.</paragraph>
@@ -554,10 +640,10 @@
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3146811" xml-lang="en-US" l10n="U" oldref="178">FILENAME</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151328" xml-lang="en-US" l10n="U" oldref="179">Returns the file name and the sheet number of the referenced cell.</paragraph>
<paragraph role="tablecontent" id="par_id3148896" xml-lang="en-US" l10n="U" oldref="180">
<item type="input">=CELL("FILENAME";D2)</item> returns 'file:///X:/dr/own.sxc'#$Sheet1, if the formula in the current document X:\dr\own.sxc is located in Sheet1.</paragraph>
@@ -566,10 +652,10 @@
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3151381" xml-lang="en-US" l10n="U" oldref="182">COORD</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151004" xml-lang="en-US" l10n="U" oldref="183">Returns the complete cell address in Lotus(TM) notation.</paragraph>
<paragraph role="tablecontent" id="par_id3159104" xml-lang="en-US" l10n="U" oldref="184">
<item type="input">=CELL("COORD"; D2)</item> returns $A:$D$2.</paragraph>
@@ -578,18 +664,18 @@
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155910" xml-lang="en-US" l10n="U" oldref="186">CONTENTS</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156041" xml-lang="en-US" l10n="U" oldref="187">Returns the contents of the referenced cell, without any formatting.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3151069" xml-lang="en-US" l10n="U" oldref="188">TYPE</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155344" xml-lang="en-US" l10n="U" oldref="189">Returns the type of cell contents.</paragraph>
<paragraph role="tablecontent" id="par_id3145217" xml-lang="en-US" l10n="U" oldref="190">b = blank. empty cell</paragraph>
<paragraph role="tablecontent" id="par_id3155176" xml-lang="en-US" l10n="U" oldref="191">l = label. Text, result of a formula as text</paragraph>
@@ -597,18 +683,18 @@
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3156348" xml-lang="en-US" l10n="U" oldref="193">WIDTH</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154920" xml-lang="en-US" l10n="U" oldref="194">Returns the width of the referenced column. The unit is the number of zeros (0) that fit into the column in the default text and the default size.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3152355" xml-lang="en-US" l10n="U" oldref="195">PREFIX</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="196">Returns the alignment of the referenced cell.</paragraph>
<paragraph role="tablecontent" id="par_id3155946" xml-lang="en-US" l10n="U" oldref="197">' = align left or left-justified</paragraph>
<paragraph role="tablecontent" id="par_id3147220" xml-lang="en-US" l10n="U" oldref="198">" = align right</paragraph>
@@ -617,20 +703,20 @@
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154406" xml-lang="en-US" l10n="U" oldref="201">PROTECT</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145127" xml-lang="en-US" l10n="U" oldref="202">Returns the status of the cell protection for the cell.</paragraph>
<paragraph role="tablecontent" id="par_id3155794" xml-lang="en-US" l10n="U" oldref="203">1 = cell is protected</paragraph>
<paragraph role="tablecontent" id="par_id3155072" xml-lang="en-US" l10n="U" oldref="204">0 = cell is not protected</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3156178" xml-lang="en-US" l10n="U" oldref="205">FORMAT</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150220" xml-lang="en-US" l10n="U" oldref="206">Returns a character string that indicates the number format.</paragraph>
<paragraph role="tablecontent" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="207">, = number with thousands separator</paragraph>
<paragraph role="tablecontent" id="par_id3153837" xml-lang="en-US" l10n="U" oldref="208">F = number without thousands separator</paragraph>
@@ -653,24 +739,29 @@
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154594" xml-lang="en-US" l10n="U" oldref="225">COLOR</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152922" xml-lang="en-US" l10n="U" oldref="226">Returns 1, if negative values have been formatted in color, otherwise 0.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3145563" xml-lang="en-US" l10n="U" oldref="227">PARENTHESES</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156072" xml-lang="en-US" l10n="U" oldref="228">Returns 1 if the format code contains an opening bracket (, otherwise 0.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3156090" xml-lang="en-US" l10n="U" oldref="159">
<emph>Reference</emph> (list of options) is the position of the cell to be examined. If <emph>Reference</emph> is a range, the cell moves to the top left of the range. If <emph>Reference</emph> is missing, $[officename] Calc uses the position of the cell in which this formula is located. Microsoft Excel uses the reference of the cell in which the cursor is positioned.</paragraph>
</section>
-</sort></body>
+</sort>
+<section id="relatedtopics">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060105.xhp b/helpcontent2/source/text/scalc/01/04060105.xhp
index 9310ccc9ac..9932822ffe 100644
--- a/helpcontent2/source/text/scalc/01/04060105.xhp
+++ b/helpcontent2/source/text/scalc/01/04060105.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060105.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060105xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060105xml" indexer="include">
<title id="tit" xml-lang="en-US">Logical Functions</title>
<filename>/text/scalc/01/04060105.xhp</filename>
</topic>
@@ -51,12 +49,14 @@
<paragraph role="paragraph" id="par_id3149312" xml-lang="en-US" l10n="U" oldref="2"><variable id="logischtext">This category contains the <emph>Logical</emph> functions.
</variable></paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000404.xhp#eikalo"/>
+<embed href="text/scalc/00/00000404.xhp#eikalo"/>
</section>
-<sort order="asc"><section id="Section6">
+<sort order="asc">
+<section id="Section6">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147505"><bookmark_value>AND function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_UND" id="bm_id3145320" localize="false"/><paragraph role="heading" id="hd_id3147505" xml-lang="en-US" level="2" l10n="U" oldref="29">AND</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_UND" id="bm_id3145320" localize="false"/>
+<paragraph role="heading" id="hd_id3147505" xml-lang="en-US" level="2" l10n="U" oldref="29">AND</paragraph>
<paragraph role="paragraph" id="par_id3153959" xml-lang="en-US" l10n="U" oldref="65"><ahelp hid="HID_FUNC_UND">Returns TRUE if all arguments are TRUE.</ahelp> If one of the elements is FALSE, this function returns the FALSE value.</paragraph>
<paragraph role="paragraph" id="par_id3146100" xml-lang="en-US" l10n="U" oldref="66">The arguments are either logical expressions themselves (TRUE, 1&lt;5, 2+3=7, B8&lt;10) that return logical values, or arrays (A1:C3) containing logical values.</paragraph>
<paragraph role="note" id="par_id3150538" xml-lang="en-US" l10n="CHG" oldref="67">When a function expects a single value, but you entered a cell range, then the value from the cell range is taken that is in the same column or row as the formula.<comment>UFI: fixed #i18547#</comment></paragraph>
@@ -75,7 +75,8 @@
<section id="Section5">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149015"><bookmark_value>FALSE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FALSCH" id="bm_id3154678" localize="false"/><paragraph role="heading" id="hd_id3149015" xml-lang="en-US" level="2" l10n="U" oldref="3">FALSE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FALSCH" id="bm_id3154678" localize="false"/>
+<paragraph role="heading" id="hd_id3149015" xml-lang="en-US" level="2" l10n="U" oldref="3">FALSE</paragraph>
<paragraph role="paragraph" id="par_id3149890" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_FUNC_FALSCH">Returns the logical value FALSE.</ahelp> The FALSE() function does not require any arguments, and always returns the logical value FALSE.</paragraph>
<paragraph role="heading" id="hd_id3146939" xml-lang="en-US" level="3" l10n="U" oldref="5">Syntax</paragraph>
<paragraph role="code" id="par_id3150030" xml-lang="en-US" l10n="U" oldref="6">FALSE()</paragraph>
@@ -88,7 +89,8 @@
<section id="Section4">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150141"><bookmark_value>IF function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WENN" id="bm_id3152789" localize="false"/><paragraph role="heading" id="hd_id3150141" xml-lang="en-US" level="2" l10n="U" oldref="48">IF</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WENN" id="bm_id3152789" localize="false"/>
+<paragraph role="heading" id="hd_id3150141" xml-lang="en-US" level="2" l10n="U" oldref="48">IF</paragraph>
<paragraph role="paragraph" id="par_id3148740" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_FUNC_WENN">Specifies a logical test to be performed.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153325" xml-lang="en-US" level="3" l10n="U" oldref="50">Syntax</paragraph>
<paragraph role="code" id="par_id3154558" xml-lang="en-US" l10n="U" oldref="51">IF(Test; ThenValue; "OtherwiseValue")</paragraph>
@@ -108,7 +110,8 @@
<section id="Section3">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155954"><bookmark_value>NOT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_NICHT" id="bm_id3145168" localize="false"/><paragraph role="heading" id="hd_id3155954" xml-lang="en-US" level="2" l10n="U" oldref="12">NOT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_NICHT" id="bm_id3145168" localize="false"/>
+<paragraph role="heading" id="hd_id3155954" xml-lang="en-US" level="2" l10n="U" oldref="12">NOT</paragraph>
<paragraph role="paragraph" id="par_id3153570" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_FUNC_NICHT">Reverses the logical value.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147372" xml-lang="en-US" level="3" l10n="U" oldref="14">Syntax</paragraph>
<paragraph role="code" id="par_id3157996" xml-lang="en-US" l10n="U" oldref="15">NOT(LogicalValue)</paragraph>
@@ -121,7 +124,8 @@
<section id="Section2">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148394"><bookmark_value>OR function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ODER" id="bm_id3155620" localize="false"/><paragraph role="heading" id="hd_id3148394" xml-lang="en-US" level="2" l10n="U" oldref="20">OR</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ODER" id="bm_id3155620" localize="false"/>
+<paragraph role="heading" id="hd_id3148394" xml-lang="en-US" level="2" l10n="U" oldref="20">OR</paragraph>
<paragraph role="paragraph" id="par_id3156060" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="HID_FUNC_ODER">Returns TRUE if at least one argument is TRUE.</ahelp> This function returns the value FALSE, if all the arguments have the logical value FALSE.</paragraph>
<paragraph role="paragraph" id="par_id3148771" xml-lang="en-US" l10n="U" oldref="62">The arguments are either logical expressions themselves (TRUE, 1&lt;5, 2+3=7, B8&lt;10) that return logical values, or arrays (A1:C3) containing logical values.</paragraph>
<paragraph role="note" id="par_id3153546" xml-lang="en-US" l10n="CHG" oldref="63">When a function expects a single value, but you entered a cell range, then the value from the cell range is taken that is in the same column or row as the formula.</paragraph>
@@ -140,7 +144,8 @@
<section id="Section1">
<bookmark xml-lang="en-US" branch="index" id="bm_id3156256"><bookmark_value>TRUE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WAHR" id="bm_id3148426" localize="false"/><paragraph role="heading" id="hd_id3156256" xml-lang="en-US" level="2" l10n="U" oldref="38">TRUE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WAHR" id="bm_id3148426" localize="false"/>
+<paragraph role="heading" id="hd_id3156256" xml-lang="en-US" level="2" l10n="U" oldref="38">TRUE</paragraph>
<paragraph role="paragraph" id="par_id3155985" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="HID_FUNC_WAHR">The logical value is set to TRUE.</ahelp> The TRUE() function does not require any arguments, and always returns the logical value TRUE.</paragraph>
<paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="3" l10n="U" oldref="40">Syntax</paragraph>
<paragraph role="code" id="par_id3152590" xml-lang="en-US" l10n="U" oldref="41">TRUE()</paragraph>
@@ -153,5 +158,9 @@
<paragraph role="paragraph" id="par_id3154314" xml-lang="en-US" l10n="U" oldref="46">
<item type="input">=NOT(AND(A;B))</item> returns TRUE</paragraph>
</section>
-</sort></body>
+</sort>
+<section id="relatedtopics">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060106.xhp b/helpcontent2/source/text/scalc/01/04060106.xhp
index 8bf3a8cef2..5e8c9710b6 100644
--- a/helpcontent2/source/text/scalc/01/04060106.xhp
+++ b/helpcontent2/source/text/scalc/01/04060106.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060106.xhp,v $
- *
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +35,7 @@
<meta>
-<topic id="textscalc0104060106xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060106xml" indexer="include">
<title id="tit" xml-lang="en-US">Mathematical Functions</title>
<filename>/text/scalc/01/04060106.xhp</filename>
</topic>
@@ -894,8 +892,7 @@ ACOSH, ASINH, ATANH, ACOTH</comment>
<paragraph role="paragraph" id="par_id3151813" xml-lang="en-US" l10n="U" oldref="622">
<item type="input">=SUM((A1:A40&gt;=C1)*(A1:A40&lt;C2)*B1:B40)</item>
</paragraph>
-<paragraph role="paragraph" id="par_id3151828" xml-lang="en-US" l10n="U" oldref="623">In order to enter this as an array formula, you must press the Shift <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>+ Ctrl</defaultinline></switchinline> + Enter key instead of simply pressing the Enter key to close the formula. The formula will then be shown in the <emph>Formula</emph> bar enclosed in braces.</paragraph>
+<paragraph role="paragraph" id="par_id3151828" xml-lang="en-US" l10n="U" oldref="623">In order to enter this as an array formula, you must press the Shift<switchinline select="sys"><caseinline select="MAC">+Command</caseinline><defaultinline>+ Ctrl</defaultinline></switchinline>+ Enter keys instead of simply pressing the Enter key to close the formula. The formula will then be shown in the <emph>Formula</emph> bar enclosed in braces.</paragraph>
<paragraph role="paragraph" id="par_id3151869" xml-lang="en-US" l10n="U" oldref="624">{=SUM((A1:A40&gt;=C1)*(A1:A40&lt;C2)*B1:B40)}</paragraph>
<paragraph role="paragraph" id="par_id3151884" xml-lang="en-US" l10n="CHG" oldref="625">The formula is based on the fact that the result of a comparison is 1 if the criterion is met and 0 if it is not met. The individual comparison results will be treated as an array and used in matrix multiplication, and at the end the individual values will be totaled to give the result matrix.</paragraph>
</section>
@@ -1221,7 +1218,7 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
<paragraph role="heading" id="hd_id3164745" xml-lang="en-US" level="3" l10n="U" oldref="673">Syntax</paragraph>
<paragraph role="code" id="par_id3164758" xml-lang="en-US" l10n="U" oldref="674">RANDBETWEEN(Bottom; Top)</paragraph>
<paragraph role="paragraph" id="par_id7112338" xml-lang="en-US" l10n="NEW">Returns an integer random number between integers <emph>Bottom</emph> and <emph>Top</emph> (both inclusive).</paragraph>
-<paragraph role="paragraph" id="par_id2855616" xml-lang="en-US" l10n="NEW">This function produces a new random number each time Calc recalculates. To force Calc to recalculate manually press Shift+Ctrl+F9.</paragraph>
+<paragraph role="paragraph" id="par_id2855616" xml-lang="en-US" l10n="NEW">This function produces a new random number each time Calc recalculates. To force Calc to recalculate manually press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9.</paragraph>
<paragraph role="paragraph" id="par_id2091433" xml-lang="en-US" l10n="NEW">To generate random numbers which never recalculate, copy cells containing this function, and use <item type="menuitem">Edit - Paste Special</item> (with <item type="menuitem">Paste All</item> and <item type="menuitem">Formulas</item> not marked and <item type="menuitem">Numbers</item> marked).</paragraph>
<paragraph role="heading" id="hd_id3164772" xml-lang="en-US" level="3" l10n="U" oldref="675">Example</paragraph>
<paragraph role="paragraph" id="par_id3164785" xml-lang="en-US" l10n="U" oldref="676">
@@ -1236,7 +1233,7 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
<paragraph role="paragraph" id="par_id3164829" xml-lang="en-US" l10n="CHG" oldref="543"><ahelp hid="HID_FUNC_ZUFALLSZAHL">Returns a random number between 0 and 1.</ahelp><comment>The value of 0 can be returned, the value of 1 not.</comment><comment>this is really true after issue 53642 will be fixed</comment></paragraph>
<paragraph role="heading" id="hd_id3164870" xml-lang="en-US" level="3" l10n="U" oldref="545">Syntax</paragraph>
<paragraph role="code" id="par_id3164884" xml-lang="en-US" l10n="U" oldref="546">RAND()</paragraph>
-<paragraph role="paragraph" id="par_id5092318" xml-lang="en-US" l10n="NEW">This function produces a new random number each time Calc recalculates. To force Calc to recalculate manually press Shift+Ctrl+F9.</paragraph>
+<paragraph role="paragraph" id="par_id5092318" xml-lang="en-US" l10n="NEW">This function produces a new random number each time Calc recalculates. To force Calc to recalculate manually press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9.</paragraph>
<paragraph role="paragraph" id="par_id9312417" xml-lang="en-US" l10n="NEW">To generate random numbers which never recalculate, copy cells each containing =RAND(), and use <item type="menuitem">Edit - Paste Special</item> (with <item type="menuitem">Paste All</item> and <item type="menuitem">Formulas</item> not marked and <item type="menuitem">Numbers</item> marked).</paragraph>
<paragraph role="heading" id="hd_id9089022" xml-lang="en-US" level="3" l10n="NEW">Example</paragraph>
<paragraph role="paragraph" id="par_id9569078" xml-lang="en-US" l10n="NEW">
@@ -1273,5 +1270,8 @@ INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP</comment>
</paragraph>
</section>
</sort>
+<section id="relatedtopics">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060107.xhp b/helpcontent2/source/text/scalc/01/04060107.xhp
index 58d4d676ca..01dd9640d1 100644
--- a/helpcontent2/source/text/scalc/01/04060107.xhp
+++ b/helpcontent2/source/text/scalc/01/04060107.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060107.xhp,v $
- *
- * $Revision: 1.17 $
+ * $Revision: 1.17.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +35,7 @@
<meta>
-<topic id="textscalc0104060107xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060107xml" indexer="include">
<title id="tit" xml-lang="en-US">Array Functions</title>
<filename>/text/scalc/01/04060107.xhp</filename>
</topic>
@@ -144,8 +142,7 @@
<paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="2" l10n="U" oldref="275">What is an array formula?</paragraph>
<paragraph role="paragraph" id="par_id3155355" xml-lang="en-US" l10n="U" oldref="276">A formula in which the individual values in a cell range are evaluated is referred to as an array formula. The difference between an array formula and other formulas is that the array formula deals with several values simultaneously instead of just one.</paragraph>
<paragraph role="paragraph" id="par_id3151052" xml-lang="en-US" l10n="U" oldref="278">Not only can an array formula process several values, but it can also return several values. The results of an array formula is also an array.</paragraph>
-<paragraph role="paragraph" id="par_id3158432" xml-lang="en-US" l10n="U" oldref="279">To multiply the values in the individual cells by 10 in the above array, you do not need to apply a formula to each individual cell or value. Instead you just need to use a single array formula. Select a range of 3 x 3 cells on another part of the spreadsheet, enter the formula <item type="input">=10*A1:C3</item> and confirm this entry using the key combination <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter. The result is a 3 x 3 array in which the individual values in the cell range (A1:C3) are multiplied by a factor of 10.</paragraph>
+<paragraph role="paragraph" id="par_id3158432" xml-lang="en-US" l10n="U" oldref="279">To multiply the values in the individual cells by 10 in the above array, you do not need to apply a formula to each individual cell or value. Instead you just need to use a single array formula. Select a range of 3 x 3 cells on another part of the spreadsheet, enter the formula <item type="input">=10*A1:C3</item> and confirm this entry using the key combination <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter. The result is a 3 x 3 array in which the individual values in the cell range (A1:C3) are multiplied by a factor of 10.</paragraph>
<paragraph role="paragraph" id="par_id3149156" xml-lang="en-US" l10n="U" oldref="280">In addition to multiplication, you can also use other operators on the reference range (an array). With $[officename] Calc, you can add (+), subtract (-), multiply (*), divide (/), use exponents (^), concatenation (&amp;) and comparisons (=, &lt;&gt;, &lt;, &gt;, &lt;=, &gt;=). The operators can be used on each individual value in the cell range and return the result as an array if the array formula was entered.</paragraph>
<paragraph role="paragraph" id="par_id3166456" xml-lang="en-US" l10n="CHG" oldref="326">Comparison operators in an array formula treat empty cells in the same way as in a normal formula, that is, either as zero or as an empty string. For example, if cells A1 and A2 are empty the array formulas <item type="input">{=A1:A2=""}</item> and <item type="input">{=A1:A2=0}</item> will both return a 1 column 2 row array of cells containing TRUE.</paragraph>
<paragraph role="heading" id="hd_id3150713" xml-lang="en-US" level="3" l10n="U" oldref="281">When do you use array formulas?</paragraph>
@@ -156,8 +153,7 @@
<paragraph role="heading" id="hd_id3151271" xml-lang="en-US" level="3" l10n="U" oldref="313">Creating Array Formulas</paragraph>
<section id="somatrixformel">
<paragraph role="paragraph" id="par_id3149102" xml-lang="en-US" l10n="U" oldref="314">If you create an array formula using the <emph>Function Wizard</emph>, you must mark the <emph>Array</emph> check box each time so that the results are returned in an array. Otherwise, only the value in the upper-left cell of the array being calculated is returned.</paragraph>
-<paragraph role="paragraph" id="par_id3153392" xml-lang="en-US" l10n="U" oldref="4">If you enter the array formula directly into the cell, you must use the key combination Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter instead of the Enter key. Only then does the formula become an array formula.</paragraph>
+<paragraph role="paragraph" id="par_id3153392" xml-lang="en-US" l10n="U" oldref="4">If you enter the array formula directly into the cell, you must use the key combination Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter instead of the Enter key. Only then does the formula become an array formula.</paragraph>
<paragraph role="note" id="par_id3151120" xml-lang="en-US" l10n="U" oldref="315">Array formulas appear in braces in $[officename] Calc. You cannot create array formulas by manually entering the braces.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3154342" xml-lang="en-US" l10n="U" oldref="5">The cells in a results array are automatically protected against changes. However, you can edit or copy the array formula by selecting the entire array cell range.</paragraph>
@@ -170,7 +166,7 @@
</paragraph>
<paragraph role="code" id="par_id9387493" xml-lang="en-US" l10n="NEW">={1;2;3}</paragraph>
<paragraph role="paragraph" id="par_id8207037" xml-lang="en-US" l10n="NEW">An array with one row consisting of the three numbers 1, 2, and 3.</paragraph>
-<paragraph role="paragraph" id="par_id6757103" xml-lang="en-US" l10n="NEW">To enter this array constant, you select three cells in a row, then you type the formula <item type="input">={1;2;3}</item> using the curly braces and the semicolons, then press Ctrl+Shift+Enter.</paragraph>
+<paragraph role="paragraph" id="par_id6757103" xml-lang="en-US" l10n="NEW">To enter this array constant, you select three cells in a row, then you type the formula <item type="input">={1;2;3}</item> using the curly braces and the semicolons, then press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter.</paragraph>
<paragraph role="code" id="par_id8868068" xml-lang="en-US" l10n="NEW">={1;2;3|4;5;6}</paragraph>
<paragraph role="paragraph" id="par_id6626483" xml-lang="en-US" l10n="NEW">An array with two rows and three values in each row.</paragraph>
<paragraph role="code" id="par_id5262916" xml-lang="en-US" l10n="NEW">={0;1;2|FALSE;TRUE;"two"}</paragraph>
@@ -180,14 +176,13 @@
<paragraph role="heading" id="hd_id3148660" xml-lang="en-US" level="3" l10n="U" oldref="316">Editing Array Formulas</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3149241" xml-lang="en-US" l10n="U" oldref="317">Select the cell range or array containing the array formula. To select the whole array, position the cell cursor inside the array range, then press Ctrl+/, where / is the Division key on the numeric keypad.</paragraph>
+<paragraph role="listitem" id="par_id3149241" xml-lang="en-US" l10n="U" oldref="317">Select the cell range or array containing the array formula. To select the whole array, position the cell cursor inside the array range, then press <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>+ /, where / is the Division key on the numeric keypad.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3143274" xml-lang="en-US" l10n="U" oldref="318">Either press F2 or position the cursor in the input line. Both of these actions let you edit the formula.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3154798" xml-lang="en-US" l10n="U" oldref="319">After you have made changes, press <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter.</paragraph>
+<paragraph role="listitem" id="par_id3154798" xml-lang="en-US" l10n="U" oldref="319">After you have made changes, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter.</paragraph>
</listitem>
</list>
<paragraph role="tip" id="par_id3150628" xml-lang="en-US" l10n="U" oldref="334">You can format the separate parts of an array. For example, you can change the font color. Select a cell range and then change the attribute you want.</paragraph>
@@ -200,16 +195,13 @@
<paragraph role="listitem" id="par_id3154619" xml-lang="en-US" l10n="U" oldref="322">Either press F2 or position the cursor in the input line.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150994" xml-lang="en-US" l10n="U" oldref="323">Copy the formula into the input line by pressing <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C.</paragraph>
+<paragraph role="listitem" id="par_id3150994" xml-lang="en-US" l10n="U" oldref="323">Copy the formula into the input line by pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3146787" xml-lang="en-US" l10n="U" oldref="324">Select a range of cells where you want to insert the array formula and either press F2 or position the cursor in the input line.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3154419" xml-lang="en-US" l10n="U" oldref="325">Paste the formula by pressing <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V in the selected space and confirm it by pressing <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter. The selected range now contains the array formula.</paragraph>
+<paragraph role="listitem" id="par_id3154419" xml-lang="en-US" l10n="U" oldref="325">Paste the formula by pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V in the selected space and confirm it by pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter. The selected range now contains the array formula.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3154834" xml-lang="en-US" level="3" l10n="U" oldref="328">Adjusting an Array Range</paragraph>
@@ -223,7 +215,7 @@
</listitem>
</list>
<paragraph role="note" id="par_id3150974" xml-lang="en-US" l10n="U" oldref="332">When you adjust the array range, the array formula will not automatically be adjusted. You are only changing the range in which the result will appear.</paragraph>
-<paragraph role="paragraph" id="par_id3146080" xml-lang="en-US" l10n="U" oldref="333">By holding down the Ctrl key, you can create a copy of the array formula in the given range.</paragraph>
+<paragraph role="paragraph" id="par_id3146080" xml-lang="en-US" l10n="U" oldref="333">By holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key, you can create a copy of the array formula in the given range.</paragraph>
<paragraph role="heading" id="par_idN10D47" xml-lang="en-US" level="3" l10n="NEW">Conditional Array Calculations</paragraph>
<paragraph role="paragraph" id="par_idN10D4B" xml-lang="en-US" l10n="NEW">A conditional array calculation is an array or matrix formula that includes an IF() or CHOOSE() function. The condition argument in the formula is an area reference or a matrix result.</paragraph>
<paragraph role="paragraph" id="par_idN10D4E" xml-lang="en-US" l10n="NEW">In the following example, the &gt;0 test of the {=IF(A1:A3&gt;0;"yes";"no")} formula is applied to each cell in the range A1:A3 and the result is copied to the corresponding cell.</paragraph>
@@ -382,8 +374,7 @@
<paragraph role="heading" id="hd_id3156162" xml-lang="en-US" level="3" l10n="U" oldref="17">Example</paragraph>
<paragraph role="paragraph" id="par_id3150949" xml-lang="en-US" l10n="U" oldref="18">Select a square range within the spreadsheet, for example, from A1 to E5.</paragraph>
<paragraph role="paragraph" id="par_id3151260" xml-lang="en-US" l10n="U" oldref="19">Without deselecting the range, select the MUNIT function. Mark the <emph>Array</emph> check box. Enter the desired dimensions for the array unit, in this case <item type="input">5</item>, and click <emph>OK</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3150403" xml-lang="en-US" l10n="U" oldref="20">You can also enter the <item type="input">=Munit(5)</item> formula in the last cell of the selected range (E5), and press <switchinline select="sys"><caseinline select="MAC">Shift+Command+Enter
-</caseinline><defaultinline>Shift+Ctrl+Enter</defaultinline></switchinline>.</paragraph>
+<paragraph role="paragraph" id="par_id3150403" xml-lang="en-US" l10n="U" oldref="20">You can also enter the <item type="input">=Munit(5)</item> formula in the last cell of the selected range (E5), and press <switchinline select="sys"><caseinline select="MAC">Shift+Command+Enter</caseinline><defaultinline>Shift+Ctrl+Enter</defaultinline></switchinline>.</paragraph>
<paragraph role="paragraph" id="par_id3156143" xml-lang="en-US" l10n="U" oldref="21">You now see a unit array with a range of A1:E5.</paragraph>
<paragraph role="paragraph" id="par_idN10FA7" xml-lang="en-US" l10n="NEW">
<embedvar href="text/scalc/00/00000004.xhp#moreontop"/>
@@ -662,25 +653,24 @@
<embedvar href="text/scalc/00/00000004.xhp#moreontop"/>
</paragraph>
<paragraph role="heading" id="hd_id3159352" xml-lang="en-US" level="3" l10n="U" oldref="61">Example</paragraph>
-<paragraph role="paragraph" id="par_id3159366" xml-lang="en-US" l10n="U" oldref="62">In the spreadsheet, select the range in which the transposed array can appear. If the original array has n rows and m columns, your selected range must have at least m rows and n columns. Then enter the formula directly, select the original array and press <switchinline select="sys"><caseinline select="MAC">Shift+Command+Enter
-</caseinline><defaultinline>Shift+Ctrl+Enter</defaultinline></switchinline>. Or, if you are using the <emph>Function Wizard</emph>, mark the <emph>Array</emph> check box. The transposed array appears in the selected target range and is protected automatically against changes.</paragraph>
+<paragraph role="paragraph" id="par_id3159366" xml-lang="en-US" l10n="U" oldref="62">In the spreadsheet, select the range in which the transposed array can appear. If the original array has n rows and m columns, your selected range must have at least m rows and n columns. Then enter the formula directly, select the original array and press <switchinline select="sys"><caseinline select="MAC">Shift+Command+Enter</caseinline><defaultinline>Shift+Ctrl+Enter</defaultinline></switchinline>. Or, if you are using the <emph>Function Wizard</emph>, mark the <emph>Array</emph> check box. The transposed array appears in the selected target range and is protected automatically against changes.</paragraph>
</section>
<section id="Section8">
<bookmark xml-lang="en-US" branch="index" id="bm_id3109846"><bookmark_value>LINEST function</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_FUNC_RGP" id="bm_id3144716" localize="false"/>
<paragraph role="heading" id="hd_id3109846" xml-lang="en-US" level="2" l10n="U" oldref="64">LINEST</paragraph>
-<paragraph role="paragraph" id="par_id3144733" xml-lang="en-US" l10n="U" oldref="65"><ahelp hid="HID_FUNC_RGP">Returns the parameters of a linear trend.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3144733" xml-lang="en-US" l10n="CHG" oldref="65"><ahelp hid="HID_FUNC_RGP">Returns a table of statistics for a straight line that best fits a data set.</ahelp><comment>changed based on http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_LINEST_function (issue 76142)</comment></paragraph>
<paragraph role="heading" id="hd_id3152825" xml-lang="en-US" level="3" l10n="U" oldref="66">Syntax</paragraph>
-<paragraph role="code" id="par_id3152839" xml-lang="en-US" l10n="U" oldref="67">LINEST(DataY; DataX; LinearType; Stats)</paragraph>
+<paragraph role="code" id="par_id3152839" xml-lang="en-US" l10n="U" oldref="67">LINEST(data_Y; data_X; linearType; stats)</paragraph>
<paragraph role="paragraph" id="par_id3152853" xml-lang="en-US" l10n="U" oldref="68">
-<emph>DataY</emph> represents the Y Data array.</paragraph>
+<emph>data_Y</emph> is a single row or column range specifying the y coordinates in a set of data points.</paragraph>
<paragraph role="paragraph" id="par_id3154428" xml-lang="en-US" l10n="U" oldref="69">
-<emph>DataX</emph> (optional) represents the X Data array.</paragraph>
-<paragraph role="paragraph" id="par_id3154448" xml-lang="en-US" l10n="U" oldref="70">
-<emph>LinearType</emph> (optional). If the line goes through the zero point, then set LinearType = 0.</paragraph>
-<paragraph role="paragraph" id="par_id3154142" xml-lang="en-US" l10n="U" oldref="71">
-<emph>Stats</emph> (optional). If Stats=0, only the regression coefficient is to be calculated. Otherwise, you will see other stats.</paragraph>
+<emph>data_X</emph> is a corresponding single row or column range specifying the x coordinates. If <emph>data_X</emph> is omitted it defaults to <item type="literal">1, 2, 3, ..., n</item>. If there is more than one set of variables <emph>data_X</emph> may be a range with corresponding multiple rows or columns.</paragraph>
+<paragraph role="paragraph" id="par_id0811200804502119" xml-lang="en-US" l10n="NEW">LINEST finds a straight line <item type="literal">y = a + bx</item> that best fits the data, using linear regression (the "least squares" method). With more than one set of variables the straight line is of the form <item type="literal">y = a + b1x1 + b2x2 ... + bnxn</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3154448" xml-lang="en-US" l10n="U" oldref="70"> if<emph>linearType</emph> is FALSE the straight line found is forced to pass through the origin (the constant a is zero; y = bx). If omitted, <emph>linearType</emph> defaults to TRUE (the line is not forced through the origin).</paragraph>
+<paragraph role="paragraph" id="par_id3154142" xml-lang="en-US" l10n="U" oldref="71">if<emph>stats</emph> is omitted or FALSE only the top line of the statistics table is returned. If TRUE the entire table is returned.</paragraph>
+<paragraph role="paragraph" id="par_id0811200804502261" xml-lang="en-US" l10n="NEW">LINEST returns a table (array) of statistics as below and must be entered as an array formula (for example by using <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Return rather than just Return).</paragraph>
<paragraph role="paragraph" id="par_idN11416" xml-lang="en-US" l10n="NEW">
<embedvar href="text/scalc/00/00000004.xhp#optional"/>
</paragraph>
@@ -688,8 +678,8 @@
<embedvar href="text/scalc/00/00000004.xhp#moreontop"/>
</paragraph>
<paragraph role="heading" id="hd_id3154162" xml-lang="en-US" level="3" l10n="U" oldref="72">Example</paragraph>
-<paragraph role="paragraph" id="par_id3154176" xml-lang="en-US" l10n="U" oldref="73">This function returns an array and is handled in the same way as the other array functions. Select a range for the answers and then the function. Select DataY. If you want, you can enter other parameters. Select <emph>Array</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3155468" xml-lang="en-US" l10n="U" oldref="74">The results returned by the system (if Stats = 0), will at least show the slope of the regression line and its intersection with the Y axis. If Stats does not equal 0, other results are to be displayed.</paragraph>
+<paragraph role="paragraph" id="par_id3154176" xml-lang="en-US" l10n="U" oldref="73">This function returns an array and is handled in the same way as the other array functions. Select a range for the answers and then the function. Select <emph>data_Y</emph>. If you want, you can enter other parameters. Select <emph>Array</emph> and click <emph>OK</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3155468" xml-lang="en-US" l10n="U" oldref="74">The results returned by the system (if <emph>stats</emph> = 0), will at least show the slope of the regression line and its intersection with the Y axis. If <emph>stats</emph> does not equal 0, other results are to be displayed.</paragraph>
<paragraph role="heading" id="hd_id3155491" xml-lang="en-US" level="3" l10n="U" oldref="75">Other LINEST Results:</paragraph>
<paragraph role="paragraph" id="par_id3159291" xml-lang="en-US" l10n="U" oldref="76">Examine the following examples:</paragraph>
<table id="tbl_id3159305">
@@ -743,7 +733,8 @@
</tablecell>
<tablecell>
<paragraph role="paragraph" id="par_id3163766" xml-lang="en-US" l10n="U" oldref="88">
-<item type="input">LINEST value</item>
+<item type="input">LIN</item>
+<item type="input">EST value</item>
</paragraph>
</tablecell>
<tablecell>
@@ -1009,11 +1000,11 @@
<paragraph role="paragraph" id="par_id3144687" xml-lang="en-US" l10n="U" oldref="132">Column A contains several X1 values, column B several X2 values and column C the Y values. You have already entered these values in your spreadsheet. You have now set up E2:G6 in the spreadsheet and activated the <emph>Function Wizard</emph>. For the LINEST function to work, you must have marked the <emph>Array</emph> check box in the <emph>Function Wizard</emph>. Next, select the following values in the spreadsheet (or enter them using the keyboard):</paragraph>
<paragraph role="paragraph" id="par_id3158020" xml-lang="en-US" l10n="U" oldref="133">
-<emph>DataY</emph> is C2:C8</paragraph>
+<emph>data_Y</emph> is C2:C8</paragraph>
<paragraph role="paragraph" id="par_id3158039" xml-lang="en-US" l10n="U" oldref="134">
-<emph>DataX</emph> is A2:B8</paragraph>
+<emph>data_X</emph> is A2:B8</paragraph>
<paragraph role="paragraph" id="par_id3158058" xml-lang="en-US" l10n="U" oldref="135">
-<emph>LinearType</emph> and <emph>Stats</emph> are both set to 1.</paragraph>
+<emph>linearType</emph> and <emph>stats</emph> are both set to 1.</paragraph>
<paragraph role="paragraph" id="par_id3158084" xml-lang="en-US" l10n="U" oldref="136">As soon as you click <emph>OK</emph>, $[officename] Calc will fill the above example with the LINEST values as shown in the example.</paragraph>
<paragraph role="paragraph" id="par_id3158106" xml-lang="en-US" l10n="U" oldref="137">The formula in the <emph>Formula</emph> Bar corresponds to each cell of the LINEST array <item type="input">{=LINEST(C2:C8;A2:B8;1;1)}</item>
</paragraph>
@@ -1285,5 +1276,8 @@ for bug #i31051#</comment></paragraph>
<paragraph role="paragraph" id="par_id3173852" xml-lang="en-US" l10n="U" oldref="216">This function returns an array and is handled in the same way as the other array functions. Select a range where you want the answers to appear and select the function. Select DataY. Enter any other parameters, mark <emph>Array</emph> and click <emph>OK</emph>.</paragraph>
</section>
</sort>
+<section id="relatedtopics">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060108.xhp b/helpcontent2/source/text/scalc/01/04060108.xhp
index 810095da35..90c927e940 100755
--- a/helpcontent2/source/text/scalc/01/04060108.xhp
+++ b/helpcontent2/source/text/scalc/01/04060108.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060108.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalc0104060108xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060108xml" indexer="include">
<title id="tit" xml-lang="en-US">Statistics Functions</title>
<filename>/text/scalc/01/04060108.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-07T11:48:43">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153018"><bookmark_value>statistics functions</bookmark_value>
@@ -58,100 +54,100 @@
<paragraph role="paragraph" id="par_id3149001" xml-lang="en-US" l10n="U" oldref="9">Some of the examples use the following data table:</paragraph>
<table id="tbl_id3156066">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3148775" xml-lang="en-US" l10n="U" oldref="10">C</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3145297" xml-lang="en-US" l10n="U" oldref="11">D</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150661" xml-lang="en-US" l10n="U" oldref="12">2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153551" xml-lang="en-US" l10n="U" oldref="13">x value</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147536" xml-lang="en-US" l10n="U" oldref="14">y value</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153224" xml-lang="en-US" l10n="U" oldref="15">3</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150475" xml-lang="en-US" l10n="U" oldref="16">-5</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155367" xml-lang="en-US" l10n="U" oldref="17">-3</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149783" xml-lang="en-US" l10n="U" oldref="18">4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153181" xml-lang="en-US" l10n="U" oldref="19">-2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148429" xml-lang="en-US" l10n="U" oldref="20">0</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152588" xml-lang="en-US" l10n="U" oldref="21">5</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147483" xml-lang="en-US" l10n="U" oldref="22">-1</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="23">1</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149826" xml-lang="en-US" l10n="U" oldref="24">6</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3163820" xml-lang="en-US" l10n="U" oldref="25">0</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154816" xml-lang="en-US" l10n="U" oldref="26">3</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149276" xml-lang="en-US" l10n="U" oldref="27">7</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149267" xml-lang="en-US" l10n="U" oldref="28">2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156310" xml-lang="en-US" l10n="U" oldref="29">4</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154639" xml-lang="en-US" l10n="U" oldref="30">8</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145205" xml-lang="en-US" l10n="U" oldref="31">4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153276" xml-lang="en-US" l10n="U" oldref="32">6</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150756" xml-lang="en-US" l10n="U" oldref="33">9</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156095" xml-lang="en-US" l10n="U" oldref="34">6</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152929" xml-lang="en-US" l10n="U" oldref="35">8</paragraph>
</tablecell>
</tablerow>
@@ -164,5 +160,6 @@
<embed href="text/scalc/01/04060184.xhp#mq"/>
<embed href="text/scalc/01/04060185.xhp#rz"/>
<paragraph role="paragraph" id="par_id3150271" xml-lang="en-US" l10n="U" oldref="37"><link href="text/scalc/01/04060116.xhp" name="Statistical Functions in the Analysis-AddIn.">Statistical Functions in the Analysis-AddIn</link></paragraph>
+<embed href="text/scalc/01/04060100.xhp#drking"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060109.xhp b/helpcontent2/source/text/scalc/01/04060109.xhp
index 1fa839283d..e40c995eb9 100644
--- a/helpcontent2/source/text/scalc/01/04060109.xhp
+++ b/helpcontent2/source/text/scalc/01/04060109.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060109.xhp,v $
- * $Revision: 1.20 $
+ * $Revision: 1.20.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060109xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060109xml" indexer="include">
<title id="tit" xml-lang="en-US">Spreadsheet Functions</title>
<filename>/text/scalc/01/04060109.xhp</filename>
</topic>
@@ -53,13 +51,26 @@
<section id="howtoget">
<embed href="text/scalc/00/00000404.xhp#efefft"/>
</section>
-<sort order="asc"><section id="Section1">
+<sort order="asc">
+<section id="Section1">
<bookmark xml-lang="en-US" branch="index" id="bm_id3146968"><bookmark_value>ADDRESS function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ADRESSE" id="bm_id3147546" localize="false"/><paragraph role="heading" id="hd_id3146968" xml-lang="en-US" level="2" l10n="U" oldref="3">ADDRESS</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ADRESSE" id="bm_id3147546" localize="false"/>
+<paragraph role="heading" id="hd_id3146968" xml-lang="en-US" level="2" l10n="U" oldref="3">ADDRESS</paragraph>
<paragraph role="paragraph" id="par_id3155762" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="HID_FUNC_ADRESSE">Returns a cell address (reference) as text, according to the specified row and column numbers.</ahelp> You can determine whether the address is interpreted as an absolute address (for example, $A$1) or as a relative address (as A1) or in a mixed form (A$1 or $A1). You can also specify the name of the sheet.</paragraph>
+<section id="r1c1">
+<paragraph role="paragraph" id="par_id1027200802301348" xml-lang="en-US" l10n="NEW">For interoperability the ADDRESS and INDIRECT functions support an optional parameter to specify whether the R1C1 address notation instead of the usual A1 notation should be used.</paragraph>
+<paragraph role="paragraph" id="par_id1027200802301445" xml-lang="en-US" l10n="NEW">In ADDRESS, the parameter is inserted as the fourth parameter, shifting the optional sheet name parameter to the fifth position.</paragraph>
+<paragraph role="paragraph" id="par_id102720080230153" xml-lang="en-US" l10n="NEW">In INDIRECT, the parameter is appended as the second parameter.</paragraph>
+<paragraph role="paragraph" id="par_id102720080230151" xml-lang="en-US" l10n="NEW">In both functions, if the argument is inserted with the value 0, then the R1C1 notation is used. If the argument is not given or has a value other than 0, then the A1 notation is used. </paragraph>
+<paragraph role="paragraph" id="par_id1027200802301556" xml-lang="en-US" l10n="NEW">In case of R1C1 notation, ADDRESS returns address strings using the exclamation mark '!' as the sheet name separator, and INDIRECT expects the exclamation mark as sheet name separator. Both functions still use the dot '.' sheet name separator with A1 notation.</paragraph>
+<paragraph role="paragraph" id="par_id1027200802301521" xml-lang="en-US" l10n="NEW">When opening documents from ODF 1.0/1.1 format, the ADDRESS functions that show a sheet name as the fourth paramater will shift that sheet name to become the fifth parameter. A new fourth parameter with the value 1 will be inserted.</paragraph>
+<paragraph role="paragraph" id="par_id1027200802301650" xml-lang="en-US" l10n="NEW">When storing a document in ODF 1.0/1.1 format, if ADDRESS functions have a fourth parameter, that parameter will be removed.</paragraph>
+<paragraph role="note" id="par_id102720080230162" xml-lang="en-US" l10n="NEW">Do not save a spreadsheet in the old ODF 1.0/1.1 format if the ADDRESS function's new fourth parameter was used with a value of 0.</paragraph>
+<paragraph role="note" id="par_id1027200802301756" xml-lang="en-US" l10n="NEW">The INDIRECT function is saved without conversion to ODF 1.0/1.1 format. If the second parameter was present, an older version of Calc will return an error for that function.</paragraph>
+</section>
<paragraph role="heading" id="hd_id3151196" xml-lang="en-US" level="3" l10n="U" oldref="5">Syntax</paragraph>
-<paragraph role="code" id="par_id3154707" xml-lang="en-US" l10n="U" oldref="6">ADDRESS(Row; Column; Abs; "Sheet")</paragraph>
+<paragraph role="code" id="par_id3154707" xml-lang="en-US" l10n="U" oldref="6">ADDRESS(Row; Column; Abs; A1; "Sheet")</paragraph>
<paragraph role="paragraph" id="par_id3147505" xml-lang="en-US" l10n="U" oldref="7">
<emph>Row</emph> represents the row number for the cell reference</paragraph>
<paragraph role="paragraph" id="par_id3145323" xml-lang="en-US" l10n="U" oldref="8">
@@ -70,6 +81,8 @@
<paragraph role="paragraph" id="par_id3150431" xml-lang="en-US" l10n="U" oldref="11">2: row reference type is absolute; column reference is relative (A$1)</paragraph>
<paragraph role="paragraph" id="par_id3146096" xml-lang="en-US" l10n="U" oldref="12">3: row (relative); column (absolute) ($A1)</paragraph>
<paragraph role="paragraph" id="par_id3153334" xml-lang="en-US" l10n="U" oldref="13">4: relative (A1)</paragraph>
+<paragraph role="paragraph" id="par_id1027200802465915" xml-lang="en-US" l10n="NEW">
+<emph>A1</emph> (optional) - if set to 0, the R1C1 notation is used. If this parameter is absent or set to another value than 0, the A1 notation is used.</paragraph>
<paragraph role="paragraph" id="par_id3153962" xml-lang="en-US" l10n="U" oldref="14">
<emph>Sheet</emph> represents the name of the sheet. It must be placed in double quotes.</paragraph>
<paragraph role="heading" id="hd_id3147299" xml-lang="en-US" level="3" l10n="U" oldref="15">Example:</paragraph>
@@ -80,7 +93,8 @@
<section id="Section2">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150372"><bookmark_value>AREAS function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BEREICHE" id="bm_id3149721" localize="false"/><paragraph role="heading" id="hd_id3150372" xml-lang="en-US" level="2" l10n="U" oldref="19">AREAS</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BEREICHE" id="bm_id3149721" localize="false"/>
+<paragraph role="heading" id="hd_id3150372" xml-lang="en-US" level="2" l10n="U" oldref="19">AREAS</paragraph>
<paragraph role="paragraph" id="par_id3150036" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_FUNC_BEREICHE">Returns the number of individual ranges that belong to a multiple range.</ahelp> A range can consist of contiguous cells or a single cell.</paragraph>
<paragraph role="heading" id="hd_id3145222" xml-lang="en-US" level="3" l10n="U" oldref="21">Syntax</paragraph>
<paragraph role="code" id="par_id3155907" xml-lang="en-US" l10n="U" oldref="22">AREAS(Reference)</paragraph>
@@ -94,12 +108,13 @@
<section id="Section3">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148727"><bookmark_value>DDE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DDE" id="bm_id3154680" localize="false"/><paragraph role="heading" id="hd_id3148727" xml-lang="en-US" level="2" l10n="U" oldref="28">DDE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DDE" id="bm_id3154680" localize="false"/>
+<paragraph role="heading" id="hd_id3148727" xml-lang="en-US" level="2" l10n="U" oldref="28">DDE</paragraph>
<paragraph role="paragraph" id="par_id3149434" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_FUNC_DDE">Returns the result of a DDE-based link.</ahelp> If the contents of the linked range or section changes, the returned value will also change. You must reload the spreadsheet or choose <emph>Edit - Links</emph> to see the updated links. Cross-platform links, for example from a <item type="productname">%PRODUCTNAME</item> installation running on a Windows machine to a document created on a Linux machine, are not allowed.</paragraph>
<paragraph role="heading" id="hd_id3150700" xml-lang="en-US" level="3" l10n="U" oldref="30">Syntax</paragraph>
<paragraph role="code" id="par_id3148886" xml-lang="en-US" l10n="U" oldref="31">DDE("Server"; "File"; "Range"; Mode)</paragraph>
<paragraph role="paragraph" id="par_id3154842" xml-lang="en-US" l10n="U" oldref="32">
-<emph>Server</emph> is the name of a server application. <item type="productname">%PRODUCTNAME</item> applications have the server name "Soffice".</paragraph>
+<emph>Server</emph> is the name of a server application. <item type="productname">%PRODUCTNAME</item>applications have the server name "Soffice".</paragraph>
<paragraph role="paragraph" id="par_id3153034" xml-lang="en-US" l10n="U" oldref="33">
<emph>File</emph> is the complete file name, including path specification.</paragraph>
<paragraph role="paragraph" id="par_id3147472" xml-lang="en-US" l10n="U" oldref="34">
@@ -108,42 +123,43 @@
<emph>Mode</emph> is an optional parameter that controls the method by which the DDE server converts its data into numbers.</paragraph>
<table id="tbl_id3155828">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154383" xml-lang="en-US" l10n="U" oldref="185">
<emph>Mode</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145146" xml-lang="en-US" l10n="U" oldref="186">
<emph>Effect</emph>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154558" xml-lang="en-US" l10n="U" oldref="187">0 or missing</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145596" xml-lang="en-US" l10n="U" oldref="188">Number format from the "Default" cell style</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152785" xml-lang="en-US" l10n="U" oldref="189">1</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="U" oldref="190">Data are always interpreted in the standard format for US English</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150279" xml-lang="en-US" l10n="U" oldref="191">2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153775" xml-lang="en-US" l10n="U" oldref="192">Data are retrieved as text; no conversion to numbers</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3149546" xml-lang="en-US" level="3" l10n="U" oldref="35">Example</paragraph>
<paragraph role="paragraph" id="par_id3148734" xml-lang="en-US" l10n="U" oldref="36">
<item type="input">=DDE("soffice";"c:\office\document\data1.sxc";"sheet1.A1")</item> reads the contents of cell A1 in sheet1 of the <item type="productname">%PRODUCTNAME</item> Calc spreadsheet data1.sxc.</paragraph>
@@ -153,7 +169,8 @@
<section id="Section4">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153114"><bookmark_value>ERRORTYPE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FEHLERTYP" id="bm_id3153000" localize="false"/><paragraph role="heading" id="hd_id3153114" xml-lang="en-US" level="2" l10n="U" oldref="38">ERRORTYPE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FEHLERTYP" id="bm_id3153000" localize="false"/>
+<paragraph role="heading" id="hd_id3153114" xml-lang="en-US" level="2" l10n="U" oldref="38">ERRORTYPE</paragraph>
<paragraph role="paragraph" id="par_id3148568" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="HID_FUNC_FEHLERTYP">Returns the number corresponding to an <link href="text/scalc/05/02140000.xhp" name="error value">error value</link> occurring in a different cell.</ahelp> With the aid of this number, you can generate an error message text.</paragraph>
<embed href="text/shared/00/00000001.xhp#wahr"/>
<paragraph role="note" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="40">The Status Bar displays the predefined error code from <item type="productname">%PRODUCTNAME</item> if you click the cell containing the error.</paragraph>
@@ -167,7 +184,8 @@
<section id="Section5">
<bookmark xml-lang="en-US" branch="index" id="bm_id3151221"><bookmark_value>INDEX function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_INDEX" id="bm_id3157989" localize="false"/><paragraph role="heading" id="hd_id3151221" xml-lang="en-US" level="2" l10n="U" oldref="47">INDEX</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_INDEX" id="bm_id3157989" localize="false"/>
+<paragraph role="heading" id="hd_id3151221" xml-lang="en-US" level="2" l10n="U" oldref="47">INDEX</paragraph>
<paragraph role="paragraph" id="par_id3150268" xml-lang="en-US" l10n="CHG" oldref="48"><ahelp hid="HID_FUNC_INDEX">INDEX returns a sub range, specified by row and column number, or an optional range index. Depending on context, INDEX returns a reference or content.</ahelp><comment>UFI: will change with i4904; see http://so-web.germany.sun.com/iBIS/servlet/edit.ControlPanel?tid=i57108</comment><comment>changed by i83070</comment></paragraph>
<paragraph role="heading" id="hd_id3156063" xml-lang="en-US" level="3" l10n="U" oldref="49">Syntax</paragraph>
<paragraph role="code" id="par_id3149007" xml-lang="en-US" l10n="U" oldref="50">INDEX(Reference; Row; Column; Range)</paragraph>
@@ -198,12 +216,16 @@
<section id="Section6">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153181"><bookmark_value>INDIRECT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_INDIREKT" id="bm_id3153922" localize="false"/><paragraph role="heading" id="hd_id3153181" xml-lang="en-US" level="2" l10n="U" oldref="62">INDIRECT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_INDIREKT" id="bm_id3153922" localize="false"/>
+<paragraph role="heading" id="hd_id3153181" xml-lang="en-US" level="2" l10n="U" oldref="62">INDIRECT</paragraph>
<paragraph role="paragraph" id="par_id3147169" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="HID_FUNC_INDIREKT">Returns the <emph>reference</emph> specified by a text string.</ahelp> This function can also be used to return the area of a corresponding string.</paragraph>
+<embed href="text/scalc/01/04060109.xhp#r1c1"/>
<paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="3" l10n="U" oldref="64">Syntax</paragraph>
-<paragraph role="code" id="par_id3149824" xml-lang="en-US" l10n="U" oldref="65">INDIRECT(Ref)</paragraph>
+<paragraph role="code" id="par_id3149824" xml-lang="en-US" l10n="U" oldref="65">INDIRECT(Ref; A1)</paragraph>
<paragraph role="paragraph" id="par_id3154317" xml-lang="en-US" l10n="U" oldref="66">
<emph>Ref</emph> represents a reference to a cell or an area (in text form) for which to return the contents.</paragraph>
+<paragraph role="paragraph" id="par_id1027200802470312" xml-lang="en-US" l10n="NEW">
+<emph>A1</emph> (optional) - if set to 0, the R1C1 notation is used. If this parameter is absent or set to another value than 0, the A1 notation is used.</paragraph>
<paragraph role="note" id="par_idN10CAE" xml-lang="en-US" l10n="NEW">If you open an Excel spreadsheet that uses indirect addresses calculated from string functions, the sheet addresses will not be translated automatically. For example, the Excel address in INDIRECT("filename!sheetname"&amp;B1) is not converted into the Calc address in INDIRECT("filename.sheetname"&amp;B1).<comment>UFI: for #i34465#</comment></paragraph>
<paragraph role="note" id="par_id7687917" xml-lang="en-US" l10n="NEW">INDIRECT cannot resolve range names as in INDIRECT("RangeName").<comment>i83070</comment></paragraph>
<paragraph role="heading" id="hd_id3150389" xml-lang="en-US" level="3" l10n="U" oldref="67">Example</paragraph>
@@ -212,75 +234,11 @@
<paragraph role="paragraph" id="par_id3083286" xml-lang="en-US" l10n="CHG" oldref="181">
<item type="input">=SUM(INDIRECT("a1:" &amp; ADDRESS(1;3)))</item> totals the cells in the area of A1 up to the cell with the address defined by row 1 and column 3. This means that area A1:C1 is totaled.</paragraph>
</section>
-<section id="Section21">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3691824"><bookmark_value>INFO function</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_INFO" id="bm_id5369426" localize="false"/><paragraph role="heading" id="hd_id5787224" xml-lang="en-US" level="2" l10n="NEW">INFO</paragraph>
-<paragraph role="paragraph" id="par_id1507309" xml-lang="en-US" l10n="NEW">Returns specific information about the current working environment. The function receives a single text argument and returns data depending on that parameter.</paragraph>
-<paragraph role="heading" id="hd_id7693411" xml-lang="en-US" level="3" l10n="NEW">Syntax</paragraph>
-<paragraph role="code" id="par_id3928952" xml-lang="en-US" l10n="NEW">INFO("Type")</paragraph>
-<paragraph role="paragraph" id="par_id5206762" xml-lang="en-US" l10n="NEW">The following table lists the values for the text parameter "<item type="literal">Type"</item> and the return values of the INFO function.</paragraph>
-<table id="tbl_id1342204">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id5735953" xml-lang="en-US" l10n="NEW">Value for "Type"<comment>Do not translate the text values in this column below</comment></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id8360850" xml-lang="en-US" l10n="NEW">Return value</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9648731" xml-lang="en-US" l10n="NEW">"osversion"</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id908841" xml-lang="en-US" l10n="NEW">Always "Windows (32-bit) NT 5.01", for compatibility reasons</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id8193914" xml-lang="en-US" l10n="NEW">"system"</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9841608" xml-lang="en-US" l10n="NEW">The type of the operating system. <br/>"WNT" for Microsoft Windows <br/>"LINUX" for Linux <br/>"SOLARIS" for Solaris</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2701803" xml-lang="en-US" l10n="NEW">"release"</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2136295" xml-lang="en-US" l10n="NEW">The product release identifier, for example "680m5(Build:9011)"</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9200109" xml-lang="en-US" l10n="NEW">"numfile"</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4186223" xml-lang="en-US" l10n="NEW">Always 1, for compatibility reasons</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id5766472" xml-lang="en-US" l10n="NEW">"recalc"</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1491134" xml-lang="en-US" l10n="NEW">Current formula recalculation mode, either "Automatic" or "Manual" (localized into %PRODUCTNAME language)</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="note" id="par_id1161534" xml-lang="en-US" l10n="NEW">Other spreadsheet applications may accept localized values for the <item type="literal">Type</item> parameter, but %PRODUCTNAME Calc will only accept the English values.</paragraph>
-<paragraph role="heading" id="hd_id5459456" xml-lang="en-US" level="3" l10n="NEW">Example</paragraph>
-<paragraph role="paragraph" id="par_id3994567" xml-lang="en-US" l10n="NEW">
-<item type="input">=INFO("release")</item> returns the product release number of the %PRODUCTNAME in use.<comment>Do not translate "release"</comment></paragraph>
-<paragraph role="paragraph" id="par_id2873622" xml-lang="en-US" l10n="NEW">
-<item type="input">=INFO(D5)</item> with cell D5 containing a text string <item type="input">system</item> returns the operation system type.<comment>Do not translate the hlp_literal system</comment></paragraph>
-</section>
<section id="Section7">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154818"><bookmark_value>COLUMN function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_SPALTE" id="bm_id3156378" localize="false"/><paragraph role="heading" id="hd_id3154818" xml-lang="en-US" level="2" l10n="U" oldref="70">COLUMN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_SPALTE" id="bm_id3156378" localize="false"/>
+<paragraph role="heading" id="hd_id3154818" xml-lang="en-US" level="2" l10n="U" oldref="70">COLUMN</paragraph>
<paragraph role="paragraph" id="par_id3149711" xml-lang="en-US" l10n="U" oldref="193"><ahelp hid="HID_FUNC_SPALTE">Returns the column number of a cell reference.</ahelp> If the reference is a cell the column number of the cell is returned; if the parameter is a cell area, the corresponding column numbers are returned in a single-row <link href="text/scalc/01/04060107.xhp#wasmatrix" name="array">array</link> if the formula is entered <link href="text/scalc/01/04060107.xhp#somatrixformel" name="as an array formula">as an array formula</link>. If the COLUMN function with an area reference parameter is not used for an array formula, only the column number of the first cell within the area is determined.</paragraph>
<paragraph role="heading" id="hd_id3149283" xml-lang="en-US" level="3" l10n="U" oldref="72">Syntax</paragraph>
<paragraph role="code" id="par_id3149447" xml-lang="en-US" l10n="U" oldref="73">COLUMN(Reference)</paragraph>
@@ -304,7 +262,8 @@
<section id="Section8">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154643"><bookmark_value>COLUMNS function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_SPALTEN" id="bm_id3156134" localize="false"/><paragraph role="heading" id="hd_id3154643" xml-lang="en-US" level="2" l10n="U" oldref="79">COLUMNS</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_SPALTEN" id="bm_id3156134" localize="false"/>
+<paragraph role="heading" id="hd_id3154643" xml-lang="en-US" level="2" l10n="U" oldref="79">COLUMNS</paragraph>
<paragraph role="paragraph" id="par_id3151182" xml-lang="en-US" l10n="U" oldref="80"><ahelp hid="HID_FUNC_SPALTEN">Returns the number of columns in the given reference.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149141" xml-lang="en-US" level="3" l10n="U" oldref="81">Syntax</paragraph>
<paragraph role="code" id="par_id3154047" xml-lang="en-US" l10n="U" oldref="82">COLUMNS(Array)</paragraph>
@@ -322,7 +281,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3153152"><bookmark_value>vertical search function</bookmark_value>
<bookmark_value>VLOOKUP function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_SVERWEIS" id="bm_id3152809" localize="false"/><paragraph role="heading" id="hd_id3153152" xml-lang="en-US" level="2" l10n="U" oldref="87">VLOOKUP</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_SVERWEIS" id="bm_id3152809" localize="false"/>
+<paragraph role="heading" id="hd_id3153152" xml-lang="en-US" level="2" l10n="U" oldref="87">VLOOKUP</paragraph>
<paragraph role="paragraph" id="par_id3149984" xml-lang="en-US" l10n="CHG" oldref="88"><ahelp hid="HID_FUNC_SVERWEIS">Vertical search with reference to adjacent cells to the right.</ahelp> This function checks if a specific value is contained in the first column of an array. The function then returns the value in the same row of the column named by <item type="literal">Index</item>. If the <item type="literal">SortOrder</item> parameter is omitted or set to TRUE or one, it is assumed that the data is sorted in ascending order. In this case, if the exact <item type="literal">SearchCriterion</item> is not found, the last value that is smaller than the criterion will be returned. If <item type="literal">SortOrder</item> is set to FALSE or zero, an exact match must be found, otherwise the error <emph>Error: Value Not Available</emph> will be the result. Thus with a value of zero the data does not need to be sorted in ascending order.</paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3146898" xml-lang="en-US" level="3" l10n="U" oldref="89">Syntax</paragraph>
@@ -348,7 +308,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3153905"><bookmark_value>sheet numbers; looking up</bookmark_value>
<bookmark_value>SHEET function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_TABELLE" id="bm_id3154693" localize="false"/><paragraph role="heading" id="hd_id3153905" xml-lang="en-US" level="2" l10n="U" oldref="215">SHEET</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_TABELLE" id="bm_id3154693" localize="false"/>
+<paragraph role="heading" id="hd_id3153905" xml-lang="en-US" level="2" l10n="U" oldref="215">SHEET</paragraph>
<paragraph role="paragraph" id="par_id3150309" xml-lang="en-US" l10n="U" oldref="216"><ahelp hid="HID_FUNC_TABELLE">Returns the sheet number of a reference or a string representing a sheet name.</ahelp> If you do not enter any parameters, the result is the sheet number of the spreadsheet containing the formula.</paragraph>
<paragraph role="heading" id="hd_id3148564" xml-lang="en-US" level="3" l10n="U" oldref="217">Syntax</paragraph>
<paragraph role="code" id="par_id3153095" xml-lang="en-US" l10n="U" oldref="218">SHEET(Reference)</paragraph>
@@ -362,7 +323,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3148829"><bookmark_value>number of sheets; function</bookmark_value>
<bookmark_value>SHEETS function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_TABELLEN" id="bm_id3150524" localize="false"/><paragraph role="heading" id="hd_id3148829" xml-lang="en-US" level="2" l10n="U" oldref="222">SHEETS</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_TABELLEN" id="bm_id3150524" localize="false"/>
+<paragraph role="heading" id="hd_id3148829" xml-lang="en-US" level="2" l10n="U" oldref="222">SHEETS</paragraph>
<paragraph role="paragraph" id="par_id3148820" xml-lang="en-US" l10n="U" oldref="223"><ahelp hid="HID_FUNC_TABELLEN">Determines the number of sheets in a reference.</ahelp> If you do not enter any parameters, it returns the number of sheets in the current document.</paragraph>
<paragraph role="heading" id="hd_id3154220" xml-lang="en-US" level="3" l10n="U" oldref="224">Syntax</paragraph>
<paragraph role="code" id="par_id3150777" xml-lang="en-US" l10n="U" oldref="225">SHEETS(Reference)</paragraph>
@@ -375,7 +337,8 @@
<section id="Section12">
<bookmark xml-lang="en-US" branch="index" id="bm_id3158407"><bookmark_value>MATCH function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_VERGLEICH" id="bm_id3154210" localize="false"/><paragraph role="heading" id="hd_id3158407" xml-lang="en-US" level="2" l10n="U" oldref="101">MATCH</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_VERGLEICH" id="bm_id3154210" localize="false"/>
+<paragraph role="heading" id="hd_id3158407" xml-lang="en-US" level="2" l10n="U" oldref="101">MATCH</paragraph>
<paragraph role="paragraph" id="par_id3154896" xml-lang="en-US" l10n="U" oldref="102"><ahelp hid="HID_FUNC_VERGLEICH">Returns the relative position of an item in an array that matches a specified value.</ahelp> The function returns the position of the value found in the lookup_array as a number.</paragraph>
<paragraph role="heading" id="hd_id3153834" xml-lang="en-US" level="3" l10n="U" oldref="103">Syntax</paragraph>
<paragraph role="code" id="par_id3159152" xml-lang="en-US" l10n="U" oldref="104">MATCH(SearchCriterion; LookupArray; Type)</paragraph>
@@ -395,7 +358,8 @@
<section id="Section13">
<bookmark xml-lang="en-US" branch="index" id="bm_id3158430"><bookmark_value>OFFSET function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_VERSCHIEBUNG" id="bm_id3148926" localize="false"/><paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="2" l10n="U" oldref="111">OFFSET</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_VERSCHIEBUNG" id="bm_id3148926" localize="false"/>
+<paragraph role="heading" id="hd_id3158430" xml-lang="en-US" level="2" l10n="U" oldref="111">OFFSET</paragraph>
<paragraph role="paragraph" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="112"><ahelp hid="HID_FUNC_VERSCHIEBUNG">Returns the value of a cell offset by a certain number of rows and columns from a given reference point.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146952" xml-lang="en-US" level="3" l10n="U" oldref="113">Syntax</paragraph>
<paragraph role="code" id="par_id3159194" xml-lang="en-US" l10n="U" oldref="114">OFFSET(Reference; Rows; Columns; Height; Width)</paragraph>
@@ -431,7 +395,8 @@
<section id="Section14">
<bookmark xml-lang="en-US" branch="index" id="bm_id3159273"><bookmark_value>LOOKUP function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_VERWEIS" id="bm_id3152877" localize="false"/><paragraph role="heading" id="hd_id3159273" xml-lang="en-US" level="2" l10n="U" oldref="123">LOOKUP</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_VERWEIS" id="bm_id3152877" localize="false"/>
+<paragraph role="heading" id="hd_id3159273" xml-lang="en-US" level="2" l10n="U" oldref="123">LOOKUP</paragraph>
<paragraph role="paragraph" id="par_id3153389" xml-lang="en-US" l10n="CHG" oldref="124"><ahelp hid="HID_FUNC_VERWEIS">Returns the contents of a cell either from a one-row or one-column range.</ahelp> Optionally, the assigned value (of the same index) is returned in a different column and row. As opposed to <link href="text/scalc/01/04060109.xhp" name="VLOOKUP">VLOOKUP</link> and <link href="text/scalc/01/04060109.xhp" name="HLOOKUP">HLOOKUP</link>, search and result vector may be at different positions; they do not have to be adjacent. Additionally, the search vector for the LOOKUP must be sorted ascending, otherwise the search will not return any usable results.</paragraph>
<paragraph role="note" id="par_id4484084" xml-lang="en-US" l10n="NEW">If LOOKUP cannot find the search criterion, it matches the largest value in the search vector that is less than or equal to the search criterion.</paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
@@ -451,7 +416,8 @@
<section id="Section15">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149425"><bookmark_value>STYLE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_VORLAGE" id="bm_id3154342" localize="false"/><paragraph role="heading" id="hd_id3149425" xml-lang="en-US" level="2" l10n="U" oldref="133">STYLE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_VORLAGE" id="bm_id3154342" localize="false"/>
+<paragraph role="heading" id="hd_id3149425" xml-lang="en-US" level="2" l10n="U" oldref="133">STYLE</paragraph>
<paragraph role="paragraph" id="par_id3150826" xml-lang="en-US" l10n="U" oldref="134"><ahelp hid="HID_FUNC_VORLAGE">Applies a style to the cell containing the formula.</ahelp> After a set amount of time, another style can be applied. This function always returns the value 0, allowing you to add it to another function without changing the value. Together with the CURRENT function you can apply a color to a cell regardless of the value. For example: =...+STYLE(IF(CURRENT()&gt;3;"red";"green")) applies the style "red" to the cell if the value is greater than 3, otherwise the style "green" is applied. Both cell formats have to be defined beforehand.</paragraph>
<paragraph role="heading" id="hd_id3145373" xml-lang="en-US" level="3" l10n="U" oldref="135">Syntax</paragraph>
<paragraph role="code" id="par_id3149302" xml-lang="en-US" l10n="U" oldref="136">STYLE("Style"; Time; "Style2")</paragraph>
@@ -476,7 +442,8 @@
<section id="Section16">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150430"><bookmark_value>CHOOSE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WAHL" id="bm_id3153947" localize="false"/><paragraph role="heading" id="hd_id3150430" xml-lang="en-US" level="2" l10n="U" oldref="142">CHOOSE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WAHL" id="bm_id3153947" localize="false"/>
+<paragraph role="heading" id="hd_id3150430" xml-lang="en-US" level="2" l10n="U" oldref="142">CHOOSE</paragraph>
<paragraph role="paragraph" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="143"><ahelp hid="HID_FUNC_WAHL">Uses an index to return a value from a list of up to 30 values.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153533" xml-lang="en-US" level="3" l10n="U" oldref="144">Syntax</paragraph>
<paragraph role="code" id="par_id3155425" xml-lang="en-US" l10n="U" oldref="145">CHOOSE(Index; Value1; ...; Value30)</paragraph>
@@ -491,7 +458,8 @@
<section id="Section17">
<bookmark xml-lang="en-US" branch="index" id="bm_id3151001"><bookmark_value>HLOOKUP function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WVERWEIS" id="bm_id3149481" localize="false"/><paragraph role="heading" id="hd_id3151001" xml-lang="en-US" level="2" l10n="U" oldref="151">HLOOKUP</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WVERWEIS" id="bm_id3149481" localize="false"/>
+<paragraph role="heading" id="hd_id3151001" xml-lang="en-US" level="2" l10n="U" oldref="151">HLOOKUP</paragraph>
<paragraph role="paragraph" id="par_id3148688" xml-lang="en-US" l10n="U" oldref="152"><ahelp hid="HID_FUNC_WVERWEIS">Searches for a value and reference to the cells below the selected area.</ahelp> This function verifies if the first row of an array contains a certain value. The function returns then the value in a row of the array, named in the <emph>Index</emph>, in the same column.</paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3154661" xml-lang="en-US" level="3" l10n="U" oldref="153">Syntax</paragraph>
@@ -502,7 +470,8 @@
<section id="Section18">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147321"><bookmark_value>ROW function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZEILE" id="bm_id3147333" localize="false"/><paragraph role="heading" id="hd_id3147321" xml-lang="en-US" level="2" l10n="U" oldref="157">ROW</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZEILE" id="bm_id3147333" localize="false"/>
+<paragraph role="heading" id="hd_id3147321" xml-lang="en-US" level="2" l10n="U" oldref="157">ROW</paragraph>
<paragraph role="paragraph" id="par_id3154564" xml-lang="en-US" l10n="U" oldref="203"><ahelp hid="HID_FUNC_ZEILE">Returns the row number of a cell reference.</ahelp> If the reference is a cell, it returns the row number of the cell. If the reference is a cell range, it returns the corresponding row numbers in a one-column <link href="text/scalc/01/04060107.xhp#wasmatrix" name="Array">Array</link> if the formula is entered <link href="text/scalc/01/04060107.xhp#somatrixformel" name="as an array formula">as an array formula</link>. If the ROW function with a range reference is not used in an array formula, only the row number of the first range cell will be returned.</paragraph>
<paragraph role="heading" id="hd_id3158439" xml-lang="en-US" level="3" l10n="U" oldref="159">Syntax</paragraph>
<paragraph role="code" id="par_id3154916" xml-lang="en-US" l10n="U" oldref="160">ROW(Reference)</paragraph>
@@ -526,7 +495,8 @@
<section id="Section19">
<bookmark xml-lang="en-US" branch="index" id="bm_id3145772"><bookmark_value>ROWS function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZEILEN" id="bm_id3150667" localize="false"/><paragraph role="heading" id="hd_id3145772" xml-lang="en-US" level="2" l10n="U" oldref="166">ROWS</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZEILEN" id="bm_id3150667" localize="false"/>
+<paragraph role="heading" id="hd_id3145772" xml-lang="en-US" level="2" l10n="U" oldref="166">ROWS</paragraph>
<paragraph role="paragraph" id="par_id3148971" xml-lang="en-US" l10n="U" oldref="167"><ahelp hid="HID_FUNC_ZEILEN">Returns the number of rows in a reference or array.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156051" xml-lang="en-US" level="3" l10n="U" oldref="168">Syntax</paragraph>
<paragraph role="code" id="par_id3154357" xml-lang="en-US" l10n="U" oldref="169">ROWS(Array)</paragraph>
@@ -569,7 +539,8 @@
<section id="getpivotdata">
<bookmark xml-lang="en-US" branch="index" id="bm_id7682424"><bookmark_value>GETPIVOTDATA function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GETPIVOTDATA" id="bm_id897854" localize="false"/><paragraph role="heading" id="hd_id3747062" xml-lang="en-US" level="2" l10n="NEW">GETPIVOTDATA</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GETPIVOTDATA" id="bm_id897854" localize="false"/>
+<paragraph role="heading" id="hd_id3747062" xml-lang="en-US" level="2" l10n="NEW">GETPIVOTDATA</paragraph>
<paragraph role="paragraph" id="par_id3593859" xml-lang="en-US" l10n="NEW"><ahelp hid=".">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.</ahelp></paragraph>
<paragraph role="heading" id="hd_id9741508" xml-lang="en-US" level="3" l10n="NEW">Syntax</paragraph>
<paragraph role="paragraph" id="par_id909451" xml-lang="en-US" l10n="NEW">Two different syntax definitions can be used:</paragraph>
@@ -593,6 +564,11 @@
<emph>Constraints</emph> 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.</paragraph>
<paragraph role="paragraph" id="par_id4076357" xml-lang="en-US" l10n="NEW">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. </paragraph>
<paragraph role="paragraph" id="par_id8231757" xml-lang="en-US" l10n="CHG">Each of the other entries specifies a constraint in the form <item type="literal">Field[Item]</item> (with literal characters [ and ]), or only <item type="literal">Item</item> if the item name is unique within all fields that are used in the DataPilot table.<comment>i82342</comment></paragraph>
-<paragraph role="paragraph" id="par_id3168736" xml-lang="en-US" l10n="CHG">A function name can be added in the form <emph>Field[Item;Function]</emph>, 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.</paragraph><comment>UFI: Example from spec doc is quite difficult to localize. Try to find other one</comment></section>
-</sort></body>
+<paragraph role="paragraph" id="par_id3168736" xml-lang="en-US" l10n="CHG">A function name can be added in the form <emph>Field[Item;Function]</emph>, 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.</paragraph><comment>UFI: Example from spec doc is quite difficult to localize. Try to find other one</comment>
+</section>
+</sort>
+<section id="relatedtopics">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060110.xhp b/helpcontent2/source/text/scalc/01/04060110.xhp
index 280a3b133f..4cebc8fbbb 100644
--- a/helpcontent2/source/text/scalc/01/04060110.xhp
+++ b/helpcontent2/source/text/scalc/01/04060110.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060110.xhp,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060110xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060110xml" indexer="include">
<title id="tit" xml-lang="en-US">Text Functions</title>
<filename>/text/scalc/01/04060110.xhp</filename>
</topic>
@@ -51,12 +49,14 @@
<paragraph role="paragraph" id="par_id3152986" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="texttext">This section contains descriptions of the <emph>Text</emph> functions.
</variable></paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000404.xhp#eikatext"/>
+<embed href="text/scalc/00/00000404.xhp#eikatext"/>
</section>
-<sort order="asc"><section id="arabic">
+<sort order="asc">
+<section id="arabic">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149384"><bookmark_value>ARABIC function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ARABISCH" id="bm_id3145359" localize="false"/><paragraph role="heading" id="hd_id3149384" xml-lang="en-US" level="2" l10n="U" oldref="239">ARABIC</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ARABISCH" id="bm_id3145359" localize="false"/>
+<paragraph role="heading" id="hd_id3149384" xml-lang="en-US" level="2" l10n="U" oldref="239">ARABIC</paragraph>
<paragraph role="paragraph" id="par_id3153558" xml-lang="en-US" l10n="U" oldref="240"><ahelp hid="HID_FUNC_ARABISCH">Calculates the value of a Roman number. The value range must be between 0 and 3999.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153011" xml-lang="en-US" level="3" l10n="U" oldref="241">Syntax</paragraph>
<paragraph role="code" id="par_id3155523" xml-lang="en-US" l10n="U" oldref="242">ARABIC("Text")</paragraph>
@@ -71,7 +71,8 @@
<section id="asc">
<bookmark xml-lang="en-US" branch="index" id="bm_id8796349"><bookmark_value>ASC function</bookmark_value>
</bookmark><comment>i79585</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ASC" id="bm_id3187353" localize="false"/><paragraph role="heading" id="hd_id7723929" xml-lang="en-US" level="2" l10n="NEW">ASC</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ASC" id="bm_id3187353" localize="false"/>
+<paragraph role="heading" id="hd_id7723929" xml-lang="en-US" level="2" l10n="NEW">ASC</paragraph>
<paragraph role="paragraph" id="par_id8455153" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The ASC function converts full-width to half-width ASCII and katakana characters. Returns a text string.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id9912411" xml-lang="en-US" l10n="NEW">See <link href="http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions">http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions</link> for a conversion table.</paragraph>
<paragraph role="heading" id="hd_id9204992" xml-lang="en-US" level="3" l10n="NEW">Syntax</paragraph>
@@ -83,7 +84,8 @@
<section id="bahttext">
<bookmark xml-lang="en-US" branch="index" id="bm_id9323709"><bookmark_value>BAHTTEXT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BAHTTEXT" id="bm_id744346" localize="false"/><comment>i66350</comment><paragraph role="heading" id="hd_id6695455" xml-lang="en-US" level="2" l10n="NEW">BAHTTEXT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BAHTTEXT" id="bm_id744346" localize="false"/><comment>i66350</comment>
+<paragraph role="heading" id="hd_id6695455" xml-lang="en-US" level="2" l10n="NEW">BAHTTEXT</paragraph>
<paragraph role="paragraph" id="par_id354014" xml-lang="en-US" l10n="NEW">Converts a number to Thai text, including the Thai currency names.</paragraph>
<paragraph role="heading" id="hd_id9942014" xml-lang="en-US" level="3" l10n="NEW">Syntax</paragraph>
<paragraph role="code" id="par_id8780785" xml-lang="en-US" l10n="NEW">BAHTTEXT(Number)</paragraph>
@@ -96,7 +98,8 @@
<section id="base">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153072"><bookmark_value>BASE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BASIS" id="bm_id3150957" localize="false"/><paragraph role="heading" id="hd_id3153072" xml-lang="en-US" level="2" l10n="U" oldref="213">BASE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BASIS" id="bm_id3150957" localize="false"/>
+<paragraph role="heading" id="hd_id3153072" xml-lang="en-US" level="2" l10n="U" oldref="213">BASE</paragraph>
<paragraph role="paragraph" id="par_id3153289" xml-lang="en-US" l10n="U" oldref="214"><ahelp hid="HID_FUNC_BASIS">Converts a positive integer to a specified base into a text from the <link href="text/shared/00/00000005.xhp#zahlensystem" name="numbering system">numbering system</link>.</ahelp> The digits 0-9 and the letters A-Z are used.</paragraph>
<paragraph role="heading" id="hd_id3146097" xml-lang="en-US" level="3" l10n="U" oldref="215">Syntax</paragraph>
<paragraph role="code" id="par_id3155743" xml-lang="en-US" l10n="U" oldref="216">BASE(Number; Radix; [MinimumLength])</paragraph>
@@ -123,7 +126,8 @@
<section id="char">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149321"><bookmark_value>CHAR function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZEICHEN" id="bm_id3159128" localize="false"/><paragraph role="heading" id="hd_id3149321" xml-lang="en-US" level="2" l10n="U" oldref="201">CHAR</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZEICHEN" id="bm_id3159128" localize="false"/>
+<paragraph role="heading" id="hd_id3149321" xml-lang="en-US" level="2" l10n="U" oldref="201">CHAR</paragraph>
<paragraph role="paragraph" id="par_id3149150" xml-lang="en-US" l10n="U" oldref="202"><ahelp hid="HID_FUNC_ZEICHEN">Converts a number into a character according to the current code table.</ahelp> The number can be a two-digit or three-digit integer number.</paragraph>
<embed href="text/scalc/00/00000004.xhp#codes"/>
<paragraph role="heading" id="hd_id3149945" xml-lang="en-US" level="3" l10n="U" oldref="203">Syntax</paragraph>
@@ -137,7 +141,8 @@
<section id="clean">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149009"><bookmark_value>CLEAN function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_SAEUBERN" id="bm_id3148729" localize="false"/><paragraph role="heading" id="hd_id3149009" xml-lang="en-US" level="2" l10n="U" oldref="132">CLEAN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_SAEUBERN" id="bm_id3148729" localize="false"/>
+<paragraph role="heading" id="hd_id3149009" xml-lang="en-US" level="2" l10n="U" oldref="132">CLEAN</paragraph>
<paragraph role="paragraph" id="par_id3150482" xml-lang="en-US" l10n="U" oldref="133"><ahelp hid="HID_FUNC_SAEUBERN">All non-printing characters are removed from the string.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146880" xml-lang="en-US" level="3" l10n="U" oldref="134">Syntax</paragraph>
<paragraph role="code" id="par_id3147472" xml-lang="en-US" l10n="U" oldref="135">CLEAN("Text")</paragraph>
@@ -147,7 +152,8 @@
<section id="code">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155498"><bookmark_value>CODE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_CODE" id="bm_id3159084" localize="false"/><paragraph role="heading" id="hd_id3155498" xml-lang="en-US" level="2" l10n="U" oldref="3">CODE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_CODE" id="bm_id3159084" localize="false"/>
+<paragraph role="heading" id="hd_id3155498" xml-lang="en-US" level="2" l10n="U" oldref="3">CODE</paragraph>
<paragraph role="paragraph" id="par_id3152770" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_FUNC_CODE">Returns a numeric code for the first character in a text string.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155830" xml-lang="en-US" level="3" l10n="U" oldref="5">Syntax</paragraph>
<paragraph role="code" id="par_id3149188" xml-lang="en-US" l10n="U" oldref="6">CODE("Text")</paragraph>
@@ -162,7 +168,8 @@
<section id="concatenate">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149688"><bookmark_value>CONCATENATE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_VERKETTEN" id="bm_id3153084" localize="false"/><paragraph role="heading" id="hd_id3149688" xml-lang="en-US" level="2" l10n="U" oldref="167">CONCATENATE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_VERKETTEN" id="bm_id3153084" localize="false"/>
+<paragraph role="heading" id="hd_id3149688" xml-lang="en-US" level="2" l10n="U" oldref="167">CONCATENATE</paragraph>
<paragraph role="paragraph" id="par_id3154524" xml-lang="en-US" l10n="U" oldref="168"><ahelp hid="HID_FUNC_VERKETTEN">Combines several text strings into one string.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149542" xml-lang="en-US" level="3" l10n="U" oldref="169">Syntax</paragraph>
<paragraph role="code" id="par_id3155954" xml-lang="en-US" l10n="U" oldref="170">CONCATENATE("Text1"; ...; "Text30")</paragraph>
@@ -175,7 +182,8 @@
<section id="decimal">
<bookmark xml-lang="en-US" branch="index" id="bm_id3145166"><bookmark_value>DECIMAL function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DEZIMAL" id="bm_id3150338" localize="false"/><paragraph role="heading" id="hd_id3145166" xml-lang="en-US" level="2" l10n="U" oldref="225">DECIMAL</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DEZIMAL" id="bm_id3150338" localize="false"/>
+<paragraph role="heading" id="hd_id3145166" xml-lang="en-US" level="2" l10n="U" oldref="225">DECIMAL</paragraph>
<paragraph role="paragraph" id="par_id3156361" xml-lang="en-US" l10n="U" oldref="226"><ahelp hid="HID_FUNC_DEZIMAL">Converts text with characters from a <link href="text/shared/00/00000005.xhp#zahlensystem" name="number system">number system</link> to a positive integer in the base radix given.</ahelp> The radix must be in the range 2 to 36. Spaces and tabs are ignored. The <emph>Text</emph> field is not case-sensitive.</paragraph>
<paragraph role="paragraph" id="par_id3157994" xml-lang="en-US" l10n="U" oldref="227">If the radix is 16, a leading x or X or 0x or 0X, and an appended h or H, is disregarded. If the radix is 2, an appended b or B is disregarded. Other characters that do not belong to the number system generate an error.</paragraph>
<paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="3" l10n="U" oldref="228">Syntax</paragraph>
@@ -195,7 +203,8 @@
<section id="dollar">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148402"><bookmark_value>DOLLAR function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DM" id="bm_id3149532" localize="false"/><paragraph role="heading" id="hd_id3148402" xml-lang="en-US" level="2" l10n="U" oldref="11">DOLLAR</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_DM" id="bm_id3149532" localize="false"/>
+<paragraph role="heading" id="hd_id3148402" xml-lang="en-US" level="2" l10n="U" oldref="11">DOLLAR</paragraph>
<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_FUNC_DM">Converts a number to an amount in the currency format, rounded to a specified decimal place.</ahelp> In the <item type="literal">Value</item> field enter the number to be converted to currency. Optionally, you may enter the number of decimal places in the <item type="literal">Decimals</item> field. If no value is specified, all numbers in currency format will be displayed with two decimal places. </paragraph>
<paragraph role="paragraph" id="par_id3151280" xml-lang="en-US" l10n="U" oldref="263">You set the currency format in your system settings.</paragraph>
<paragraph role="heading" id="hd_id3150569" xml-lang="en-US" level="3" l10n="U" oldref="13">Syntax</paragraph>
@@ -213,7 +222,8 @@
<section id="exact">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150685"><bookmark_value>EXACT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_IDENTISCH" id="bm_id3155081" localize="false"/><paragraph role="heading" id="hd_id3150685" xml-lang="en-US" level="2" l10n="U" oldref="78">EXACT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_IDENTISCH" id="bm_id3155081" localize="false"/>
+<paragraph role="heading" id="hd_id3150685" xml-lang="en-US" level="2" l10n="U" oldref="78">EXACT</paragraph>
<paragraph role="paragraph" id="par_id3158413" xml-lang="en-US" l10n="U" oldref="79"><ahelp hid="HID_FUNC_IDENTISCH">Compares two text strings and returns TRUE if they are identical.</ahelp> This function is case-sensitive.</paragraph>
<paragraph role="heading" id="hd_id3152817" xml-lang="en-US" level="3" l10n="U" oldref="80">Syntax</paragraph>
<paragraph role="code" id="par_id3148594" xml-lang="en-US" l10n="U" oldref="81">EXACT("Text1"; "Text2")</paragraph>
@@ -228,7 +238,8 @@
<section id="find">
<bookmark xml-lang="en-US" branch="index" id="bm_id3152589"><bookmark_value>FIND function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FINDEN" id="bm_id3147482" localize="false"/><paragraph role="heading" id="hd_id3152589" xml-lang="en-US" level="2" l10n="U" oldref="44">FIND</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FINDEN" id="bm_id3147482" localize="false"/>
+<paragraph role="heading" id="hd_id3152589" xml-lang="en-US" level="2" l10n="U" oldref="44">FIND</paragraph>
<paragraph role="paragraph" id="par_id3146149" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="HID_FUNC_FINDEN">Looks for a string of text within another string.</ahelp> You can also define where to begin the search. The search term can be a number or any string of characters. The search is case-sensitive.</paragraph>
<paragraph role="heading" id="hd_id3083284" xml-lang="en-US" level="3" l10n="U" oldref="46">Syntax</paragraph>
<paragraph role="code" id="par_id3083452" xml-lang="en-US" l10n="U" oldref="47">FIND("FindText"; "Text"; Position)</paragraph>
@@ -245,7 +256,8 @@
<section id="fixed">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149268"><bookmark_value>FIXED function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FEST" id="bm_id3149450" localize="false"/><paragraph role="heading" id="hd_id3149268" xml-lang="en-US" level="2" l10n="U" oldref="34">FIXED</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FEST" id="bm_id3149450" localize="false"/>
+<paragraph role="heading" id="hd_id3149268" xml-lang="en-US" level="2" l10n="U" oldref="34">FIXED</paragraph>
<paragraph role="paragraph" id="par_id3155833" xml-lang="en-US" l10n="CHG" oldref="35"><ahelp hid="HID_FUNC_FEST">Returns a number as text with a specified number of decimal places and optional thousands separators.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152470" xml-lang="en-US" level="3" l10n="U" oldref="36">Syntax</paragraph>
<paragraph role="code" id="par_id3147567" xml-lang="en-US" l10n="U" oldref="37">FIXED(Number; Decimals; NoThousandsSeparators)</paragraph>
@@ -264,7 +276,8 @@
<section id="jis">
<bookmark xml-lang="en-US" branch="index" id="bm_id7319864"><bookmark_value>JIS function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_JIS" id="bm_id3818475" localize="false"/><paragraph role="heading" id="hd_id3666188" xml-lang="en-US" level="2" l10n="NEW">JIS</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_JIS" id="bm_id3818475" localize="false"/>
+<paragraph role="heading" id="hd_id3666188" xml-lang="en-US" level="2" l10n="NEW">JIS</paragraph>
<paragraph role="paragraph" id="par_id964384" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The JIS function converts half-width to full-width ASCII and katakana characters. Returns a text string.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id1551561" xml-lang="en-US" l10n="NEW">See <link href="http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions">http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions</link> for a conversion table.</paragraph>
<paragraph role="heading" id="hd_id2212897" xml-lang="en-US" level="3" l10n="NEW">Syntax</paragraph>
@@ -276,7 +289,8 @@
<section id="left">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147083"><bookmark_value>LEFT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_LINKS" id="bm_id3154645" localize="false"/><paragraph role="heading" id="hd_id3147083" xml-lang="en-US" level="2" l10n="U" oldref="95">LEFT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_LINKS" id="bm_id3154645" localize="false"/>
+<paragraph role="heading" id="hd_id3147083" xml-lang="en-US" level="2" l10n="U" oldref="95">LEFT</paragraph>
<paragraph role="paragraph" id="par_id3153622" xml-lang="en-US" l10n="CHG" oldref="96"><ahelp hid="HID_FUNC_LINKS">Returns the first character or characters of a text.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156116" xml-lang="en-US" level="3" l10n="U" oldref="97">Syntax</paragraph>
<paragraph role="code" id="par_id3146786" xml-lang="en-US" l10n="U" oldref="98">LEFT("Text"; Number)</paragraph>
@@ -291,7 +305,8 @@
<section id="len">
<bookmark xml-lang="en-US" branch="index" id="bm_id3156110"><bookmark_value>LEN function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_LAENGE" id="bm_id3154050" localize="false"/><paragraph role="heading" id="hd_id3156110" xml-lang="en-US" level="2" l10n="U" oldref="104">LEN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_LAENGE" id="bm_id3154050" localize="false"/>
+<paragraph role="heading" id="hd_id3156110" xml-lang="en-US" level="2" l10n="U" oldref="104">LEN</paragraph>
<paragraph role="paragraph" id="par_id3150147" xml-lang="en-US" l10n="U" oldref="105"><ahelp hid="HID_FUNC_LAENGE">Returns the length of a string including spaces.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155108" xml-lang="en-US" level="3" l10n="U" oldref="106">Syntax</paragraph>
<paragraph role="code" id="par_id3154063" xml-lang="en-US" l10n="U" oldref="107">LEN("Text")</paragraph>
@@ -306,7 +321,8 @@
<section id="lower">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153983"><bookmark_value>LOWER function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KLEIN" id="bm_id3151173" localize="false"/><paragraph role="heading" id="hd_id3153983" xml-lang="en-US" level="2" l10n="U" oldref="87">LOWER</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KLEIN" id="bm_id3151173" localize="false"/>
+<paragraph role="heading" id="hd_id3153983" xml-lang="en-US" level="2" l10n="U" oldref="87">LOWER</paragraph>
<paragraph role="paragraph" id="par_id3152791" xml-lang="en-US" l10n="U" oldref="88"><ahelp hid="HID_FUNC_KLEIN">Converts all uppercase letters in a text string to lowercase.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155902" xml-lang="en-US" level="3" l10n="U" oldref="89">Syntax</paragraph>
<paragraph role="code" id="par_id3150121" xml-lang="en-US" l10n="U" oldref="90">LOWER("Text")</paragraph>
@@ -319,7 +335,8 @@
<section id="mid">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154589"><bookmark_value>MID function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_TEIL" id="bm_id3155392" localize="false"/><paragraph role="heading" id="hd_id3154589" xml-lang="en-US" level="2" l10n="U" oldref="148">MID</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_TEIL" id="bm_id3155392" localize="false"/>
+<paragraph role="heading" id="hd_id3154589" xml-lang="en-US" level="2" l10n="U" oldref="148">MID</paragraph>
<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="CHG" oldref="149"><ahelp hid="HID_FUNC_TEIL">Returns a text string of a text. The parameters specify the starting position and the number of characters.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148829" xml-lang="en-US" level="3" l10n="U" oldref="150">Syntax</paragraph>
<paragraph role="code" id="par_id3150526" xml-lang="en-US" l10n="U" oldref="151">MID("Text"; Start; Number)</paragraph>
@@ -336,7 +353,8 @@
<section id="proper">
<bookmark xml-lang="en-US" branch="index" id="bm_id3159143"><bookmark_value>PROPER function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GROSS2" id="bm_id3154897" localize="false"/><paragraph role="heading" id="hd_id3159143" xml-lang="en-US" level="2" l10n="U" oldref="70">PROPER</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GROSS2" id="bm_id3154897" localize="false"/>
+<paragraph role="heading" id="hd_id3159143" xml-lang="en-US" level="2" l10n="U" oldref="70">PROPER</paragraph>
<paragraph role="paragraph" id="par_id3149768" xml-lang="en-US" l10n="U" oldref="71"><ahelp hid="HID_FUNC_GROSS2">Capitalizes the first letter in all words of a text string.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153573" xml-lang="en-US" level="3" l10n="U" oldref="72">Syntax</paragraph>
<paragraph role="code" id="par_id3154260" xml-lang="en-US" l10n="U" oldref="73">PROPER("Text")</paragraph>
@@ -349,7 +367,8 @@
<section id="replace">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149171"><bookmark_value>REPLACE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ERSETZEN" id="bm_id3149990" localize="false"/><paragraph role="heading" id="hd_id3149171" xml-lang="en-US" level="2" l10n="U" oldref="22">REPLACE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ERSETZEN" id="bm_id3149990" localize="false"/>
+<paragraph role="heading" id="hd_id3149171" xml-lang="en-US" level="2" l10n="U" oldref="22">REPLACE</paragraph>
<paragraph role="paragraph" id="par_id3148925" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_FUNC_ERSETZEN">Replaces part of a text string with a different text string.</ahelp> This function can be used to replace both characters and numbers (which are automatically converted to text). The result of the function is always displayed as text. If you intend to perform further calculations with a number which has been replaced by text, you will need to convert it back to a number using the <link href="text/scalc/01/04060110.xhp" name="VALUE">VALUE</link> function.</paragraph>
<paragraph role="paragraph" id="par_id3158426" xml-lang="en-US" l10n="U" oldref="24">Any text containing numbers must be enclosed in quotation marks if you do not want it to be interpreted as a number and automatically converted to text.</paragraph>
<paragraph role="heading" id="hd_id3149159" xml-lang="en-US" level="3" l10n="U" oldref="25">Syntax</paragraph>
@@ -369,7 +388,8 @@
<section id="rept">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149741"><bookmark_value>REPT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WIEDERHOLEN" id="bm_id3155582" localize="false"/><paragraph role="heading" id="hd_id3149741" xml-lang="en-US" level="2" l10n="U" oldref="193">REPT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WIEDERHOLEN" id="bm_id3155582" localize="false"/>
+<paragraph role="heading" id="hd_id3149741" xml-lang="en-US" level="2" l10n="U" oldref="193">REPT</paragraph>
<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="194"><ahelp hid="HID_FUNC_WIEDERHOLEN">Repeats a character string by the given <emph>number</emph> of copies.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152884" xml-lang="en-US" level="3" l10n="U" oldref="195">Syntax</paragraph>
<paragraph role="code" id="par_id3150494" xml-lang="en-US" l10n="U" oldref="196">REPT("Text"; Number)</paragraph>
@@ -385,7 +405,8 @@
<section id="right">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149805"><bookmark_value>RIGHT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_RECHTS" id="bm_id3154602" localize="false"/><paragraph role="heading" id="hd_id3149805" xml-lang="en-US" level="2" l10n="U" oldref="113">RIGHT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_RECHTS" id="bm_id3154602" localize="false"/>
+<paragraph role="heading" id="hd_id3149805" xml-lang="en-US" level="2" l10n="U" oldref="113">RIGHT</paragraph>
<paragraph role="paragraph" id="par_id3145375" xml-lang="en-US" l10n="CHG" oldref="114"><ahelp hid="HID_FUNC_RECHTS">Returns the last character or characters of a text.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150837" xml-lang="en-US" level="3" l10n="U" oldref="115">Syntax</paragraph>
<paragraph role="code" id="par_id3154344" xml-lang="en-US" l10n="U" oldref="116">RIGHT("Text"; Number)</paragraph>
@@ -400,7 +421,8 @@
<section id="roman">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153534"><bookmark_value>ROMAN function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ROEMISCH" id="bm_id3144755" localize="false"/><paragraph role="heading" id="hd_id3153534" xml-lang="en-US" level="2" l10n="U" oldref="248">ROMAN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ROEMISCH" id="bm_id3144755" localize="false"/>
+<paragraph role="heading" id="hd_id3153534" xml-lang="en-US" level="2" l10n="U" oldref="248">ROMAN</paragraph>
<paragraph role="paragraph" id="par_id3151256" xml-lang="en-US" l10n="U" oldref="249"><ahelp hid="HID_FUNC_ROEMISCH">Converts a number into a Roman numeral. The value range must be between 0 and 3999, the modes can be integers from 0 to 4.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149299" xml-lang="en-US" level="3" l10n="U" oldref="250">Syntax</paragraph>
<paragraph role="code" id="par_id3150593" xml-lang="en-US" l10n="U" oldref="251">ROMAN(Number; Mode)</paragraph>
@@ -425,7 +447,8 @@
<section id="search">
<bookmark xml-lang="en-US" branch="index" id="bm_id3151005"><bookmark_value>SEARCH function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_SUCHEN" id="bm_id3149484" localize="false"/><paragraph role="heading" id="hd_id3151005" xml-lang="en-US" level="2" l10n="U" oldref="122">SEARCH</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_SUCHEN" id="bm_id3149484" localize="false"/>
+<paragraph role="heading" id="hd_id3151005" xml-lang="en-US" level="2" l10n="U" oldref="122">SEARCH</paragraph>
<paragraph role="paragraph" id="par_id3148692" xml-lang="en-US" l10n="U" oldref="123"><ahelp hid="HID_FUNC_SUCHEN">Returns the position of a text segment within a character string.</ahelp> You can set the start of the search as an option. The search text can be a number or any sequence of characters. The search is not case-sensitive.</paragraph>
<embed href="text/shared/00/00000001.xhp#regulaer"/>
<paragraph role="heading" id="hd_id3152964" xml-lang="en-US" level="3" l10n="U" oldref="124">Syntax</paragraph>
@@ -443,7 +466,8 @@
<section id="substitute">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154830"><bookmark_value>SUBSTITUTE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WECHSELN" id="bm_id3147090" localize="false"/><paragraph role="heading" id="hd_id3154830" xml-lang="en-US" level="2" l10n="U" oldref="174">SUBSTITUTE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WECHSELN" id="bm_id3147090" localize="false"/>
+<paragraph role="heading" id="hd_id3154830" xml-lang="en-US" level="2" l10n="U" oldref="174">SUBSTITUTE</paragraph>
<paragraph role="paragraph" id="par_id3153698" xml-lang="en-US" l10n="U" oldref="175"><ahelp hid="HID_FUNC_WECHSELN">Substitutes new text for old text in a string.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150994" xml-lang="en-US" level="3" l10n="U" oldref="176">Syntax</paragraph>
<paragraph role="code" id="par_id3147582" xml-lang="en-US" l10n="U" oldref="177">SUBSTITUTE("Text"; "SearchText"; "NewText"; Occurrence)</paragraph>
@@ -464,7 +488,8 @@
<section id="t">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148977"><bookmark_value>T function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_T" id="bm_id3156051" localize="false"/><paragraph role="heading" id="hd_id3148977" xml-lang="en-US" level="2" l10n="U" oldref="140">T</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_T" id="bm_id3156051" localize="false"/>
+<paragraph role="heading" id="hd_id3148977" xml-lang="en-US" level="2" l10n="U" oldref="140">T</paragraph>
<paragraph role="paragraph" id="par_id3154359" xml-lang="en-US" l10n="CHG" oldref="141"><ahelp hid="HID_FUNC_T">This function returns the target text, or a blank text string if the target is not text.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155858" xml-lang="en-US" level="3" l10n="U" oldref="142">Syntax</paragraph>
<paragraph role="code" id="par_id3155871" xml-lang="en-US" l10n="U" oldref="143">T(Value)</paragraph>
@@ -478,7 +503,8 @@
<section id="text">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147132"><bookmark_value>TEXT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_TEXT" id="bm_id3156426" localize="false"/><paragraph role="heading" id="hd_id3147132" xml-lang="en-US" level="2" l10n="U" oldref="158">TEXT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_TEXT" id="bm_id3156426" localize="false"/>
+<paragraph role="heading" id="hd_id3147132" xml-lang="en-US" level="2" l10n="U" oldref="158">TEXT</paragraph>
<paragraph role="paragraph" id="par_id3147213" xml-lang="en-US" l10n="U" oldref="159"><ahelp hid="HID_FUNC_TEXT">Converts a number into text according to a given format.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153129" xml-lang="en-US" level="3" l10n="U" oldref="160">Syntax</paragraph>
<paragraph role="code" id="par_id3147377" xml-lang="en-US" l10n="U" oldref="161">TEXT(Number; Format)</paragraph>
@@ -495,7 +521,8 @@
<section id="trim">
<bookmark xml-lang="en-US" branch="index" id="bm_id3151039"><bookmark_value>TRIM function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GLAETTEN" id="bm_id3150584" localize="false"/><paragraph role="heading" id="hd_id3151039" xml-lang="en-US" level="2" l10n="U" oldref="54">TRIM</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GLAETTEN" id="bm_id3150584" localize="false"/>
+<paragraph role="heading" id="hd_id3151039" xml-lang="en-US" level="2" l10n="U" oldref="54">TRIM</paragraph>
<paragraph role="paragraph" id="par_id3157888" xml-lang="en-US" l10n="CHG" oldref="55"><ahelp hid="HID_FUNC_GLAETTEN">Removes spaces from a string, leaving only a single space character between words.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152913" xml-lang="en-US" level="3" l10n="U" oldref="56">Syntax</paragraph>
<paragraph role="code" id="par_id3151349" xml-lang="en-US" l10n="U" oldref="57">TRIM("Text")</paragraph>
@@ -508,7 +535,8 @@
<section id="upper">
<bookmark xml-lang="en-US" branch="index" id="bm_id3145178"><bookmark_value>UPPER function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GROSS" id="bm_id3145189" localize="false"/><paragraph role="heading" id="hd_id3145178" xml-lang="en-US" level="2" l10n="U" oldref="62">UPPER</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GROSS" id="bm_id3145189" localize="false"/>
+<paragraph role="heading" id="hd_id3145178" xml-lang="en-US" level="2" l10n="U" oldref="62">UPPER</paragraph>
<paragraph role="paragraph" id="par_id3162905" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="HID_FUNC_GROSS">Converts the string specified in the <emph>text</emph> field to uppercase.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148526" xml-lang="en-US" level="3" l10n="U" oldref="64">Syntax</paragraph>
<paragraph role="code" id="par_id3148539" xml-lang="en-US" l10n="U" oldref="65">UPPER("Text")</paragraph>
@@ -521,7 +549,8 @@
<section id="value">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150802"><bookmark_value>VALUE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WERT" id="bm_id3150814" localize="false"/><paragraph role="heading" id="hd_id3150802" xml-lang="en-US" level="2" l10n="U" oldref="185">VALUE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_WERT" id="bm_id3150814" localize="false"/>
+<paragraph role="heading" id="hd_id3150802" xml-lang="en-US" level="2" l10n="U" oldref="185">VALUE</paragraph>
<paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="U" oldref="186"><ahelp hid="HID_FUNC_WERT">Converts a text string into a number.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152568" xml-lang="en-US" level="3" l10n="U" oldref="187">Syntax</paragraph>
<paragraph role="code" id="par_id3153638" xml-lang="en-US" l10n="U" oldref="188">VALUE("Text")</paragraph>
@@ -531,5 +560,9 @@
<paragraph role="paragraph" id="par_id3144733" xml-lang="en-US" l10n="U" oldref="191">
<item type="input">=VALUE("4321")</item> returns 4321.</paragraph>
</section>
-</sort></body>
+</sort>
+<section id="relatedtopics">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060111.xhp b/helpcontent2/source/text/scalc/01/04060111.xhp
index 2b286b83b4..b679a48ed0 100644
--- a/helpcontent2/source/text/scalc/01/04060111.xhp
+++ b/helpcontent2/source/text/scalc/01/04060111.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060111.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060111xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060111xml" indexer="include">
<title id="tit" xml-lang="en-US">Add-in Functions</title>
<filename>/text/scalc/01/04060111.xhp</filename>
</topic>
@@ -57,10 +55,12 @@
<paragraph role="paragraph" id="par_id3156285" xml-lang="en-US" l10n="CHG" oldref="8">$[officename] contains examples for the add-in interface of $[officename] Calc.</paragraph>
<paragraph role="paragraph" id="par_id3159267" xml-lang="en-US" l10n="U" oldref="76"><link href="text/scalc/01/04060115.xhp">Analysis Functions Part One</link></paragraph>
<paragraph role="paragraph" id="par_id3154703" xml-lang="en-US" l10n="U" oldref="77"><link href="text/scalc/01/04060116.xhp">Analysis Functions Part Two</link></paragraph>
-<sort order="asc"><section id="isleapyear">
+<sort order="asc">
+<section id="isleapyear">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149566"><bookmark_value>ISLEAPYEAR function</bookmark_value>
<bookmark_value>leap year determination</bookmark_value>
-</bookmark><comment>mw added one entry</comment><paragraph role="heading" id="hd_id3149566" xml-lang="en-US" level="2" l10n="U" oldref="14">ISLEAPYEAR</paragraph>
+</bookmark><comment>mw added one entry</comment>
+<paragraph role="heading" id="hd_id3149566" xml-lang="en-US" level="2" l10n="U" oldref="14">ISLEAPYEAR</paragraph>
<paragraph role="paragraph" id="par_id3150297" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid=".">Determines whether a year is a leap year.</ahelp> If yes, the function will return the value 1 (TRUE); if not, it will return 0 (FALSE).</paragraph>
<paragraph role="heading" id="hd_id3148487" xml-lang="en-US" level="3" l10n="U" oldref="16">Syntax</paragraph>
<paragraph role="code" id="par_id3150205" xml-lang="en-US" l10n="U" oldref="17">ISLEAPYEAR("Date")</paragraph>
@@ -75,7 +75,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3154656"><bookmark_value>YEARS function</bookmark_value>
<bookmark_value>number of years between two dates</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_DAI_FUNC_DIFFYEARS" id="bm_id3150368" localize="false"/><paragraph role="heading" id="hd_id3154656" xml-lang="en-US" level="2" l10n="U" oldref="21">YEARS</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DAI_FUNC_DIFFYEARS" id="bm_id3150368" localize="false"/>
+<paragraph role="heading" id="hd_id3154656" xml-lang="en-US" level="2" l10n="U" oldref="21">YEARS</paragraph>
<paragraph role="paragraph" id="par_id3150886" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="HID_DAI_FUNC_DIFFYEARS">Calculates the difference in years between two dates.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154370" xml-lang="en-US" level="3" l10n="U" oldref="23">Syntax</paragraph>
<paragraph role="code" id="par_id3146114" xml-lang="en-US" l10n="U" oldref="24">YEARS(StartDate; EndDate; Type)</paragraph>
@@ -90,7 +91,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3152898"><bookmark_value>MONTHS function</bookmark_value>
<bookmark_value>number of months between two dates</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_DAI_FUNC_DIFFMONTHS" id="bm_id3148839" localize="false"/><paragraph role="heading" id="hd_id3152898" xml-lang="en-US" level="2" l10n="U" oldref="28">MONTHS</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DAI_FUNC_DIFFMONTHS" id="bm_id3148839" localize="false"/>
+<paragraph role="heading" id="hd_id3152898" xml-lang="en-US" level="2" l10n="U" oldref="28">MONTHS</paragraph>
<paragraph role="paragraph" id="par_id3153066" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_DAI_FUNC_DIFFMONTHS">Calculates the difference in months between two dates.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3151240" xml-lang="en-US" level="3" l10n="U" oldref="30">Syntax</paragraph>
<paragraph role="code" id="par_id3146869" xml-lang="en-US" l10n="U" oldref="31">MONTHS(StartDate; EndDate; Type)</paragraph>
@@ -105,7 +107,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3159094"><bookmark_value>ROT13 function</bookmark_value>
<bookmark_value>encrypting text</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_DAI_FUNC_ROT13" id="bm_id3153283" localize="false"/><paragraph role="heading" id="hd_id3159094" xml-lang="en-US" level="2" l10n="U" oldref="35">ROT13</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DAI_FUNC_ROT13" id="bm_id3153283" localize="false"/>
+<paragraph role="heading" id="hd_id3159094" xml-lang="en-US" level="2" l10n="U" oldref="35">ROT13</paragraph>
<paragraph role="paragraph" id="par_id3146781" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="HID_DAI_FUNC_ROT13">Encrypts a character string by moving the characters 13 positions in the alphabet.</ahelp> After the letter Z, the alphabet begins again (Rotation). By applying the encryption function again to the resulting code, you can decrypt the text.</paragraph>
<paragraph role="heading" id="hd_id3150893" xml-lang="en-US" level="3" l10n="U" oldref="37">Syntax</paragraph>
<paragraph role="code" id="par_id3159205" xml-lang="en-US" l10n="U" oldref="38">ROT13(Text)</paragraph>
@@ -116,7 +119,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3151300"><bookmark_value>DAYSINYEAR function</bookmark_value>
<bookmark_value>number of days; in a specific year</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_DAI_FUNC_DAYSINYEAR" id="bm_id3153972" localize="false"/><paragraph role="heading" id="hd_id3151300" xml-lang="en-US" level="2" l10n="U" oldref="43">DAYSINYEAR</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DAI_FUNC_DAYSINYEAR" id="bm_id3153972" localize="false"/>
+<paragraph role="heading" id="hd_id3151300" xml-lang="en-US" level="2" l10n="U" oldref="43">DAYSINYEAR</paragraph>
<paragraph role="paragraph" id="par_id3143220" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="HID_DAI_FUNC_DAYSINYEAR">Calculates the number of days of the year in which the date entered occurs.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145358" xml-lang="en-US" level="3" l10n="U" oldref="45">Syntax</paragraph>
<paragraph role="code" id="par_id3154651" xml-lang="en-US" l10n="U" oldref="46">DAYSINYEAR(Date)</paragraph>
@@ -129,7 +133,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3154737"><bookmark_value>DAYSINMONTH function</bookmark_value>
<bookmark_value>number of days;in a specific month of a year</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_DAI_FUNC_DAYSINMONTH" id="bm_id3155593" localize="false"/><paragraph role="heading" id="hd_id3154737" xml-lang="en-US" level="2" l10n="U" oldref="50">DAYSINMONTH</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DAI_FUNC_DAYSINMONTH" id="bm_id3155593" localize="false"/>
+<paragraph role="heading" id="hd_id3154737" xml-lang="en-US" level="2" l10n="U" oldref="50">DAYSINMONTH</paragraph>
<paragraph role="paragraph" id="par_id3149316" xml-lang="en-US" l10n="CHG" oldref="51"><ahelp hid="HID_DAI_FUNC_DAYSINMONTH">Calculates the number of days of the month in which the date entered occurs.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145114" xml-lang="en-US" level="3" l10n="U" oldref="52">Syntax</paragraph>
<paragraph role="code" id="par_id3150955" xml-lang="en-US" l10n="U" oldref="53">DAYSINMONTH(Date)</paragraph>
@@ -142,7 +147,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3149048"><bookmark_value>WEEKS function</bookmark_value>
<bookmark_value>number of weeks;between two dates</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_DAI_FUNC_DIFFWEEKS" id="bm_id3150435" localize="false"/><paragraph role="heading" id="hd_id3149048" xml-lang="en-US" level="2" l10n="U" oldref="57">WEEKS</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DAI_FUNC_DIFFWEEKS" id="bm_id3150435" localize="false"/>
+<paragraph role="heading" id="hd_id3149048" xml-lang="en-US" level="2" l10n="U" oldref="57">WEEKS</paragraph>
<paragraph role="paragraph" id="par_id3153340" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid="HID_DAI_FUNC_DIFFWEEKS">Calculates the difference in weeks between two dates.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150393" xml-lang="en-US" level="3" l10n="U" oldref="59">Syntax</paragraph>
<paragraph role="code" id="par_id3147402" xml-lang="en-US" l10n="U" oldref="60">WEEKS(StartDate; EndDate; Type)</paragraph>
@@ -157,7 +163,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3145237"><bookmark_value>WEEKSINYEAR function</bookmark_value>
<bookmark_value>number of weeks;in a specific year</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_DAI_FUNC_WEEKSINYEAR" id="bm_id3146883" localize="false"/><paragraph role="heading" id="hd_id3145237" xml-lang="en-US" level="2" l10n="U" oldref="64">WEEKSINYEAR</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DAI_FUNC_WEEKSINYEAR" id="bm_id3146883" localize="false"/>
+<paragraph role="heading" id="hd_id3145237" xml-lang="en-US" level="2" l10n="U" oldref="64">WEEKSINYEAR</paragraph>
<paragraph role="paragraph" id="par_id3147410" xml-lang="en-US" l10n="CHG" oldref="65"><ahelp hid="HID_DAI_FUNC_WEEKSINYEAR">Calculates the number of weeks of the year in which the date entered occurs.</ahelp> The number of weeks is defined as follows: a week that spans two years is added to the year in which most days of that week occur.</paragraph>
<paragraph role="heading" id="hd_id3149719" xml-lang="en-US" level="3" l10n="U" oldref="66">Syntax</paragraph>
<paragraph role="code" id="par_id3145638" xml-lang="en-US" l10n="U" oldref="67">WEEKSINYEAR(Date)</paragraph>
@@ -169,5 +176,8 @@
</sort>
<paragraph role="heading" id="hd_id3157901" xml-lang="en-US" level="2" l10n="U" oldref="72">Add-ins through %PRODUCTNAME API</paragraph>
<paragraph role="paragraph" id="par_id3149351" xml-lang="en-US" l10n="U" oldref="73">Add-ins can also be implemented through the %PRODUCTNAME <link href="http://api.openoffice.org/">API</link>.</paragraph>
+<section id="relatedtopics">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060115.xhp b/helpcontent2/source/text/scalc/01/04060115.xhp
index 2088dff1b0..1bedc03363 100755
--- a/helpcontent2/source/text/scalc/01/04060115.xhp
+++ b/helpcontent2/source/text/scalc/01/04060115.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060115.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060115xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060115xml" indexer="include">
<title id="tit" xml-lang="en-US">Add-in Functions, List of Analysis Functions Part One</title>
<filename>/text/scalc/01/04060115.xhp</filename>
</topic>
@@ -48,7 +46,7 @@
</bookmark>
<paragraph role="heading" id="hd_id3152871" xml-lang="en-US" level="1" l10n="U" oldref="1">Add-in Functions, List of Analysis Functions Part One</paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000404.xhp#addinana"/>
+<embed href="text/scalc/00/00000404.xhp#addinana"/>
</section>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3149873" xml-lang="en-US" l10n="U" oldref="102"><link href="text/scalc/01/04060110.xhp" name="General conversion function BASIS">General conversion function BASIS</link></paragraph>
@@ -59,7 +57,8 @@
<section id="besseli">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153074"><bookmark_value>Bessel functions</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_BESSELI" id="bm_id3150435" localize="false"/><paragraph role="heading" id="hd_id3153334" xml-lang="en-US" level="2" oldref="111">BESSELI</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_BESSELI" id="bm_id3150435" localize="false"/>
+<paragraph role="heading" id="hd_id3153334" xml-lang="en-US" level="2" oldref="111">BESSELI</paragraph>
<paragraph role="paragraph" id="par_id3153960" xml-lang="en-US" l10n="U" oldref="112"><ahelp hid="HID_AAI_FUNC_BESSELI">Calculates the modified Bessel function.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150392" xml-lang="en-US" level="3" l10n="U" oldref="113">Syntax</paragraph>
<paragraph role="code" id="par_id3147295" xml-lang="en-US" l10n="U" oldref="114">BESSELI(X; N)</paragraph>
@@ -69,7 +68,8 @@
<emph>N</emph> is the order of the Bessel function</paragraph>
</section>
<section id="besselj">
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_BESSELJ" id="bm_id3150539" localize="false"/><paragraph role="heading" id="hd_id3153027" xml-lang="en-US" level="2" oldref="103">BESSELJ</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_BESSELJ" id="bm_id3150539" localize="false"/>
+<paragraph role="heading" id="hd_id3153027" xml-lang="en-US" level="2" oldref="103">BESSELJ</paragraph>
<paragraph role="paragraph" id="par_id3153015" xml-lang="en-US" l10n="U" oldref="104"><ahelp hid="HID_AAI_FUNC_BESSELJ">Calculates the Bessel function (cylinder function).</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146884" xml-lang="en-US" level="3" l10n="U" oldref="105">Syntax</paragraph>
<paragraph role="code" id="par_id3150032" xml-lang="en-US" l10n="U" oldref="106">BESSELJ(X; N)</paragraph>
@@ -79,7 +79,8 @@
<emph>N</emph> is the order of the Bessel function</paragraph>
</section>
<section id="besselk">
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_BESSELK" id="bm_id3147616" localize="false"/><paragraph role="heading" id="hd_id3149946" xml-lang="en-US" level="2" oldref="117">BESSELK</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_BESSELK" id="bm_id3147616" localize="false"/>
+<paragraph role="heading" id="hd_id3149946" xml-lang="en-US" level="2" oldref="117">BESSELK</paragraph>
<paragraph role="paragraph" id="par_id3159122" xml-lang="en-US" l10n="U" oldref="118"><ahelp hid="HID_AAI_FUNC_BESSELK">Calculates the modified Bessel function.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150650" xml-lang="en-US" level="3" l10n="U" oldref="119">Syntax</paragraph>
<paragraph role="code" id="par_id3149354" xml-lang="en-US" l10n="U" oldref="120">BESSELK(X; N)</paragraph>
@@ -89,7 +90,8 @@
<emph>N</emph> is the order of the Bessel function</paragraph>
</section>
<section id="bessely">
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_BESSELY" id="bm_id3150461" localize="false"/><paragraph role="heading" id="hd_id3145828" xml-lang="en-US" level="2" oldref="123">BESSELY</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_BESSELY" id="bm_id3150461" localize="false"/>
+<paragraph role="heading" id="hd_id3145828" xml-lang="en-US" level="2" oldref="123">BESSELY</paragraph>
<paragraph role="paragraph" id="par_id3146877" xml-lang="en-US" l10n="CHG" oldref="124"><ahelp hid="HID_AAI_FUNC_BESSELY">Calculates the modified Bessel function.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146941" xml-lang="en-US" level="3" l10n="U" oldref="125">Syntax</paragraph>
<paragraph role="code" id="par_id3148884" xml-lang="en-US" l10n="U" oldref="126">BESSELY(X; N)</paragraph>
@@ -102,7 +104,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3153034"><bookmark_value>BIN2DEC function</bookmark_value>
<bookmark_value>converting;binary numbers, into decimal numbers</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_BIN2DEC" id="bm_id3151230" localize="false"/><paragraph role="heading" id="hd_id3153034" xml-lang="en-US" level="2" oldref="17">BIN2DEC</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_BIN2DEC" id="bm_id3151230" localize="false"/>
+<paragraph role="heading" id="hd_id3153034" xml-lang="en-US" level="2" oldref="17">BIN2DEC</paragraph>
<paragraph role="paragraph" id="par_id3144744" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_AAI_FUNC_BIN2DEC">The result is the decimal number for the binary number entered.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145593" xml-lang="en-US" level="3" l10n="U" oldref="19">Syntax</paragraph>
<paragraph role="code" id="par_id3149726" xml-lang="en-US" l10n="U" oldref="20">BIN2DEC(Number)</paragraph>
@@ -116,7 +119,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3149954"><bookmark_value>BIN2HEX function</bookmark_value>
<bookmark_value>converting;binary numbers, into hexadecimal numbers</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_BIN2HEX" id="bm_id3149548" localize="false"/><paragraph role="heading" id="hd_id3149954" xml-lang="en-US" level="2" oldref="24">BIN2HEX</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_BIN2HEX" id="bm_id3149548" localize="false"/>
+<paragraph role="heading" id="hd_id3149954" xml-lang="en-US" level="2" oldref="24">BIN2HEX</paragraph>
<paragraph role="paragraph" id="par_id3148585" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="HID_AAI_FUNC_BIN2HEX">The result is the hexadecimal number for the binary number entered.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153936" xml-lang="en-US" level="3" l10n="U" oldref="26">Syntax</paragraph>
<paragraph role="code" id="par_id3148753" xml-lang="en-US" l10n="U" oldref="27">BIN2HEX(Number; Places)</paragraph>
@@ -131,7 +135,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3153332"><bookmark_value>BIN2OCT function</bookmark_value>
<bookmark_value>converting;binary numbers, into octal numbers</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_BIN2OCT" id="bm_id3146848" localize="false"/><paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="2" oldref="9">BIN2OCT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_BIN2OCT" id="bm_id3146848" localize="false"/>
+<paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="2" oldref="9">BIN2OCT</paragraph>
<paragraph role="paragraph" id="par_id3155951" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_AAI_FUNC_BIN2OCT"> The result is the octal number for the binary number entered.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153001" xml-lang="en-US" level="3" l10n="U" oldref="11">Syntax</paragraph>
<paragraph role="code" id="par_id3154508" xml-lang="en-US" l10n="U" oldref="12">BIN2OCT(Number; Places)</paragraph>
@@ -147,7 +152,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3150014"><bookmark_value>DELTA function</bookmark_value>
<bookmark_value>recognizing;equal numbers</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DELTA" id="bm_id3149880" localize="false"/><paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="2" oldref="129">DELTA</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DELTA" id="bm_id3149880" localize="false"/>
+<paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="2" oldref="129">DELTA</paragraph>
<paragraph role="paragraph" id="par_id3148760" xml-lang="en-US" l10n="U" oldref="130"><ahelp hid="HID_AAI_FUNC_DELTA">The result is TRUE (1) if both numbers, which are delivered as an argument, are equal, otherwise it is FALSE (0).</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155435" xml-lang="en-US" level="3" l10n="U" oldref="131">Syntax</paragraph>
<paragraph role="paragraph" id="par_id3145247" xml-lang="en-US" l10n="U" oldref="132">DELTA(Number1; Number2)</paragraph>
@@ -159,7 +165,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3157971"><bookmark_value>DEC2BIN function</bookmark_value>
<bookmark_value>converting;decimal numbers, into binary numbers</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DEC2BIN" id="bm_id3148389" localize="false"/><paragraph role="heading" id="hd_id3157971" xml-lang="en-US" level="2" oldref="55">DEC2BIN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DEC2BIN" id="bm_id3148389" localize="false"/>
+<paragraph role="heading" id="hd_id3157971" xml-lang="en-US" level="2" oldref="55">DEC2BIN</paragraph>
<paragraph role="paragraph" id="par_id3153043" xml-lang="en-US" l10n="U" oldref="56"><ahelp hid="HID_AAI_FUNC_DEC2BIN"> The result is the binary number for the decimal number entered between -512 and 511.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145349" xml-lang="en-US" level="3" l10n="U" oldref="57">Syntax</paragraph>
<paragraph role="code" id="par_id3150569" xml-lang="en-US" l10n="U" oldref="58">DEC2BIN(Number; Places)</paragraph>
@@ -175,7 +182,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3149388"><bookmark_value>DEC2HEX function</bookmark_value>
<bookmark_value>converting;decimal numbers, into hexadecimal numbers</bookmark_value>
</bookmark><comment>mw added one entr</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DEC2HEX" id="bm_id3155513" localize="false"/><paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="2" oldref="71">DEC2HEX</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DEC2HEX" id="bm_id3155513" localize="false"/>
+<paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="2" oldref="71">DEC2HEX</paragraph>
<paragraph role="paragraph" id="par_id3149030" xml-lang="en-US" l10n="U" oldref="72"><ahelp hid="HID_AAI_FUNC_DEC2HEX">The result is the hexadecimal number for the decimal number entered.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150691" xml-lang="en-US" level="3" l10n="U" oldref="73">Syntax</paragraph>
<paragraph role="code" id="par_id3147535" xml-lang="en-US" l10n="U" oldref="74">DEC2HEX(Number; Places)</paragraph>
@@ -191,7 +199,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3154948"><bookmark_value>DEC2OCT function</bookmark_value>
<bookmark_value>converting;decimal numbers, into octal numbers</bookmark_value>
</bookmark><comment>mw added one entr</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DEC2OCT" id="bm_id3156260" localize="false"/><paragraph role="heading" id="hd_id3154948" xml-lang="en-US" level="2" oldref="63">DEC2OCT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DEC2OCT" id="bm_id3156260" localize="false"/>
+<paragraph role="heading" id="hd_id3154948" xml-lang="en-US" level="2" oldref="63">DEC2OCT</paragraph>
<paragraph role="paragraph" id="par_id3153920" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="HID_AAI_FUNC_DEC2OCT">The result is the octal number for the decimal number entered.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153178" xml-lang="en-US" level="3" l10n="U" oldref="65">Syntax</paragraph>
<paragraph role="code" id="par_id3148427" xml-lang="en-US" l10n="U" oldref="66">DEC2OCT(Number; Places)</paragraph>
@@ -207,7 +216,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3083446"><bookmark_value>ERF function</bookmark_value>
<bookmark_value>Gaussian error integral</bookmark_value>
</bookmark><comment>mw added one entr</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ERF" id="bm_id3149823" localize="false"/><paragraph role="heading" id="hd_id3083446" xml-lang="en-US" level="2" oldref="135">ERF</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ERF" id="bm_id3149823" localize="false"/>
+<paragraph role="heading" id="hd_id3083446" xml-lang="en-US" level="2" oldref="135">ERF</paragraph>
<paragraph role="paragraph" id="par_id3150381" xml-lang="en-US" l10n="U" oldref="136"><ahelp hid="HID_AAI_FUNC_ERF">Returns values of the Gaussian error integral.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152475" xml-lang="en-US" level="3" l10n="U" oldref="137">Syntax</paragraph>
<paragraph role="code" id="par_id3163824" xml-lang="en-US" l10n="U" oldref="138">ERF(LowerLimit; UpperLimit)</paragraph>
@@ -222,7 +232,8 @@
<section id="erfc">
<bookmark xml-lang="en-US" branch="index" id="bm_id3145082"><bookmark_value>ERFC function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ERFC" id="bm_id3156307" localize="false"/><paragraph role="heading" id="hd_id3145082" xml-lang="en-US" level="2" oldref="143">ERFC</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ERFC" id="bm_id3156307" localize="false"/>
+<paragraph role="heading" id="hd_id3145082" xml-lang="en-US" level="2" oldref="143">ERFC</paragraph>
<paragraph role="paragraph" id="par_id3149453" xml-lang="en-US" l10n="U" oldref="144"><ahelp hid="HID_AAI_FUNC_ERFC">Returns complementary values of the Gaussian error integral between x and infinity.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155839" xml-lang="en-US" level="3" l10n="U" oldref="145">Syntax</paragraph>
<paragraph role="code" id="par_id3153220" xml-lang="en-US" l10n="U" oldref="146">ERFC(LowerLimit)</paragraph>
@@ -236,7 +247,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3152927"><bookmark_value>GESTEP function</bookmark_value>
<bookmark_value>numbers;greater than or equal to</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_GESTEP" id="bm_id3151182" localize="false"/><paragraph role="heading" id="hd_id3152927" xml-lang="en-US" level="2" l10n="E" oldref="150">GESTEP</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_GESTEP" id="bm_id3151182" localize="false"/>
+<paragraph role="heading" id="hd_id3152927" xml-lang="en-US" level="2" l10n="E" oldref="150">GESTEP</paragraph>
<paragraph role="paragraph" id="par_id3150763" xml-lang="en-US" l10n="U" oldref="151"><ahelp hid="HID_AAI_FUNC_GESTEP">The result is 1 if <item type="literal">Number</item> is greater than or equal to <item type="literal">Step</item>.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150879" xml-lang="en-US" level="3" l10n="U" oldref="152">Syntax</paragraph>
<paragraph role="code" id="par_id3145212" xml-lang="en-US" l10n="U" oldref="153">GESTEP(Number; Step)</paragraph>
@@ -248,7 +260,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3147276"><bookmark_value>HEX2BIN function</bookmark_value>
<bookmark_value>converting;hexadecimal numbers, into binary numbers</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_HEX2BIN" id="bm_id3145659" localize="false"/><paragraph role="heading" id="hd_id3147276" xml-lang="en-US" level="2" oldref="79">HEX2BIN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_HEX2BIN" id="bm_id3145659" localize="false"/>
+<paragraph role="heading" id="hd_id3147276" xml-lang="en-US" level="2" oldref="79">HEX2BIN</paragraph>
<paragraph role="paragraph" id="par_id3150258" xml-lang="en-US" l10n="U" oldref="80"><ahelp hid="HID_AAI_FUNC_HEX2BIN">The result is the binary number for the hexadecimal number entered.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156117" xml-lang="en-US" level="3" l10n="U" oldref="81">Syntax</paragraph>
<paragraph role="code" id="par_id3155847" xml-lang="en-US" l10n="U" oldref="82">HEX2BIN(Number; Places)</paragraph>
@@ -264,7 +277,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3154742"><bookmark_value>HEX2DEC function</bookmark_value>
<bookmark_value>converting;hexadecimal numbers, into decimal numbers</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_HEX2DEC" id="bm_id3149978" localize="false"/><paragraph role="heading" id="hd_id3154742" xml-lang="en-US" level="2" oldref="87">HEX2DEC</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_HEX2DEC" id="bm_id3149978" localize="false"/>
+<paragraph role="heading" id="hd_id3154742" xml-lang="en-US" level="2" oldref="87">HEX2DEC</paragraph>
<paragraph role="paragraph" id="par_id3153626" xml-lang="en-US" l10n="U" oldref="88"><ahelp hid="HID_AAI_FUNC_HEX2DEC">The result is the decimal number for the hexadecimal number entered.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3143233" xml-lang="en-US" level="3" l10n="U" oldref="89">Syntax</paragraph>
<paragraph role="code" id="par_id3149293" xml-lang="en-US" l10n="U" oldref="90">HEX2DEC(Number)</paragraph>
@@ -278,7 +292,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3149750"><bookmark_value>HEX2OCT function</bookmark_value>
<bookmark_value>converting;hexadecimal numbers, into octal numbers</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_HEX2OCT" id="bm_id3147487" localize="false"/><paragraph role="heading" id="hd_id3149750" xml-lang="en-US" level="2" oldref="94">HEX2OCT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_HEX2OCT" id="bm_id3147487" localize="false"/>
+<paragraph role="heading" id="hd_id3149750" xml-lang="en-US" level="2" oldref="94">HEX2OCT</paragraph>
<paragraph role="paragraph" id="par_id3153983" xml-lang="en-US" l10n="U" oldref="95"><ahelp hid="HID_AAI_FUNC_HEX2OCT">The result is the octal number for the hexadecimal number entered.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145660" xml-lang="en-US" level="3" l10n="U" oldref="96">Syntax</paragraph>
<paragraph role="code" id="par_id3151170" xml-lang="en-US" l10n="U" oldref="97">HEX2OCT(Number; Places)</paragraph>
@@ -290,5 +305,9 @@
<paragraph role="paragraph" id="par_id3159341" xml-lang="en-US" l10n="U" oldref="101">
<item type="input">=HEX2OCT(64;4)</item> returns 0144.</paragraph>
</section>
-</sort></body>
+</sort>
+<section id="Section1">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060116.xhp b/helpcontent2/source/text/scalc/01/04060116.xhp
index 29e0783f61..680b85d3ce 100755
--- a/helpcontent2/source/text/scalc/01/04060116.xhp
+++ b/helpcontent2/source/text/scalc/01/04060116.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060116.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060116xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060116xml" indexer="include">
<title id="tit" xml-lang="en-US">Add-in Functions, List of Analysis Functions Part Two</title>
<filename>/text/scalc/01/04060116.xhp</filename>
</topic>
@@ -48,7 +46,7 @@
</bookmark>
<paragraph role="heading" id="hd_id3154659" xml-lang="en-US" level="1" l10n="U" oldref="1">Add-in Functions, List of Analysis Functions Part Two</paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000404.xhp#addinana"/>
+<embed href="text/scalc/00/00000404.xhp#addinana"/>
</section>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3151242" xml-lang="en-US" l10n="U" oldref="174"><link href="text/scalc/01/04060108.xhp" name="Category Statistics">Category Statistics</link></paragraph>
@@ -60,7 +58,8 @@
<paragraph role="paragraph" id="par_id3145074" xml-lang="en-US" l10n="E" oldref="166" localize="false"/>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154959"><bookmark_value>IMABS function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMABS" id="bm_id3154541" localize="false"/><paragraph role="heading" id="hd_id3154959" xml-lang="en-US" level="2" oldref="44">IMABS</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMABS" id="bm_id3154541" localize="false"/>
+<paragraph role="heading" id="hd_id3154959" xml-lang="en-US" level="2" oldref="44">IMABS</paragraph>
<paragraph role="paragraph" id="par_id3149895" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="HID_AAI_FUNC_IMABS">The result is the absolute value of a complex number.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155382" xml-lang="en-US" level="3" l10n="U" oldref="46">Syntax</paragraph>
<paragraph role="code" id="par_id3151302" xml-lang="en-US" l10n="U" oldref="47">IMABS("ComplexNumber")</paragraph>
@@ -73,7 +72,8 @@
<section id="imaginary">
<bookmark xml-lang="en-US" branch="index" id="bm_id3145357"><bookmark_value>IMAGINARY function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMAGINARY" id="bm_id3154651" localize="false"/><paragraph role="heading" id="hd_id3145357" xml-lang="en-US" level="2" oldref="51">IMAGINARY</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMAGINARY" id="bm_id3154651" localize="false"/>
+<paragraph role="heading" id="hd_id3145357" xml-lang="en-US" level="2" oldref="51">IMAGINARY</paragraph>
<paragraph role="paragraph" id="par_id3146965" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="HID_AAI_FUNC_IMAGINARY">The result is the imaginary coefficient of a complex number.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153555" xml-lang="en-US" level="3" l10n="U" oldref="53">Syntax</paragraph>
<paragraph role="code" id="par_id3155522" xml-lang="en-US" l10n="U" oldref="54">IMAGINARY("ComplexNumber")</paragraph>
@@ -85,7 +85,8 @@
<section id="impower">
<bookmark xml-lang="en-US" branch="index" id="bm_id3146106"><bookmark_value>IMPOWER function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMPOWER" id="bm_id3155755" localize="false"/><paragraph role="heading" id="hd_id3146106" xml-lang="en-US" level="2" oldref="58">IMPOWER</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMPOWER" id="bm_id3155755" localize="false"/>
+<paragraph role="heading" id="hd_id3146106" xml-lang="en-US" level="2" oldref="58">IMPOWER</paragraph>
<paragraph role="paragraph" id="par_id3147245" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="HID_AAI_FUNC_IMPOWER">The result is the integer power of a complex number.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150954" xml-lang="en-US" level="3" l10n="U" oldref="60">Syntax</paragraph>
<paragraph role="code" id="par_id3147501" xml-lang="en-US" l10n="U" oldref="61">IMPOWER("ComplexNumber"; Number)</paragraph>
@@ -99,7 +100,8 @@
<section id="imargument">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148748"><bookmark_value>IMARGUMENT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMARGUMENT" id="bm_id3147297" localize="false"/><paragraph role="heading" id="hd_id3148748" xml-lang="en-US" level="2" oldref="66">IMARGUMENT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMARGUMENT" id="bm_id3147297" localize="false"/>
+<paragraph role="heading" id="hd_id3148748" xml-lang="en-US" level="2" oldref="66">IMARGUMENT</paragraph>
<paragraph role="paragraph" id="par_id3151341" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="HID_AAI_FUNC_IMARGUMENT">The result is the argument (the phi angle) of a complex number.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150533" xml-lang="en-US" level="3" l10n="U" oldref="68">Syntax</paragraph>
<paragraph role="code" id="par_id3156402" xml-lang="en-US" l10n="U" oldref="69">IMARGUMENT("ComplexNumber")</paragraph>
@@ -111,7 +113,8 @@
<section id="imcos">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149146"><bookmark_value>IMCOS function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMCOS" id="bm_id3150378" localize="false"/><paragraph role="heading" id="hd_id3149146" xml-lang="en-US" level="2" oldref="73">IMCOS</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMCOS" id="bm_id3150378" localize="false"/>
+<paragraph role="heading" id="hd_id3149146" xml-lang="en-US" level="2" oldref="73">IMCOS</paragraph>
<paragraph role="paragraph" id="par_id3149725" xml-lang="en-US" l10n="U" oldref="74"><ahelp hid="HID_AAI_FUNC_IMCOS">The result is the cosine of a complex number.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3159116" xml-lang="en-US" level="3" l10n="U" oldref="75">Syntax</paragraph>
<paragraph role="code" id="par_id3147415" xml-lang="en-US" l10n="U" oldref="76">IMCOS("ComplexNumber")</paragraph>
@@ -123,7 +126,8 @@
<section id="imdiv">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150024"><bookmark_value>IMDIV function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMDIV" id="bm_id3154679" localize="false"/><paragraph role="heading" id="hd_id3150024" xml-lang="en-US" level="2" oldref="80">IMDIV</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMDIV" id="bm_id3154679" localize="false"/>
+<paragraph role="heading" id="hd_id3150024" xml-lang="en-US" level="2" oldref="80">IMDIV</paragraph>
<paragraph role="paragraph" id="par_id3145825" xml-lang="en-US" l10n="U" oldref="81"><ahelp hid="HID_AAI_FUNC_IMDIV">The result is the division of two complex numbers.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150465" xml-lang="en-US" level="3" l10n="U" oldref="82">Syntax</paragraph>
<paragraph role="code" id="par_id3146942" xml-lang="en-US" l10n="U" oldref="83">IMDIV("Numerator"; "Denominator")</paragraph>
@@ -136,7 +140,8 @@
<section id="imexp">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153039"><bookmark_value>IMEXP function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMEXP" id="bm_id3147468" localize="false"/><paragraph role="heading" id="hd_id3153039" xml-lang="en-US" level="2" oldref="87">IMEXP</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMEXP" id="bm_id3147468" localize="false"/>
+<paragraph role="heading" id="hd_id3153039" xml-lang="en-US" level="2" oldref="87">IMEXP</paragraph>
<paragraph role="paragraph" id="par_id3144741" xml-lang="en-US" l10n="CHG" oldref="88"><ahelp hid="HID_AAI_FUNC_IMEXP">The result is the power of e and the complex number.</ahelp> The constant e has a value of approximately 2.71828182845904.</paragraph>
<paragraph role="heading" id="hd_id3145591" xml-lang="en-US" level="3" l10n="U" oldref="89">Syntax</paragraph>
<paragraph role="code" id="par_id3154810" xml-lang="en-US" l10n="U" oldref="90">IMEXP("ComplexNumber")</paragraph>
@@ -148,7 +153,8 @@
<section id="imconjugate">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149955"><bookmark_value>IMCONJUGATE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMCONJUGATE" id="bm_id3152782" localize="false"/><paragraph role="heading" id="hd_id3149955" xml-lang="en-US" level="2" oldref="94">IMCONJUGATE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMCONJUGATE" id="bm_id3152782" localize="false"/>
+<paragraph role="heading" id="hd_id3149955" xml-lang="en-US" level="2" oldref="94">IMCONJUGATE</paragraph>
<paragraph role="paragraph" id="par_id3155263" xml-lang="en-US" l10n="U" oldref="95"><ahelp hid="HID_AAI_FUNC_IMCONJUGATE">The result is the conjugated complex complement to a complex number.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148750" xml-lang="en-US" level="3" l10n="U" oldref="96">Syntax</paragraph>
<paragraph role="code" id="par_id3153082" xml-lang="en-US" l10n="U" oldref="97">IMCONJUGATE("ComplexNumber")</paragraph>
@@ -160,7 +166,8 @@
<section id="imln">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150898"><bookmark_value>IMLN function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMLN" id="bm_id3149190" localize="false"/><paragraph role="heading" id="hd_id3150898" xml-lang="en-US" level="2" oldref="101">IMLN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMLN" id="bm_id3149190" localize="false"/>
+<paragraph role="heading" id="hd_id3150898" xml-lang="en-US" level="2" oldref="101">IMLN</paragraph>
<paragraph role="paragraph" id="par_id3146853" xml-lang="en-US" l10n="CHG" oldref="102"><ahelp hid="HID_AAI_FUNC_IMLN">The result is the natural logarithm (to the base e) of a complex number.</ahelp> The constant e has a value of approximately 2.71828182845904.</paragraph>
<paragraph role="heading" id="hd_id3150008" xml-lang="en-US" level="3" l10n="U" oldref="103">Syntax</paragraph>
<paragraph role="code" id="par_id3155954" xml-lang="en-US" l10n="U" oldref="104">IMLN("ComplexNumber")</paragraph>
@@ -172,7 +179,8 @@
<section id="imlog10">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155929"><bookmark_value>IMLOG10 function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMLOG10" id="bm_id3148765" localize="false"/><paragraph role="heading" id="hd_id3155929" xml-lang="en-US" level="2" oldref="108">IMLOG10</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMLOG10" id="bm_id3148765" localize="false"/>
+<paragraph role="heading" id="hd_id3155929" xml-lang="en-US" level="2" oldref="108">IMLOG10</paragraph>
<paragraph role="paragraph" id="par_id3149882" xml-lang="en-US" l10n="CHG" oldref="109"><ahelp hid="HID_AAI_FUNC_IMLOG10">The result is the common logarithm (to the base 10) of a complex number.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154327" xml-lang="en-US" level="3" l10n="U" oldref="110">Syntax</paragraph>
<paragraph role="code" id="par_id3150128" xml-lang="en-US" l10n="U" oldref="111">IMLOG10("ComplexNumber")</paragraph>
@@ -184,7 +192,8 @@
<section id="imlog2">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155623"><bookmark_value>IMLOG2 function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMLOG2" id="bm_id3157975" localize="false"/><paragraph role="heading" id="hd_id3155623" xml-lang="en-US" level="2" oldref="115">IMLOG2</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMLOG2" id="bm_id3157975" localize="false"/>
+<paragraph role="heading" id="hd_id3155623" xml-lang="en-US" level="2" oldref="115">IMLOG2</paragraph>
<paragraph role="paragraph" id="par_id3150932" xml-lang="en-US" l10n="U" oldref="116"><ahelp hid="HID_AAI_FUNC_IMLOG2">The result is the binary logarithm of a complex number.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153046" xml-lang="en-US" level="3" l10n="U" oldref="117">Syntax</paragraph>
<paragraph role="code" id="par_id3145355" xml-lang="en-US" l10n="U" oldref="118">IMLOG2("ComplexNumber")</paragraph>
@@ -196,7 +205,8 @@
<section id="improduct">
<bookmark xml-lang="en-US" branch="index" id="bm_id3145626"><bookmark_value>IMPRODUCT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMPRODUCT" id="bm_id3150661" localize="false"/><paragraph role="heading" id="hd_id3145626" xml-lang="en-US" level="2" oldref="122">IMPRODUCT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMPRODUCT" id="bm_id3150661" localize="false"/>
+<paragraph role="heading" id="hd_id3145626" xml-lang="en-US" level="2" oldref="122">IMPRODUCT</paragraph>
<paragraph role="paragraph" id="par_id3153545" xml-lang="en-US" l10n="U" oldref="123"><ahelp hid="HID_AAI_FUNC_IMPRODUCT">The result is the product of up to 29 complex numbers.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="3" l10n="U" oldref="124">Syntax</paragraph>
<paragraph role="code" id="par_id3149027" xml-lang="en-US" l10n="U" oldref="125">IMPRODUCT("ComplexNumber"; "ComplexNumber1"; ...)</paragraph>
@@ -208,7 +218,8 @@
<section id="imreal">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147539"><bookmark_value>IMREAL function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMREAL" id="bm_id3148596" localize="false"/><paragraph role="heading" id="hd_id3147539" xml-lang="en-US" level="2" oldref="129">IMREAL</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMREAL" id="bm_id3148596" localize="false"/>
+<paragraph role="heading" id="hd_id3147539" xml-lang="en-US" level="2" oldref="129">IMREAL</paragraph>
<paragraph role="paragraph" id="par_id3155372" xml-lang="en-US" l10n="U" oldref="130"><ahelp hid="HID_AAI_FUNC_IMREAL">The result is the real coefficient of a complex number.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154951" xml-lang="en-US" level="3" l10n="U" oldref="131">Syntax</paragraph>
<paragraph role="code" id="par_id3153927" xml-lang="en-US" l10n="U" oldref="132">IMREAL("ComplexNumber")</paragraph>
@@ -220,7 +231,8 @@
<section id="imsin">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148431"><bookmark_value>IMSIN function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMSIN" id="bm_id3153716" localize="false"/><paragraph role="heading" id="hd_id3148431" xml-lang="en-US" level="2" oldref="136">IMSIN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMSIN" id="bm_id3153716" localize="false"/>
+<paragraph role="heading" id="hd_id3148431" xml-lang="en-US" level="2" oldref="136">IMSIN</paragraph>
<paragraph role="paragraph" id="par_id3152591" xml-lang="en-US" l10n="U" oldref="137"><ahelp hid="HID_AAI_FUNC_IMSIN">The result is the sine of a complex number.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149822" xml-lang="en-US" level="3" l10n="U" oldref="138">Syntax</paragraph>
<paragraph role="code" id="par_id3150387" xml-lang="en-US" l10n="U" oldref="139">IMSIN("ComplexNumber")</paragraph>
@@ -232,7 +244,8 @@
<section id="imsub">
<bookmark xml-lang="en-US" branch="index" id="bm_id3163826"><bookmark_value>IMSUB function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMSUB" id="bm_id3152481" localize="false"/><paragraph role="heading" id="hd_id3163826" xml-lang="en-US" level="2" oldref="143">IMSUB</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMSUB" id="bm_id3152481" localize="false"/>
+<paragraph role="heading" id="hd_id3163826" xml-lang="en-US" level="2" oldref="143">IMSUB</paragraph>
<paragraph role="paragraph" id="par_id3149277" xml-lang="en-US" l10n="U" oldref="144"><ahelp hid="HID_AAI_FUNC_IMSUB">The result is the subtraction of two complex numbers.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149264" xml-lang="en-US" level="3" l10n="U" oldref="145">Syntax</paragraph>
<paragraph role="code" id="par_id3149710" xml-lang="en-US" l10n="U" oldref="146">IMSUB("ComplexNumber1"; "ComplexNumber2")</paragraph>
@@ -244,7 +257,8 @@
<section id="imsum">
<bookmark xml-lang="en-US" branch="index" id="bm_id3156312"><bookmark_value>IMSUM function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMSUM" id="bm_id3149454" localize="false"/><paragraph role="heading" id="hd_id3156312" xml-lang="en-US" level="2" oldref="150">IMSUM</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMSUM" id="bm_id3149454" localize="false"/>
+<paragraph role="heading" id="hd_id3156312" xml-lang="en-US" level="2" oldref="150">IMSUM</paragraph>
<paragraph role="paragraph" id="par_id3153215" xml-lang="en-US" l10n="U" oldref="151"><ahelp hid="HID_AAI_FUNC_IMSUM">The result is the sum of up to 29 complex numbers.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156095" xml-lang="en-US" level="3" l10n="U" oldref="152">Syntax</paragraph>
<paragraph role="code" id="par_id3152930" xml-lang="en-US" l10n="U" oldref="153">IMSUM("ComplexNumber1"; "ComplexNumber2"; ...)</paragraph>
@@ -256,7 +270,8 @@
<section id="imsqrt">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147570"><bookmark_value>IMSQRT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMSQRT" id="bm_id3151189" localize="false"/><paragraph role="heading" id="hd_id3147570" xml-lang="en-US" level="2" oldref="167">IMSQRT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_IMSQRT" id="bm_id3151189" localize="false"/>
+<paragraph role="heading" id="hd_id3147570" xml-lang="en-US" level="2" oldref="167">IMSQRT</paragraph>
<paragraph role="paragraph" id="par_id3156131" xml-lang="en-US" l10n="U" oldref="168"><ahelp hid="HID_AAI_FUNC_IMSQRT">The result is the square root of a complex number.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145202" xml-lang="en-US" level="3" l10n="U" oldref="169">Syntax</paragraph>
<paragraph role="code" id="par_id3150760" xml-lang="en-US" l10n="U" oldref="170">IMSQRT("ComplexNumber")</paragraph>
@@ -265,10 +280,11 @@
<paragraph role="paragraph" id="par_id3152807" xml-lang="en-US" l10n="U" oldref="173">
<item type="input">=IMSQRT("3+4i")</item> returns 2+1i.</paragraph>
</section>
-<section id="complex">
+<section id="complexfunc">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154054"><bookmark_value>COMPLEX function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COMPLEX" id="bm_id3156116" localize="false"/><paragraph role="heading" id="hd_id3154054" xml-lang="en-US" level="2" oldref="157">COMPLEX</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COMPLEX" id="bm_id3156116" localize="false"/>
+<paragraph role="heading" id="hd_id3154054" xml-lang="en-US" level="2" oldref="157">COMPLEX</paragraph>
<paragraph role="paragraph" id="par_id3156111" xml-lang="en-US" l10n="U" oldref="158"><ahelp hid="HID_AAI_FUNC_COMPLEX">The result is a complex number which is returned from a real coefficient and an imaginary coefficient.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154744" xml-lang="en-US" level="3" l10n="U" oldref="159">Syntax</paragraph>
<paragraph role="code" id="par_id3155999" xml-lang="en-US" l10n="U" oldref="160">COMPLEX(RealNum; INum; Suffix)</paragraph>
@@ -286,7 +302,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3155103"><bookmark_value>OCT2BIN function</bookmark_value>
<bookmark_value>converting;octal numbers, into binary numbers</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_OCT2BIN" id="bm_id3149290" localize="false"/><paragraph role="heading" id="hd_id3155103" xml-lang="en-US" level="2" l10n="E" oldref="217">OCT2BIN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_OCT2BIN" id="bm_id3149290" localize="false"/>
+<paragraph role="heading" id="hd_id3155103" xml-lang="en-US" level="2" l10n="E" oldref="217">OCT2BIN</paragraph>
<paragraph role="paragraph" id="par_id3146898" xml-lang="en-US" l10n="U" oldref="218"><ahelp hid="HID_AAI_FUNC_OCT2BIN">The result is the binary number for the octal number entered.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146088" xml-lang="en-US" level="3" l10n="U" oldref="219">Syntax</paragraph>
<paragraph role="code" id="par_id3154303" xml-lang="en-US" l10n="U" oldref="220">OCT2BIN(Number; Places)</paragraph>
@@ -302,7 +319,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3152791"><bookmark_value>OCT2DEC function</bookmark_value>
<bookmark_value>converting;octal numbers, into decimal numbers</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_OCT2DEZ" id="bm_id3151168" localize="false"/><paragraph role="heading" id="hd_id3152791" xml-lang="en-US" level="2" oldref="225">OCT2DEC</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_OCT2DEZ" id="bm_id3151168" localize="false"/>
+<paragraph role="heading" id="hd_id3152791" xml-lang="en-US" level="2" oldref="225">OCT2DEC</paragraph>
<paragraph role="paragraph" id="par_id3149199" xml-lang="en-US" l10n="U" oldref="226"><ahelp hid="HID_AAI_FUNC_OCT2DEZ">The result is the decimal number for the octal number entered.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3159337" xml-lang="en-US" level="3" l10n="U" oldref="227">Syntax</paragraph>
<paragraph role="code" id="par_id3153902" xml-lang="en-US" l10n="U" oldref="228">OCT2DEC(Number)</paragraph>
@@ -316,7 +334,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3155391"><bookmark_value>OCT2HEX function</bookmark_value>
<bookmark_value>converting;octal numbers, into hexadecimal numbers</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_OCT2HEX" id="bm_id3149904" localize="false"/><paragraph role="heading" id="hd_id3155391" xml-lang="en-US" level="2" oldref="232">OCT2HEX</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_OCT2HEX" id="bm_id3149904" localize="false"/>
+<paragraph role="heading" id="hd_id3155391" xml-lang="en-US" level="2" oldref="232">OCT2HEX</paragraph>
<paragraph role="paragraph" id="par_id3148831" xml-lang="en-US" l10n="U" oldref="233"><ahelp hid="HID_AAI_FUNC_OCT2HEX"> The result is the hexadecimal number for the octal number entered.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146988" xml-lang="en-US" level="3" l10n="U" oldref="234">Syntax</paragraph>
<paragraph role="code" id="par_id3150523" xml-lang="en-US" l10n="U" oldref="235">OCT2HEX(Number; Places)</paragraph>
@@ -331,135 +350,138 @@
<section id="convertadd">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148446"><bookmark_value>CONVERT_ADD function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_CONVERT" id="bm_id3150773" localize="false"/><paragraph role="heading" id="hd_id3148446" xml-lang="en-US" level="2" oldref="175">CONVERT_ADD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_CONVERT" id="bm_id3150773" localize="false"/>
+<paragraph role="heading" id="hd_id3148446" xml-lang="en-US" level="2" oldref="175">CONVERT_ADD</paragraph>
<paragraph role="paragraph" id="par_id3154902" xml-lang="en-US" l10n="U" oldref="176"><ahelp hid="HID_AAI_FUNC_CONVERT">Converts a value from one unit of measure to the corresponding value in another unit of measure.</ahelp> Enter the units of measures directly as text in quotation marks or as a reference. If you enter the units of measure in cells, they must correspond exactly with the following list which is case sensitive: For example, in order to enter a lower case l (for liter) in a cell, enter the apostrophe ' immediately followed by l.</paragraph>
<table id="tbl_id3149771">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3153055" xml-lang="en-US" l10n="U" oldref="177">Property</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3147234" xml-lang="en-US" l10n="U" oldref="178">Units</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147512" xml-lang="en-US" l10n="U" oldref="179">Weight</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148476" xml-lang="en-US" l10n="U" oldref="180">g, sg, lbm, u, ozm, stone, ton, grain, pweight, hweight, shweight</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155361" xml-lang="en-US" l10n="U" oldref="181">Length</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148925" xml-lang="en-US" l10n="U" oldref="182">m, mi, Nmi, in, ft, yd, ang, Pica, ell, parsec</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3158429" xml-lang="en-US" l10n="U" oldref="183">Time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150707" xml-lang="en-US" l10n="U" oldref="184">yr, day, hr, mn, sec</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153238" xml-lang="en-US" l10n="U" oldref="185">Pressure</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3166437" xml-lang="en-US" l10n="U" oldref="186">Pa, atm, mmHg, Torr, psi</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152944" xml-lang="en-US" l10n="U" oldref="187">Force</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155582" xml-lang="en-US" l10n="U" oldref="188">N, dyn, pond</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153686" xml-lang="en-US" l10n="U" oldref="189">Energy</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153386" xml-lang="en-US" l10n="U" oldref="190">J, e, c, cal, eV, HPh, Wh, BTU</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154100" xml-lang="en-US" l10n="U" oldref="191">Power</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149915" xml-lang="en-US" l10n="U" oldref="192">W, HP, PS</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148988" xml-lang="en-US" l10n="U" oldref="193">Field strength</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148616" xml-lang="en-US" l10n="U" oldref="194">T, ga</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151120" xml-lang="en-US" l10n="U" oldref="195">Temperature</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148659" xml-lang="en-US" l10n="U" oldref="196">C, F, K, Reau, Rank</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154610" xml-lang="en-US" l10n="U" oldref="197">Volume</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149423" xml-lang="en-US" l10n="U" oldref="198">l, tsp, tbs, oz, cup, pt, qt, gal, m3, mi3, Nmi3, in3, ft3, yd3, ang3, Pica3, barrel, bushel, regton, Schooner, Middy, Glass</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149244" xml-lang="en-US" l10n="U" oldref="199">Area</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150425" xml-lang="en-US" l10n="U" oldref="200">m2, mi2, Nmi2, in2, ft2, yd2, ang2, Pica2, Morgen, ar, acre, ha</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150629" xml-lang="en-US" l10n="U" oldref="201">Speed</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159246" xml-lang="en-US" l10n="U" oldref="202">m/s, m/h, mph, kn, admkn</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3143277" xml-lang="en-US" l10n="U" oldref="203">Each unit of measure must be preceded by a prefix character from the following list:</paragraph>
<table id="tbl_id3144759">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3148422" xml-lang="en-US" l10n="U" oldref="204">Permitted prefix characters</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
+<tablecell>
+</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149490" xml-lang="en-US" l10n="U" oldref="205">10^(&lt;0)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149931" xml-lang="en-US" l10n="U" oldref="206">d, c, m, u, n, p, f, a, z, y</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149589" xml-lang="en-US" l10n="U" oldref="207">10^(&gt;0)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151248" xml-lang="en-US" l10n="U" oldref="208">e, h, k, M, G, T, P, E, Z, Y</paragraph>
</tablecell>
</tablerow>
@@ -483,7 +505,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3147096"><bookmark_value>FACTDOUBLE function</bookmark_value>
<bookmark_value>factorials;numbers with increments of two</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_FACTDOUBLE" id="bm_id3150950" localize="false"/><paragraph role="heading" id="hd_id3147096" xml-lang="en-US" level="2" oldref="36">FACTDOUBLE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_FACTDOUBLE" id="bm_id3150950" localize="false"/>
+<paragraph role="heading" id="hd_id3147096" xml-lang="en-US" level="2" oldref="36">FACTDOUBLE</paragraph>
<paragraph role="paragraph" id="par_id3151309" xml-lang="en-US" l10n="CHG" oldref="37"><ahelp hid="HID_AAI_FUNC_FACTDOUBLE">Returns the double factorial of a number.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154666" xml-lang="en-US" level="3" l10n="U" oldref="38">Syntax</paragraph>
<paragraph role="code" id="par_id3155121" xml-lang="en-US" l10n="U" oldref="39">FACTDOUBLE(Number)</paragraph>
@@ -500,6 +523,11 @@
<paragraph role="paragraph" id="par_id3154116" xml-lang="en-US" l10n="U" oldref="43">
<item type="input">=FACTDOUBLE(6)</item> returns 48.</paragraph>
<paragraph role="paragraph" id="par_id6478469" xml-lang="en-US" l10n="NEW">
-<item type="input">=FACTDOUBLE(0)</item> returns 1.</paragraph><comment>see also FACT, MULTINOMIAL, PRODUCT </comment></section>
-</sort></body>
+<item type="input">=FACTDOUBLE(0)</item> returns 1.</paragraph><comment>see also FACT, MULTINOMIAL, PRODUCT </comment>
+</section>
+</sort>
+<section id="Section1">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060118.xhp b/helpcontent2/source/text/scalc/01/04060118.xhp
index e3b3231cb4..7225e15b9f 100644
--- a/helpcontent2/source/text/scalc/01/04060118.xhp
+++ b/helpcontent2/source/text/scalc/01/04060118.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060118.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060118xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060118xml" indexer="include">
<title id="tit" xml-lang="en-US">Financial Functions Part Three</title>
<filename>/text/scalc/01/04060118.xhp</filename>
</topic>
@@ -49,7 +47,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3145112"><bookmark_value>ODDFPRICE function</bookmark_value>
<bookmark_value>prices;securities with irregular first interest rate</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ODDFPRICE" id="bm_id3146107" localize="false"/><paragraph role="heading" id="hd_id3145112" xml-lang="en-US" level="2" oldref="71">ODDFPRICE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ODDFPRICE" id="bm_id3146107" localize="false"/>
+<paragraph role="heading" id="hd_id3145112" xml-lang="en-US" level="2" oldref="71">ODDFPRICE</paragraph>
<paragraph role="paragraph" id="par_id3147250" xml-lang="en-US" l10n="U" oldref="72"><ahelp hid="HID_AAI_FUNC_ODDFPRICE">Calculates the price per 100 currency units par value of a security, if the first interest date falls irregularly.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153074" xml-lang="en-US" level="3" l10n="U" oldref="73">Syntax</paragraph>
<paragraph role="code" id="par_id3146098" xml-lang="en-US" l10n="U" oldref="74">ODDFPRICE(Settlement; Maturity; Issue; FirstCoupon; Rate; Yield; Redemption; Frequency; Basis)</paragraph>
@@ -74,7 +73,8 @@
<section id="oddfyield">
<bookmark xml-lang="en-US" branch="index" id="bm_id3157871"><bookmark_value>ODDFYIELD function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ODDFYIELD" id="bm_id3149723" localize="false"/><paragraph role="heading" id="hd_id3157871" xml-lang="en-US" level="2" oldref="87">ODDFYIELD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ODDFYIELD" id="bm_id3149723" localize="false"/>
+<paragraph role="heading" id="hd_id3157871" xml-lang="en-US" level="2" oldref="87">ODDFYIELD</paragraph>
<paragraph role="paragraph" id="par_id3147414" xml-lang="en-US" l10n="U" oldref="88"><ahelp hid="HID_AAI_FUNC_ODDFYIELD">Calculates the yield of a security if the first interest date falls irregularly.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150651" xml-lang="en-US" level="3" l10n="U" oldref="89">Syntax</paragraph>
<paragraph role="code" id="par_id3152982" xml-lang="en-US" l10n="U" oldref="90">ODDFYIELD(Settlement; Maturity; Issue; FirstCoupon; Rate; Price; Redemption; Frequency; Basis)</paragraph>
@@ -99,7 +99,8 @@
<section id="oddlprice">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153933"><bookmark_value>ODDLPRICE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ODDLPRICE" id="bm_id3145596" localize="false"/><paragraph role="heading" id="hd_id3153933" xml-lang="en-US" level="2" oldref="103">ODDLPRICE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ODDLPRICE" id="bm_id3145596" localize="false"/>
+<paragraph role="heading" id="hd_id3153933" xml-lang="en-US" level="2" oldref="103">ODDLPRICE</paragraph>
<paragraph role="paragraph" id="par_id3145145" xml-lang="en-US" l10n="U" oldref="104"><ahelp hid="HID_AAI_FUNC_ODDLPRICE">Calculates the price per 100 currency units par value of a security, if the last interest date falls irregularly.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152784" xml-lang="en-US" level="3" l10n="U" oldref="105">Syntax</paragraph>
<paragraph role="code" id="par_id3155262" xml-lang="en-US" l10n="U" oldref="106">ODDLPRICE(Settlement; Maturity; LastInterest; Rate; Yield; Redemption; Frequency; Basis)</paragraph>
@@ -126,7 +127,8 @@
<section id="oddlyield">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153564"><bookmark_value>ODDLYIELD function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ODDLYIELD" id="bm_id3153732" localize="false"/><paragraph role="heading" id="hd_id3153564" xml-lang="en-US" level="2" oldref="118">ODDLYIELD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_ODDLYIELD" id="bm_id3153732" localize="false"/>
+<paragraph role="heading" id="hd_id3153564" xml-lang="en-US" level="2" oldref="118">ODDLYIELD</paragraph>
<paragraph role="paragraph" id="par_id3158002" xml-lang="en-US" l10n="U" oldref="119"><ahelp hid="HID_AAI_FUNC_ODDLYIELD">Calculates the yield of a security if the last interest date falls irregularly.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147366" xml-lang="en-US" level="3" l10n="U" oldref="120">Syntax</paragraph>
<paragraph role="code" id="par_id3150018" xml-lang="en-US" l10n="U" oldref="121">ODDLYIELD(Settlement; Maturity; LastInterest; Rate; Price; Redemption; Frequency; Basis)</paragraph>
@@ -155,7 +157,8 @@
<bookmark_value>depreciations;variable declining</bookmark_value>
<bookmark_value>VDB function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_VDB" id="bm_id3145624" localize="false"/><paragraph role="heading" id="hd_id3148768" xml-lang="en-US" level="2" oldref="222">VDB</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_VDB" id="bm_id3145624" localize="false"/>
+<paragraph role="heading" id="hd_id3148768" xml-lang="en-US" level="2" oldref="222">VDB</paragraph>
<paragraph role="paragraph" id="par_id3154636" xml-lang="en-US" l10n="U" oldref="223"><ahelp hid="HID_FUNC_VDB">Returns the depreciation of an asset for a specified or partial period using a variable declining balance method.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155519" xml-lang="en-US" level="3" l10n="U" oldref="224">Syntax</paragraph>
<paragraph role="code" id="par_id3149025" xml-lang="en-US" l10n="U" oldref="225">VDB(Cost; Salvage; Life; S; End; Factor; Type)</paragraph>
@@ -186,7 +189,8 @@
<bookmark_value>internal rates of return;irregular payments</bookmark_value>
<bookmark_value>XIRR function</bookmark_value>
</bookmark><comment>mw changed "calculating;..." and "internal rates of return"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_XIRR" id="bm_id3083443" localize="false"/><paragraph role="heading" id="hd_id3147485" xml-lang="en-US" level="2" oldref="193">XIRR</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_XIRR" id="bm_id3083443" localize="false"/>
+<paragraph role="heading" id="hd_id3147485" xml-lang="en-US" level="2" oldref="193">XIRR</paragraph>
<paragraph role="paragraph" id="par_id3145614" xml-lang="en-US" l10n="U" oldref="194"><ahelp hid="HID_AAI_FUNC_XIRR">Calculates the internal rate of return for a list of payments which take place on different dates.</ahelp> The calculation is based on a 365 days per year basis, ignoring leap years.</paragraph>
<paragraph role="paragraph" id="par_idN10E62" xml-lang="en-US">If the payments take place at regular intervals, use the IRR function.</paragraph>
<paragraph role="heading" id="hd_id3146149" xml-lang="en-US" level="3" l10n="U" oldref="195">Syntax</paragraph>
@@ -199,95 +203,101 @@
<paragraph role="paragraph" id="par_id3149273" xml-lang="en-US" l10n="U" oldref="200">Calculation of the internal rate of return for the following five payments:</paragraph>
<table id="tbl_id3152970">
<tablerow>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="paragraph" id="par_id3155838" xml-lang="en-US" l10n="U" oldref="305">A</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152934" xml-lang="en-US" l10n="U" oldref="306">B</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="U" oldref="307">C</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147083" xml-lang="en-US" l10n="U" oldref="308">1</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151187" xml-lang="en-US" l10n="CHG" oldref="309">2001-01-01</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145212" xml-lang="en-US" l10n="U" oldref="201">-<item type="input">10000</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146856" xml-lang="en-US" l10n="U" oldref="202">
<item type="input">Received</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153277" xml-lang="en-US" l10n="U" oldref="310">2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154052" xml-lang="en-US" l10n="CHG" oldref="203">2001-01-02</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151297" xml-lang="en-US" l10n="U" oldref="204">
<item type="input">2000</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149985" xml-lang="en-US" l10n="U" oldref="205">
<item type="input">Deposited</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154744" xml-lang="en-US" l10n="U" oldref="311">3</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153151" xml-lang="en-US" l10n="CHG" oldref="206">2001-03-15</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145657" xml-lang="en-US" l10n="U" oldref="207">2500</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
+<tablecell>
+</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155101" xml-lang="en-US" l10n="U" oldref="312">4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146894" xml-lang="en-US" l10n="CHG" oldref="208">2001-05-12</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3143231" xml-lang="en-US" l10n="U" oldref="209">5000</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
+<tablecell>
+</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156012" xml-lang="en-US" l10n="U" oldref="313">5</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149758" xml-lang="en-US" l10n="CHG" oldref="210">2001-08-10</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147495" xml-lang="en-US" l10n="U" oldref="211">1000</paragraph>
</tablecell>
-<tablecell colspan="" rowspan=""/>
+<tablecell>
+</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3152793" xml-lang="en-US" l10n="U" oldref="212">=XIRR(B1:B5; A1:A5; 0.1) returns 0.1828.</paragraph>
</section>
<section id="xnpv">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149198"><bookmark_value>XNPV function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_XNPV" id="bm_id3151172" localize="false"/><paragraph role="heading" id="hd_id3149198" xml-lang="en-US" level="2" oldref="213">XNPV</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_XNPV" id="bm_id3151172" localize="false"/>
+<paragraph role="heading" id="hd_id3149198" xml-lang="en-US" level="2" oldref="213">XNPV</paragraph>
<paragraph role="paragraph" id="par_id3153904" xml-lang="en-US" l10n="U" oldref="214"><ahelp hid="HID_AAI_FUNC_XNPV">Calculates the capital value (net present value)for a list of payments which take place on different dates.</ahelp> The calculation is based on a 365 days per year basis, ignoring leap years.</paragraph>
<paragraph role="paragraph" id="par_idN11138" xml-lang="en-US">If the payments take place at regular intervals, use the NPV function.</paragraph>
<paragraph role="heading" id="hd_id3155323" xml-lang="en-US" level="3" l10n="U" oldref="215">Syntax</paragraph>
@@ -305,7 +315,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3148822"><bookmark_value>calculating;rates of return</bookmark_value>
<bookmark_value>RRI function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZGZ" id="bm_id3146996" localize="false"/><paragraph role="heading" id="hd_id3148822" xml-lang="en-US" level="2" oldref="237">RRI</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZGZ" id="bm_id3146996" localize="false"/>
+<paragraph role="heading" id="hd_id3148822" xml-lang="en-US" level="2" oldref="237">RRI</paragraph>
<paragraph role="paragraph" id="par_id3154293" xml-lang="en-US" l10n="U" oldref="238"><ahelp hid="HID_FUNC_ZGZ">Calculates the interest rate resulting from the profit (return) of an investment.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148444" xml-lang="en-US" level="3" l10n="U" oldref="239">Syntax</paragraph>
<paragraph role="code" id="par_id3148804" xml-lang="en-US" l10n="U" oldref="240">RRI(P; PV; FV)</paragraph>
@@ -326,7 +337,8 @@
<bookmark_value>constant interest rates</bookmark_value>
<bookmark_value>RATE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZINS" id="bm_id3153581" localize="false"/><paragraph role="heading" id="hd_id3154267" xml-lang="en-US" level="2" oldref="249">RATE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZINS" id="bm_id3153581" localize="false"/>
+<paragraph role="heading" id="hd_id3154267" xml-lang="en-US" level="2" oldref="249">RATE</paragraph>
<paragraph role="paragraph" id="par_id3151052" xml-lang="en-US" l10n="U" oldref="250"><ahelp hid="HID_FUNC_ZINS">Returns the constant interest rate per period of an annuity.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154272" xml-lang="en-US" level="3" l10n="U" oldref="251">Syntax</paragraph>
<paragraph role="code" id="par_id3158423" xml-lang="en-US" l10n="U" oldref="252">RATE(NPer; Pmt; PV; FV; Type; Guess)</paragraph>
@@ -353,7 +365,8 @@
<section id="intrate">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149106"><bookmark_value>INTRATE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_INTRATE" id="bm_id3152944" localize="false"/><paragraph role="heading" id="hd_id3149106" xml-lang="en-US" level="2" oldref="60">INTRATE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_INTRATE" id="bm_id3152944" localize="false"/>
+<paragraph role="heading" id="hd_id3149106" xml-lang="en-US" level="2" oldref="60">INTRATE</paragraph>
<paragraph role="paragraph" id="par_id3149918" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid="HID_AAI_FUNC_INTRATE">Calculates the annual interest rate that results when a security (or other item) is purchased at an investment value and sold at a redemption value. No interest is paid.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149974" xml-lang="en-US" level="3" l10n="U" oldref="62">Syntax</paragraph>
<paragraph role="code" id="par_id3149800" xml-lang="en-US" l10n="U" oldref="63">INTRATE(Settlement; Maturity; Investment; Redemption; Basis)</paragraph>
@@ -373,7 +386,8 @@
<section id="coupncd">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148654"><bookmark_value>COUPNCD function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COUPNCD" id="bm_id3148413" localize="false"/><paragraph role="heading" id="hd_id3148654" xml-lang="en-US" level="2" oldref="163">COUPNCD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COUPNCD" id="bm_id3148413" localize="false"/>
+<paragraph role="heading" id="hd_id3148654" xml-lang="en-US" level="2" oldref="163">COUPNCD</paragraph>
<paragraph role="paragraph" id="par_id3149927" xml-lang="en-US" l10n="U" oldref="164"><ahelp hid="HID_AAI_FUNC_COUPNCD">Returns the date of the first interest date after the settlement date. Format the result as a date.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153317" xml-lang="en-US" level="3" l10n="U" oldref="165">Syntax</paragraph>
<paragraph role="code" id="par_id3150423" xml-lang="en-US" l10n="U" oldref="166">COUPNCD(Settlement; Maturity; Frequency; Basis)</paragraph>
@@ -391,7 +405,8 @@
<section id="coupdays">
<bookmark xml-lang="en-US" branch="index" id="bm_id3143281"><bookmark_value>COUPDAYS function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COUPDAYS" id="bm_id3144759" localize="false"/><paragraph role="heading" id="hd_id3143281" xml-lang="en-US" level="2" oldref="143">COUPDAYS</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COUPDAYS" id="bm_id3144759" localize="false"/>
+<paragraph role="heading" id="hd_id3143281" xml-lang="en-US" level="2" oldref="143">COUPDAYS</paragraph>
<paragraph role="paragraph" id="par_id3149488" xml-lang="en-US" l10n="U" oldref="144"><ahelp hid="HID_AAI_FUNC_COUPDAYS">Returns the number of days in the current interest period in which the settlement date falls.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148685" xml-lang="en-US" level="3" l10n="U" oldref="145">Syntax</paragraph>
<paragraph role="code" id="par_id3149585" xml-lang="en-US" l10n="U" oldref="146">COUPDAYS(Settlement; Maturity; Frequency; Basis)</paragraph>
@@ -409,7 +424,8 @@
<section id="coupdaysnc">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154832"><bookmark_value>COUPDAYSNC function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COUPDAYSNC" id="bm_id3150941" localize="false"/><paragraph role="heading" id="hd_id3154832" xml-lang="en-US" level="2" oldref="153">COUPDAYSNC</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COUPDAYSNC" id="bm_id3150941" localize="false"/>
+<paragraph role="heading" id="hd_id3154832" xml-lang="en-US" level="2" oldref="153">COUPDAYSNC</paragraph>
<paragraph role="paragraph" id="par_id3147100" xml-lang="en-US" l10n="U" oldref="154"><ahelp hid="HID_AAI_FUNC_COUPDAYSNC">Returns the number of days from the settlement date until the next interest date.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3151312" xml-lang="en-US" level="3" l10n="U" oldref="155">Syntax</paragraph>
<paragraph role="code" id="par_id3155121" xml-lang="en-US" l10n="U" oldref="156">COUPDAYSNC(Settlement; Maturity; Frequency; Basis)</paragraph>
@@ -429,7 +445,8 @@
<bookmark_value>durations;first interest payment until settlement date</bookmark_value>
<bookmark_value>securities;first interest payment until settlement date</bookmark_value>
</bookmark><comment>mw added "durations;" and "securities;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COUPDAYBS" id="bm_id3153775" localize="false"/><paragraph role="heading" id="hd_id3150408" xml-lang="en-US" level="2" oldref="133">COUPDAYBS</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COUPDAYBS" id="bm_id3153775" localize="false"/>
+<paragraph role="heading" id="hd_id3150408" xml-lang="en-US" level="2" oldref="133">COUPDAYBS</paragraph>
<paragraph role="paragraph" id="par_id3146795" xml-lang="en-US" l10n="U" oldref="134"><ahelp hid="HID_AAI_FUNC_COUPDAYBS">Returns the number of days from the first day of interest payment on a security until the settlement date.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156142" xml-lang="en-US" level="3" l10n="U" oldref="135">Syntax</paragraph>
<paragraph role="code" id="par_id3159083" xml-lang="en-US" l10n="U" oldref="136">COUPDAYBS(Settlement; Maturity; Frequency; Basis)</paragraph>
@@ -448,7 +465,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3152957"><bookmark_value>COUPPCD function</bookmark_value>
<bookmark_value>dates;interest date prior to settlement date</bookmark_value>
</bookmark><comment>mw added "dates;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COUPPCD" id="bm_id3149553" localize="false"/><paragraph role="heading" id="hd_id3152957" xml-lang="en-US" level="2" oldref="183">COUPPCD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COUPPCD" id="bm_id3149553" localize="false"/>
+<paragraph role="heading" id="hd_id3152957" xml-lang="en-US" level="2" oldref="183">COUPPCD</paragraph>
<paragraph role="paragraph" id="par_id3153678" xml-lang="en-US" l10n="U" oldref="184"><ahelp hid="HID_AAI_FUNC_COUPPCD">Returns the date of the interest date prior to the settlement date. Format the result as a date.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156269" xml-lang="en-US" level="3" l10n="U" oldref="185">Syntax</paragraph>
<paragraph role="code" id="par_id3153790" xml-lang="en-US" l10n="U" oldref="186">COUPPCD(Settlement; Maturity; Frequency; Basis)</paragraph>
@@ -467,7 +485,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3150673"><bookmark_value>COUPNUM function</bookmark_value>
<bookmark_value>number of coupons</bookmark_value>
</bookmark><comment>mw added "number..."</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COUPNUM" id="bm_id3153348" localize="false"/><paragraph role="heading" id="hd_id3150673" xml-lang="en-US" level="2" oldref="173">COUPNUM</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_COUPNUM" id="bm_id3153348" localize="false"/>
+<paragraph role="heading" id="hd_id3150673" xml-lang="en-US" level="2" oldref="173">COUPNUM</paragraph>
<paragraph role="paragraph" id="par_id3154350" xml-lang="en-US" l10n="U" oldref="174"><ahelp hid="HID_AAI_FUNC_COUPNUM">Returns the number of coupons (interest payments) between the settlement date and the maturity date.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148400" xml-lang="en-US" level="3" l10n="U" oldref="175">Syntax</paragraph>
<paragraph role="code" id="par_id3153200" xml-lang="en-US" l10n="U" oldref="176">COUPNUM(Settlement; Maturity; Frequency; Basis)</paragraph>
@@ -486,7 +505,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3149339"><bookmark_value>IPMT function</bookmark_value>
<bookmark_value>periodic amortizement rates</bookmark_value>
</bookmark><comment>mw added "periodic..."</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZINSZ" id="bm_id3149737" localize="false"/><paragraph role="heading" id="hd_id3149339" xml-lang="en-US" level="2" oldref="263">IPMT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZINSZ" id="bm_id3149737" localize="false"/>
+<paragraph role="heading" id="hd_id3149339" xml-lang="en-US" level="2" oldref="263">IPMT</paragraph>
<paragraph role="paragraph" id="par_id3154522" xml-lang="en-US" l10n="U" oldref="264"><ahelp hid="HID_FUNC_ZINSZ">Calculates the periodic amortizement for an investment with regular payments and a constant interest rate.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153266" xml-lang="en-US" level="3" l10n="U" oldref="265">Syntax</paragraph>
<paragraph role="code" id="par_id3151283" xml-lang="en-US" l10n="U" oldref="266">IPMT(Rate; Period; NPer; PV; FV; Type)</paragraph>
@@ -512,7 +532,8 @@
<bookmark_value>future values;constant interest rates</bookmark_value>
<bookmark_value>FV function</bookmark_value>
</bookmark><comment>mw made "future values..." a two level entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZW" id="bm_id3156049" localize="false"/><paragraph role="heading" id="hd_id3151205" xml-lang="en-US" level="2" oldref="277">FV</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZW" id="bm_id3156049" localize="false"/>
+<paragraph role="heading" id="hd_id3151205" xml-lang="en-US" level="2" oldref="277">FV</paragraph>
<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="278"><ahelp hid="HID_FUNC_ZW">Returns the future value of an investment based on periodic, constant payments and a constant interest rate (Future Value).</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155178" xml-lang="en-US" level="3" l10n="U" oldref="279">Syntax</paragraph>
<paragraph role="code" id="par_id3145215" xml-lang="en-US" l10n="U" oldref="280">FV(Rate; NPer; Pmt; PV; Type)</paragraph>
@@ -538,7 +559,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3155912"><bookmark_value>FVSCHEDULE function</bookmark_value>
<bookmark_value>future values;varying interest rates</bookmark_value>
</bookmark><comment>mw added "future values"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_FVSCHEDULE" id="bm_id3155341" localize="false"/><paragraph role="heading" id="hd_id3155912" xml-lang="en-US" level="2" oldref="51">FVSCHEDULE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_FVSCHEDULE" id="bm_id3155341" localize="false"/>
+<paragraph role="heading" id="hd_id3155912" xml-lang="en-US" level="2" oldref="51">FVSCHEDULE</paragraph>
<paragraph role="paragraph" id="par_id3163726" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="HID_AAI_FUNC_FVSCHEDULE">Calculates the accumulated value of the starting capital for a series of periodically varying interest rates.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149571" xml-lang="en-US" level="3" l10n="U" oldref="53">Syntax</paragraph>
<paragraph role="code" id="par_id3148891" xml-lang="en-US" l10n="U" oldref="54">FVSCHEDULE(Principal; Schedule)</paragraph>
@@ -557,7 +579,8 @@
<bookmark_value>number of payment periods</bookmark_value>
<bookmark_value>NPER function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZZR" id="bm_id3154917" localize="false"/><paragraph role="heading" id="hd_id3156435" xml-lang="en-US" level="2" oldref="290">NPER</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ZZR" id="bm_id3154917" localize="false"/>
+<paragraph role="heading" id="hd_id3156435" xml-lang="en-US" level="2" oldref="290">NPER</paragraph>
<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="291"><ahelp hid="HID_FUNC_ZZR">Returns the number of periods for an investment based on periodic, constant payments and a constant interest rate.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147216" xml-lang="en-US" level="3" l10n="U" oldref="292">Syntax</paragraph>
<paragraph role="code" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="293">NPER(Rate; Pmt; PV; FV; Type)</paragraph>
@@ -582,5 +605,6 @@
</sort>
<paragraph role="paragraph" id="par_id3150309" xml-lang="en-US" l10n="U" oldref="314"><link href="text/scalc/01/04060103.xhp" name="Back to Financial Functions Part One">Back to Financial Functions Part One</link></paragraph>
<paragraph role="paragraph" id="par_id3153163" xml-lang="en-US" l10n="U" oldref="315"><link href="text/scalc/01/04060119.xhp" name="Back to Financial Functions Part Two">Back to Financial Functions Part Two</link></paragraph>
+<embed href="text/scalc/01/04060100.xhp#drking"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060119.xhp b/helpcontent2/source/text/scalc/01/04060119.xhp
index 3f091596c2..e45bfe6211 100644
--- a/helpcontent2/source/text/scalc/01/04060119.xhp
+++ b/helpcontent2/source/text/scalc/01/04060119.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060119.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060119xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060119xml" indexer="include">
<title id="tit" xml-lang="en-US">Financial Functions Part Two</title>
<filename>/text/scalc/01/04060119.xhp</filename>
</topic>
@@ -45,14 +43,16 @@
<body>
<paragraph role="heading" id="hd_id3149052" xml-lang="en-US" level="1" l10n="U" oldref="1">Financial Functions Part Two</paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000404.xhp#eikafi"/>
+<embed href="text/scalc/00/00000404.xhp#eikafi"/>
</section>
<paragraph role="paragraph" id="par_id3148742" xml-lang="en-US" l10n="U" oldref="343"><link href="text/scalc/01/04060103.xhp" name="Back to Financial Functions Part One">Back to Financial Functions Part One</link></paragraph>
<paragraph role="paragraph" id="par_id3151341" xml-lang="en-US" l10n="U" oldref="344"><link href="text/scalc/01/04060118.xhp" name="Forward to Financial Functions Part Three">Forward to Financial Functions Part Three</link></paragraph>
-<sort order="asc"><section id="ppmt">
+<sort order="asc">
+<section id="ppmt">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150026"><bookmark_value>PPMT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KAPZ" id="bm_id3145827" localize="false"/><paragraph role="heading" id="hd_id3150026" xml-lang="en-US" level="2" l10n="U" oldref="238">PPMT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KAPZ" id="bm_id3145827" localize="false"/>
+<paragraph role="heading" id="hd_id3150026" xml-lang="en-US" level="2" l10n="U" oldref="238">PPMT</paragraph>
<paragraph role="paragraph" id="par_id3146942" xml-lang="en-US" l10n="U" oldref="239"><ahelp hid="HID_FUNC_KAPZ">Returns for a given period the payment on the principal for an investment that is based on periodic and constant payments and a constant interest rate.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150459" xml-lang="en-US" level="3" l10n="U" oldref="240">Syntax</paragraph>
<paragraph role="code" id="par_id3146878" xml-lang="en-US" l10n="U" oldref="241">PPMT(Rate; Period; NPer; PV; FV; Type)</paragraph>
@@ -83,7 +83,8 @@
<bookmark_value>repayment installment</bookmark_value>
<bookmark_value>CUMPRINC function</bookmark_value>
</bookmark><comment>mw added two entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KUMKAPITAL" id="bm_id3148754" localize="false"/><paragraph role="heading" id="hd_id3146139" xml-lang="en-US" level="2" oldref="252">CUMPRINC</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KUMKAPITAL" id="bm_id3148754" localize="false"/>
+<paragraph role="heading" id="hd_id3146139" xml-lang="en-US" level="2" oldref="252">CUMPRINC</paragraph>
<paragraph role="paragraph" id="par_id3150140" xml-lang="en-US" l10n="U" oldref="253"><ahelp hid="HID_FUNC_KUMKAPITAL">Returns the cumulative interest paid for an investment period with a constant interest rate.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149188" xml-lang="en-US" level="3" l10n="U" oldref="254">Syntax</paragraph>
<paragraph role="code" id="par_id3148733" xml-lang="en-US" l10n="U" oldref="255">CUMPRINC(Rate; NPer; PV; S; E; Type)</paragraph>
@@ -107,7 +108,8 @@
<section id="cumprinc_add">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150019"><bookmark_value>CUMPRINC_ADD function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_CUMPRINC" id="bm_id3154330" localize="false"/><paragraph role="heading" id="hd_id3150019" xml-lang="en-US" level="2" oldref="182">CUMPRINC_ADD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_CUMPRINC" id="bm_id3154330" localize="false"/>
+<paragraph role="heading" id="hd_id3150019" xml-lang="en-US" level="2" oldref="182">CUMPRINC_ADD</paragraph>
<paragraph role="paragraph" id="par_id3145246" xml-lang="en-US" l10n="U" oldref="183"><ahelp hid="HID_AAI_FUNC_CUMPRINC"> Calculates the cumulative redemption of a loan in a period.</ahelp></paragraph>
<embed href="text/scalc/01/04060102.xhp#ADD_note"/>
<paragraph role="heading" id="hd_id3153047" xml-lang="en-US" level="3" l10n="U" oldref="184">Syntax</paragraph>
@@ -139,7 +141,8 @@
<bookmark_value>accumulated interests</bookmark_value>
<bookmark_value>CUMIPMT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KUMZINSZ" id="bm_id3148593" localize="false"/><paragraph role="heading" id="hd_id3155370" xml-lang="en-US" level="2" oldref="266">CUMIPMT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KUMZINSZ" id="bm_id3148593" localize="false"/>
+<paragraph role="heading" id="hd_id3155370" xml-lang="en-US" level="2" oldref="266">CUMIPMT</paragraph>
<paragraph role="paragraph" id="par_id3158411" xml-lang="en-US" l10n="U" oldref="267"><ahelp hid="HID_FUNC_KUMZINSZ">Calculates the cumulative interest payments, that is, the total interest, for an investment based on a constant interest rate.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155814" xml-lang="en-US" level="3" l10n="U" oldref="268">Syntax</paragraph>
<paragraph role="code" id="par_id3147536" xml-lang="en-US" l10n="U" oldref="269">CUMIPMT(Rate; NPer; PV; S; E; Type)</paragraph>
@@ -163,7 +166,8 @@
<section id="cumipmt_add">
<bookmark xml-lang="en-US" branch="index" id="bm_id3083280"><bookmark_value>CUMIPMT_ADD function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_CUMIPMT" id="bm_id3154312" localize="false"/><paragraph role="heading" id="hd_id3083280" xml-lang="en-US" level="2" oldref="165">CUMIPMT_ADD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_CUMIPMT" id="bm_id3154312" localize="false"/>
+<paragraph role="heading" id="hd_id3083280" xml-lang="en-US" level="2" oldref="165">CUMIPMT_ADD</paragraph>
<paragraph role="paragraph" id="par_id3152482" xml-lang="en-US" l10n="U" oldref="166"><ahelp hid="HID_AAI_FUNC_CUMIPMT">Calculates the accumulated interest for a period.</ahelp></paragraph>
<embed href="text/scalc/01/04060102.xhp#ADD_note"/>
<paragraph role="heading" id="hd_id3149713" xml-lang="en-US" level="3" l10n="U" oldref="167">Syntax</paragraph>
@@ -195,7 +199,8 @@
<bookmark_value>prices; fixed interest securities</bookmark_value>
<bookmark_value>sales values;fixed interest securities</bookmark_value>
</bookmark><comment>mw added two entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_PRICE" id="bm_id3153279" localize="false"/><paragraph role="heading" id="hd_id3150878" xml-lang="en-US" level="2" oldref="9">PRICE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_PRICE" id="bm_id3153279" localize="false"/>
+<paragraph role="heading" id="hd_id3150878" xml-lang="en-US" level="2" oldref="9">PRICE</paragraph>
<paragraph role="paragraph" id="par_id3153210" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_AAI_FUNC_PRICE">Calculates the market value of a fixed interest security with a par value of 100 currency units as a function of the forecast yield.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154646" xml-lang="en-US" level="3" l10n="U" oldref="11">Syntax</paragraph>
<paragraph role="code" id="par_id3152804" xml-lang="en-US" l10n="U" oldref="12">PRICE(Settlement; Maturity; Rate; Yield; Redemption; Frequency; Basis)</paragraph>
@@ -221,7 +226,8 @@
<bookmark_value>prices;non-interest-bearing securities</bookmark_value>
<bookmark_value>sales values;non-interest-bearing securities</bookmark_value>
</bookmark><comment>mw added two entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_PRICEDISC" id="bm_id3143236" localize="false"/><paragraph role="heading" id="hd_id3151297" xml-lang="en-US" level="2" oldref="22">PRICEDISC</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_PRICEDISC" id="bm_id3143236" localize="false"/>
+<paragraph role="heading" id="hd_id3151297" xml-lang="en-US" level="2" oldref="22">PRICEDISC</paragraph>
<paragraph role="paragraph" id="par_id3155100" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_AAI_FUNC_PRICEDISC">Calculates the price per 100 currency units of par value of a non-interest- bearing security.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149294" xml-lang="en-US" level="3" l10n="U" oldref="24">Syntax</paragraph>
<paragraph role="code" id="par_id3146084" xml-lang="en-US" l10n="U" oldref="25">PRICEDISC(Settlement; Maturity; Discount; Redemption; Basis)</paragraph>
@@ -242,7 +248,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3154693"><bookmark_value>PRICEMAT function</bookmark_value>
<bookmark_value>prices;interest-bearing securities</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_PRICEMAT" id="bm_id3150118" localize="false"/><paragraph role="heading" id="hd_id3154693" xml-lang="en-US" level="2" oldref="33">PRICEMAT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_PRICEMAT" id="bm_id3150118" localize="false"/>
+<paragraph role="heading" id="hd_id3154693" xml-lang="en-US" level="2" oldref="33">PRICEMAT</paragraph>
<paragraph role="paragraph" id="par_id3153906" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_AAI_FUNC_PRICEMAT">Calculates the price per 100 currency units of par value of a security, that pays interest on the maturity date.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154933" xml-lang="en-US" level="3" l10n="U" oldref="35">Syntax</paragraph>
<paragraph role="code" id="par_id3155393" xml-lang="en-US" l10n="U" oldref="36">PRICEMAT(Settlement; Maturity; Issue; Rate; Yield; Basis)</paragraph>
@@ -267,7 +274,8 @@
<bookmark_value>durations;calculating</bookmark_value>
<bookmark_value>DURATION function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_LAUFZEIT" id="bm_id3154208" localize="false"/><paragraph role="heading" id="hd_id3148448" xml-lang="en-US" level="2" l10n="U" oldref="280">DURATION</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_LAUFZEIT" id="bm_id3154208" localize="false"/>
+<paragraph role="heading" id="hd_id3148448" xml-lang="en-US" level="2" l10n="U" oldref="280">DURATION</paragraph>
<paragraph role="paragraph" id="par_id3153056" xml-lang="en-US" l10n="CHG" oldref="281"><ahelp hid="HID_FUNC_LAUFZEIT">Calculates the number of periods required by an investment to attain the desired value.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145421" xml-lang="en-US" level="3" l10n="U" oldref="282">Syntax</paragraph>
<paragraph role="code" id="par_id3148933" xml-lang="en-US" l10n="U" oldref="283">DURATION(Rate; PV; FV)</paragraph>
@@ -287,7 +295,8 @@
<bookmark_value>straight-line depreciations</bookmark_value>
<bookmark_value>SLN function</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_LIA" id="bm_id3154275" localize="false"/><paragraph role="heading" id="hd_id3148912" xml-lang="en-US" level="2" l10n="U" oldref="290">SLN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_LIA" id="bm_id3154275" localize="false"/>
+<paragraph role="heading" id="hd_id3148912" xml-lang="en-US" level="2" l10n="U" oldref="290">SLN</paragraph>
<paragraph role="paragraph" id="par_id3149154" xml-lang="en-US" l10n="U" oldref="291"><ahelp hid="HID_FUNC_LIA">Returns the straight-line depreciation of an asset for one period.</ahelp>The amount of the depreciation is constant during the depreciation period.</paragraph>
<paragraph role="heading" id="hd_id3153240" xml-lang="en-US" level="3" l10n="U" oldref="292">Syntax</paragraph>
<paragraph role="code" id="par_id3166456" xml-lang="en-US" l10n="U" oldref="293">SLN(Cost; Salvage; Life)</paragraph>
@@ -306,7 +315,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3153739"><bookmark_value>MDURATION function</bookmark_value>
<bookmark_value>Macauley duration</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_MDURATION" id="bm_id3153750" localize="false"/><paragraph role="heading" id="hd_id3153739" xml-lang="en-US" level="2" oldref="217">MDURATION</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_MDURATION" id="bm_id3153750" localize="false"/>
+<paragraph role="heading" id="hd_id3153739" xml-lang="en-US" level="2" oldref="217">MDURATION</paragraph>
<paragraph role="paragraph" id="par_id3149923" xml-lang="en-US" l10n="U" oldref="218"><ahelp hid="HID_AAI_FUNC_MDURATION">Calculates the modified Macauley duration of a fixed interest security in years.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149964" xml-lang="en-US" level="3" l10n="U" oldref="219">Syntax</paragraph>
<paragraph role="code" id="par_id3148987" xml-lang="en-US" l10n="U" oldref="220">MDURATION(Settlement; Maturity; Coupon; Yield; Frequency; Basis)</paragraph>
@@ -330,7 +340,8 @@
<bookmark_value>net present values</bookmark_value>
<bookmark_value>NPV function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_NBW" id="bm_id3148417" localize="false"/><paragraph role="heading" id="hd_id3149242" xml-lang="en-US" level="2" l10n="U" oldref="301">NPV</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_NBW" id="bm_id3148417" localize="false"/>
+<paragraph role="heading" id="hd_id3149242" xml-lang="en-US" level="2" l10n="U" oldref="301">NPV</paragraph>
<paragraph role="paragraph" id="par_id3145308" xml-lang="en-US" l10n="CHG" oldref="302"><ahelp hid="HID_FUNC_NBW">Returns the present value of an investment based on a series of periodic cash flows and a discount rate. To get the net present value, subtract the cost of the project (the initial cash flow at time zero) from the returned value.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149937" xml-lang="en-US" level="3" l10n="U" oldref="303">Syntax</paragraph>
<paragraph role="code" id="par_id3153321" xml-lang="en-US" l10n="U" oldref="304">NPV(Rate; Value1; Value2; ...)</paragraph>
@@ -348,7 +359,8 @@
<bookmark_value>nominal interest rates</bookmark_value>
<bookmark_value>NOMINAL function</bookmark_value>
</bookmark><comment>mw made "nominal interest rates;..." a one level entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_NOMINAL" id="bm_id3145600" localize="false"/><paragraph role="heading" id="hd_id3149484" xml-lang="en-US" level="2" l10n="U" oldref="311">NOMINAL</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_NOMINAL" id="bm_id3145600" localize="false"/>
+<paragraph role="heading" id="hd_id3149484" xml-lang="en-US" level="2" l10n="U" oldref="311">NOMINAL</paragraph>
<paragraph role="paragraph" id="par_id3149596" xml-lang="en-US" l10n="U" oldref="312"><ahelp hid="HID_FUNC_NOMINAL">Calculates the yearly nominal interest rate, given the effective rate and the number of compounding periods per year.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3151252" xml-lang="en-US" level="3" l10n="U" oldref="313">Syntax</paragraph>
<paragraph role="code" id="par_id3152769" xml-lang="en-US" l10n="U" oldref="314">NOMINAL(EffectiveRate; NPerY)</paragraph>
@@ -364,7 +376,8 @@
<section id="nominal_add">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155123"><bookmark_value>NOMINAL_ADD function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_NOMINAL" id="bm_id3158439" localize="false"/><paragraph role="heading" id="hd_id3155123" xml-lang="en-US" level="2" oldref="229">NOMINAL_ADD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_NOMINAL" id="bm_id3158439" localize="false"/>
+<paragraph role="heading" id="hd_id3155123" xml-lang="en-US" level="2" oldref="229">NOMINAL_ADD</paragraph>
<paragraph role="paragraph" id="par_id3148671" xml-lang="en-US" l10n="U" oldref="230"><ahelp hid="HID_AAI_FUNC_NOMINAL">Calculates the annual nominal rate of interest on the basis of the effective rate and the number of interest payments per annum.</ahelp></paragraph>
<embed href="text/scalc/01/04060102.xhp#ADD_note"/>
<paragraph role="heading" id="hd_id3155611" xml-lang="en-US" level="3" l10n="U" oldref="231">Syntax</paragraph>
@@ -382,7 +395,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3159087"><bookmark_value>DOLLARFR function</bookmark_value>
<bookmark_value>converting;decimal fractions, into mixed decimal fractions</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DOLLARFR" id="bm_id3146907" localize="false"/><paragraph role="heading" id="hd_id3159087" xml-lang="en-US" level="2" oldref="208">DOLLARFR</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DOLLARFR" id="bm_id3146907" localize="false"/>
+<paragraph role="heading" id="hd_id3159087" xml-lang="en-US" level="2" oldref="208">DOLLARFR</paragraph>
<paragraph role="paragraph" id="par_id3150593" xml-lang="en-US" l10n="U" oldref="209"><ahelp hid="HID_AAI_FUNC_DOLLARFR">Converts a quotation that has been given as a decimal number into a mixed decimal fraction.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3151106" xml-lang="en-US" level="3" l10n="U" oldref="210">Syntax</paragraph>
<paragraph role="code" id="par_id3152959" xml-lang="en-US" l10n="U" oldref="211">DOLLARFR(DecimalDollar; Fraction)</paragraph>
@@ -401,7 +415,8 @@
<bookmark_value>converting;decimal fractions, into decimal numbers</bookmark_value>
<bookmark_value>DOLLARDE function</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DOLLARDE" id="bm_id3154569" localize="false"/><paragraph role="heading" id="hd_id3154671" xml-lang="en-US" level="2" oldref="199">DOLLARDE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_DOLLARDE" id="bm_id3154569" localize="false"/>
+<paragraph role="heading" id="hd_id3154671" xml-lang="en-US" level="2" oldref="199">DOLLARDE</paragraph>
<paragraph role="paragraph" id="par_id3154418" xml-lang="en-US" l10n="U" oldref="200"><ahelp hid="HID_AAI_FUNC_DOLLARDE">Converts a quotation that has been given as a decimal fraction into a decimal number.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146124" xml-lang="en-US" level="3" l10n="U" oldref="201">Syntax</paragraph>
<paragraph role="code" id="par_id3150348" xml-lang="en-US" l10n="U" oldref="202">DOLLARDE(FractionalDollar; Fraction)</paragraph>
@@ -421,7 +436,8 @@
<bookmark_value>MIRR function</bookmark_value>
<bookmark_value>internal rates of return;modified</bookmark_value>
</bookmark><comment>mw added "internal rates of return;..."</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_QIKV" id="bm_id3150670" localize="false"/><paragraph role="heading" id="hd_id3148974" xml-lang="en-US" level="2" l10n="U" oldref="321">MIRR</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_QIKV" id="bm_id3150670" localize="false"/>
+<paragraph role="heading" id="hd_id3148974" xml-lang="en-US" level="2" l10n="U" oldref="321">MIRR</paragraph>
<paragraph role="paragraph" id="par_id3155497" xml-lang="en-US" l10n="U" oldref="322"><ahelp hid="HID_FUNC_QIKV">Calculates the modified internal rate of return of a series of investments.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154354" xml-lang="en-US" level="3" l10n="U" oldref="323">Syntax</paragraph>
<paragraph role="code" id="par_id3148399" xml-lang="en-US" l10n="U" oldref="324">MIRR(Values; Investment; ReinvestRate)</paragraph>
@@ -439,7 +455,8 @@
<bookmark_value>rates of return;securities</bookmark_value>
<bookmark_value>yields, see also rates of return</bookmark_value>
</bookmark><comment>mw added two entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_YIELD" id="bm_id3152460" localize="false"/><paragraph role="heading" id="hd_id3149323" xml-lang="en-US" level="2" oldref="129">YIELD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_YIELD" id="bm_id3152460" localize="false"/>
+<paragraph role="heading" id="hd_id3149323" xml-lang="en-US" level="2" oldref="129">YIELD</paragraph>
<paragraph role="paragraph" id="par_id3150643" xml-lang="en-US" l10n="U" oldref="130"><ahelp hid="HID_AAI_FUNC_YIELD">Calculates the yield of a security.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149344" xml-lang="en-US" level="3" l10n="U" oldref="131">Syntax</paragraph>
<paragraph role="code" id="par_id3149744" xml-lang="en-US" l10n="U" oldref="132">YIELD(Settlement; Maturity; Rate; Price; Redemption; Frequency; Basis)</paragraph>
@@ -464,7 +481,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3150100"><bookmark_value>YIELDDISC function</bookmark_value>
<bookmark_value>rates of return;non-interest-bearing securities</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_YIELDDISC" id="bm_id3156206" localize="false"/><paragraph role="heading" id="hd_id3150100" xml-lang="en-US" level="2" oldref="142">YIELDDISC</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_YIELDDISC" id="bm_id3156206" localize="false"/>
+<paragraph role="heading" id="hd_id3150100" xml-lang="en-US" level="2" oldref="142">YIELDDISC</paragraph>
<paragraph role="paragraph" id="par_id3150486" xml-lang="en-US" l10n="U" oldref="143"><ahelp hid="HID_AAI_FUNC_YIELDDISC">Calculates the annual yield of a non-interest-bearing security.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149171" xml-lang="en-US" level="3" l10n="U" oldref="144">Syntax</paragraph>
<paragraph role="code" id="par_id3159191" xml-lang="en-US" l10n="U" oldref="145">YIELDDISC(Settlement; Maturity; Price; Redemption; Basis)</paragraph>
@@ -485,7 +503,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3155140"><bookmark_value>YIELDMAT function</bookmark_value>
<bookmark_value>rates of return;securities with interest paid on maturity</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_YIELDMAT" id="bm_id3156029" localize="false"/><paragraph role="heading" id="hd_id3155140" xml-lang="en-US" level="2" oldref="153">YIELDMAT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_YIELDMAT" id="bm_id3156029" localize="false"/>
+<paragraph role="heading" id="hd_id3155140" xml-lang="en-US" level="2" oldref="153">YIELDMAT</paragraph>
<paragraph role="paragraph" id="par_id3151332" xml-lang="en-US" l10n="U" oldref="154"><ahelp hid="HID_AAI_FUNC_YIELDMAT">Calculates the annual yield of a security, the interest of which is paid on the date of maturity.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3159100" xml-lang="en-US" level="3" l10n="U" oldref="155">Syntax</paragraph>
<paragraph role="code" id="par_id3159113" xml-lang="en-US" l10n="U" oldref="156">YIELDMAT(Settlement; Maturity; Issue; Rate; Price; Basis)</paragraph>
@@ -509,7 +528,8 @@
<bookmark_value>annuities</bookmark_value>
<bookmark_value>PMT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_RMZ" id="bm_id3148895" localize="false"/><paragraph role="heading" id="hd_id3149577" xml-lang="en-US" level="2" l10n="U" oldref="330">PMT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_RMZ" id="bm_id3148895" localize="false"/>
+<paragraph role="heading" id="hd_id3149577" xml-lang="en-US" level="2" l10n="U" oldref="330">PMT</paragraph>
<paragraph role="paragraph" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="331"><ahelp hid="HID_FUNC_RMZ">Returns the periodic payment for an annuity with constant interest rates.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145257" xml-lang="en-US" level="3" l10n="U" oldref="332">Syntax</paragraph>
<paragraph role="code" id="par_id3147278" xml-lang="en-US" l10n="U" oldref="333">PMT(Rate; NPer; PV; FV; Type)</paragraph>
@@ -536,7 +556,8 @@
<bookmark_value>treasury bills;annual return</bookmark_value>
<bookmark_value>annual return on treasury bills</bookmark_value>
</bookmark><comment>mw changed "treasury bills;..." and aded one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_TBILLEQ" id="bm_id3147380" localize="false"/><paragraph role="heading" id="hd_id3155799" xml-lang="en-US" level="2" oldref="58">TBILLEQ</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_TBILLEQ" id="bm_id3147380" localize="false"/>
+<paragraph role="heading" id="hd_id3155799" xml-lang="en-US" level="2" oldref="58">TBILLEQ</paragraph>
<paragraph role="paragraph" id="par_id3154403" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="HID_AAI_FUNC_TBILLEQ">Calculates the annual return on a treasury bill ().</ahelp> A treasury bill is purchased on the settlement date and sold at the full par value on the maturity date, that must fall within the same year. A discount is deducted from the purchase price.</paragraph>
<paragraph role="heading" id="hd_id3155080" xml-lang="en-US" level="3" l10n="U" oldref="60">Syntax</paragraph>
<paragraph role="code" id="par_id3150224" xml-lang="en-US" l10n="U" oldref="61">TBILLEQ(Settlement; Maturity; Discount)</paragraph>
@@ -556,7 +577,8 @@
<bookmark_value>treasury bills;prices</bookmark_value>
<bookmark_value>prices;treasury bills</bookmark_value>
</bookmark><comment>mw added two entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_TBILLPRICE" id="bm_id3150576" localize="false"/><paragraph role="heading" id="hd_id3151032" xml-lang="en-US" level="2" oldref="69">TBILLPRICE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_TBILLPRICE" id="bm_id3150576" localize="false"/>
+<paragraph role="heading" id="hd_id3151032" xml-lang="en-US" level="2" oldref="69">TBILLPRICE</paragraph>
<paragraph role="paragraph" id="par_id3157887" xml-lang="en-US" l10n="U" oldref="70"><ahelp hid="HID_AAI_FUNC_TBILLPRICE">Calculates the price of a treasury bill per 100 currency units.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156374" xml-lang="en-US" level="3" l10n="U" oldref="71">Syntax</paragraph>
<paragraph role="code" id="par_id3150284" xml-lang="en-US" l10n="U" oldref="72">TBILLPRICE(Settlement; Maturity; Discount)</paragraph>
@@ -576,7 +598,8 @@
<bookmark_value>treasury bills;rates of return</bookmark_value>
<bookmark_value>rates of return of treasury bills</bookmark_value>
</bookmark><comment>mw added two entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_TBILLYIELD" id="bm_id3151346" localize="false"/><paragraph role="heading" id="hd_id3152912" xml-lang="en-US" level="2" oldref="80">TBILLYIELD</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_AAI_FUNC_TBILLYIELD" id="bm_id3151346" localize="false"/>
+<paragraph role="heading" id="hd_id3152912" xml-lang="en-US" level="2" oldref="80">TBILLYIELD</paragraph>
<paragraph role="paragraph" id="par_id3145560" xml-lang="en-US" l10n="U" oldref="81"><ahelp hid="HID_AAI_FUNC_TBILLYIELD">Calculates the yield of a treasury bill.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145578" xml-lang="en-US" level="3" l10n="U" oldref="82">Syntax</paragraph>
<paragraph role="code" id="par_id3156077" xml-lang="en-US" l10n="U" oldref="83">TBILLYIELD(Settlement; Maturity; Price)</paragraph>
@@ -594,5 +617,6 @@
</sort>
<paragraph role="paragraph" id="par_id3148546" xml-lang="en-US" l10n="U" oldref="345"><link href="text/scalc/01/04060103.xhp" name="Back to Financial Functions Part One">Back to Financial Functions Part One</link></paragraph>
<paragraph role="paragraph" id="par_id3146762" xml-lang="en-US" l10n="U" oldref="346"><link href="text/scalc/01/04060118.xhp" name="Forward to Financial Functions Part Three">Forward to Financial Functions Part Three</link></paragraph>
+<embed href="text/scalc/01/04060100.xhp#drking"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060181.xhp b/helpcontent2/source/text/scalc/01/04060181.xhp
index 314ff5f6cb..ccf07edf3a 100755
--- a/helpcontent2/source/text/scalc/01/04060181.xhp
+++ b/helpcontent2/source/text/scalc/01/04060181.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060181.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060181xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060181xml" indexer="include">
<title id="tit" xml-lang="en-US">Statistical Functions Part One</title>
<filename>/text/scalc/01/04060181.xhp</filename>
</topic>
@@ -45,12 +43,14 @@
<body>
<paragraph role="heading" id="hd_id3146320" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="ae"><link href="text/scalc/01/04060181.xhp">Statistical Functions Part One</link>
</variable></paragraph>
-<sort order="asc"><section id="intercept">
+<sort order="asc">
+<section id="intercept">
<bookmark xml-lang="en-US" branch="index" id="bm_id3145632"><bookmark_value>INTERCEPT function</bookmark_value>
<bookmark_value>points of intersection</bookmark_value>
<bookmark_value>intersections</bookmark_value>
</bookmark><comment>mw added two entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ACHSENABSCHNITT" id="bm_id3153018" localize="false"/><paragraph role="heading" id="hd_id3145632" xml-lang="en-US" level="2" l10n="U" oldref="2">INTERCEPT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ACHSENABSCHNITT" id="bm_id3153018" localize="false"/>
+<paragraph role="heading" id="hd_id3145632" xml-lang="en-US" level="2" l10n="U" oldref="2">INTERCEPT</paragraph>
<paragraph role="paragraph" id="par_id3146887" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_FUNC_ACHSENABSCHNITT">Calculates the point at which a line will intersect the y-values by using known x-values and y-values.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150374" xml-lang="en-US" level="3" l10n="U" oldref="4">Syntax</paragraph>
<paragraph role="code" id="par_id3149718" xml-lang="en-US" l10n="U" oldref="5">INTERCEPT(DataY; DataX)</paragraph>
@@ -68,7 +68,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3148437"><bookmark_value>COUNT function</bookmark_value>
<bookmark_value>numbers;counting</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ANZAHL" id="bm_id3153040" localize="false"/><paragraph role="heading" id="hd_id3148437" xml-lang="en-US" level="2" l10n="U" oldref="13">COUNT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ANZAHL" id="bm_id3153040" localize="false"/>
+<paragraph role="heading" id="hd_id3148437" xml-lang="en-US" level="2" l10n="U" oldref="13">COUNT</paragraph>
<paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_FUNC_ANZAHL">Counts how many numbers are in the list of arguments.</ahelp> Text entries are ignored.</paragraph>
<paragraph role="heading" id="hd_id3153930" xml-lang="en-US" level="3" l10n="U" oldref="15">Syntax</paragraph>
<paragraph role="code" id="par_id3148585" xml-lang="en-US" l10n="U" oldref="16">COUNT(Value1; Value2; ... Value30)</paragraph>
@@ -83,7 +84,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3149729"><bookmark_value>COUNTA function</bookmark_value>
<bookmark_value>number of entries</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ANZAHL2" id="bm_id3148738" localize="false"/><paragraph role="heading" id="hd_id3149729" xml-lang="en-US" level="2" l10n="U" oldref="22">COUNTA</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_ANZAHL2" id="bm_id3148738" localize="false"/>
+<paragraph role="heading" id="hd_id3149729" xml-lang="en-US" level="2" l10n="U" oldref="22">COUNTA</paragraph>
<paragraph role="paragraph" id="par_id3150142" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="HID_FUNC_ANZAHL2">Counts how many values are in the list of arguments.</ahelp> Text entries are also counted, even when they contain an empty string of length 0. If an argument is an array or reference, empty cells within the array or reference are ignored.<comment>UFI: fix to #i35888#</comment></paragraph>
<paragraph role="heading" id="hd_id3148573" xml-lang="en-US" level="3" l10n="U" oldref="24">Syntax</paragraph>
<paragraph role="code" id="par_id3153111" xml-lang="en-US" l10n="U" oldref="25">COUNTA(Value1; Value2; ... Value30)</paragraph>
@@ -98,7 +100,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3150267"><bookmark_value>B function</bookmark_value>
<bookmark_value>probabilities of samples with binomial distribution</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_B" id="bm_id3153044" localize="false"/><paragraph role="heading" id="hd_id3150267" xml-lang="en-US" level="2" l10n="U" oldref="31">B</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_B" id="bm_id3153044" localize="false"/>
+<paragraph role="heading" id="hd_id3150267" xml-lang="en-US" level="2" l10n="U" oldref="31">B</paragraph>
<paragraph role="paragraph" id="par_id3156061" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="HID_FUNC_B">Returns the probability of a sample with binomial distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150659" xml-lang="en-US" level="3" l10n="U" oldref="33">Syntax</paragraph>
<paragraph role="code" id="par_id3148392" xml-lang="en-US" l10n="U" oldref="34">B(Trials; SP; T1; T2)</paragraph>
@@ -120,7 +123,8 @@
<bookmark_value>determination coefficients</bookmark_value>
<bookmark_value>regression analysis</bookmark_value>
</bookmark><comment>mw added regression analysis</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BESTIMMTHEITSMASS" id="bm_id3153228" localize="false"/><paragraph role="heading" id="hd_id3158416" xml-lang="en-US" level="2" l10n="U" oldref="43">RSQ</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BESTIMMTHEITSMASS" id="bm_id3153228" localize="false"/>
+<paragraph role="heading" id="hd_id3158416" xml-lang="en-US" level="2" l10n="U" oldref="43">RSQ</paragraph>
<paragraph role="paragraph" id="par_id3154949" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="HID_FUNC_BESTIMMTHEITSMASS">Returns the square of the Pearson correlation coefficient based on the given values.</ahelp> RSQ (also called determination coefficient) is a measure for the accuracy of an adjustment and can be used to produce a regression analysis.</paragraph>
<paragraph role="heading" id="hd_id3152820" xml-lang="en-US" level="3" l10n="U" oldref="45">Syntax</paragraph>
<paragraph role="code" id="par_id3155822" xml-lang="en-US" l10n="U" oldref="46">RSQ(DataY; DataX)</paragraph>
@@ -136,7 +140,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3145620"><bookmark_value>BETAINV function</bookmark_value>
<bookmark_value>cumulative probability density function;inverse of</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BETAINV" id="bm_id3146154" localize="false"/><paragraph role="heading" id="hd_id3145620" xml-lang="en-US" level="2" l10n="U" oldref="52">BETAINV</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BETAINV" id="bm_id3146154" localize="false"/>
+<paragraph role="heading" id="hd_id3145620" xml-lang="en-US" level="2" l10n="U" oldref="52">BETAINV</paragraph>
<paragraph role="paragraph" id="par_id3149825" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="HID_FUNC_BETAINV">Returns the inverse of the cumulative beta probability density function.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152479" xml-lang="en-US" level="3" l10n="U" oldref="54">Syntax</paragraph>
<paragraph role="code" id="par_id3156300" xml-lang="en-US" l10n="U" oldref="55">BETAINV(Number; Alpha; Beta; Start; End)</paragraph>
@@ -161,7 +166,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3156096"><bookmark_value>BETADIST function</bookmark_value>
<bookmark_value>cumulative probability density function;calculating</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BETAVERT" id="bm_id3153213" localize="false"/><paragraph role="heading" id="hd_id3156096" xml-lang="en-US" level="2" l10n="U" oldref="64">BETADIST</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BETAVERT" id="bm_id3153213" localize="false"/>
+<paragraph role="heading" id="hd_id3156096" xml-lang="en-US" level="2" l10n="U" oldref="64">BETADIST</paragraph>
<paragraph role="paragraph" id="par_id3150880" xml-lang="en-US" l10n="U" oldref="65"><ahelp hid="HID_FUNC_BETAVERT">Returns the cumulative beta probability density function.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150762" xml-lang="en-US" level="3" l10n="U" oldref="66">Syntax</paragraph>
<paragraph role="code" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="67">BETADIST(Number; Alpha; Beta; Start; End)</paragraph>
@@ -185,7 +191,8 @@
<section id="binomdist">
<bookmark xml-lang="en-US" branch="index" id="bm_id3143228"><bookmark_value>BINOMDIST function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BINOMVERT" id="bm_id3150146" localize="false"/><paragraph role="heading" id="hd_id3143228" xml-lang="en-US" level="2" l10n="U" oldref="76">BINOMDIST</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_BINOMVERT" id="bm_id3150146" localize="false"/>
+<paragraph role="heading" id="hd_id3143228" xml-lang="en-US" level="2" l10n="U" oldref="76">BINOMDIST</paragraph>
<paragraph role="paragraph" id="par_id3146897" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid="HID_FUNC_BINOMVERT">Returns the individual term binomial distribution probability.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149289" xml-lang="en-US" level="3" l10n="U" oldref="78">Syntax</paragraph>
<paragraph role="code" id="par_id3156009" xml-lang="en-US" l10n="U" oldref="79">BINOMDIST(X; Trials; SP; C)</paragraph>
@@ -206,7 +213,8 @@
<section id="chiinv">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148835"><bookmark_value>CHIINV function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_CHIINV" id="bm_id3148823" localize="false"/><paragraph role="heading" id="hd_id3148835" xml-lang="en-US" level="2" l10n="U" oldref="88">CHIINV</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_CHIINV" id="bm_id3148823" localize="false"/>
+<paragraph role="heading" id="hd_id3148835" xml-lang="en-US" level="2" l10n="U" oldref="88">CHIINV</paragraph>
<paragraph role="paragraph" id="par_id3149906" xml-lang="en-US" l10n="U" oldref="89"><ahelp hid="HID_FUNC_CHIINV">Returns the inverse of the one-tailed probability of the chi-squared distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3159157" xml-lang="en-US" level="3" l10n="U" oldref="90">Syntax</paragraph>
<paragraph role="code" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="91">CHIINV(Number; DegreesFreedom)</paragraph>
@@ -227,7 +235,8 @@
<section id="chitest">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154260"><bookmark_value>CHITEST function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_CHITEST" id="bm_id3155355" localize="false"/><paragraph role="heading" id="hd_id3154260" xml-lang="en-US" level="2" l10n="U" oldref="97">CHITEST</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_CHITEST" id="bm_id3155355" localize="false"/>
+<paragraph role="heading" id="hd_id3154260" xml-lang="en-US" level="2" l10n="U" oldref="97">CHITEST</paragraph>
<paragraph role="paragraph" id="par_id3151052" xml-lang="en-US" l10n="U" oldref="98"><ahelp hid="HID_FUNC_CHITEST">Returns the probability of a deviance from a random distribution of two test series based on the chi-squared test for independence.</ahelp> CHITEST returns the chi-squared distribution of the data.</paragraph>
<paragraph role="paragraph" id="par_id3148925" xml-lang="en-US" l10n="U" oldref="135">The probability determined by CHITEST can also be determined with CHIDIST, in which case the Chi square of the random sample must then be passed as a parameter instead of the data row.</paragraph>
<paragraph role="heading" id="hd_id3154280" xml-lang="en-US" level="3" l10n="U" oldref="99">Syntax</paragraph>
@@ -239,112 +248,115 @@
<paragraph role="heading" id="hd_id3146946" xml-lang="en-US" level="3" l10n="U" oldref="103">Example</paragraph>
<table id="tbl_id3153233">
<tablerow>
-<tablecell colspan="" rowspan=""/>
-<tablecell colspan="" rowspan="">
+<tablecell>
+</tablecell>
+<tablecell>
<paragraph role="paragraph" id="par_id3154096" xml-lang="en-US" l10n="U" oldref="136">Data_B (observed)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152948" xml-lang="en-US" l10n="U" oldref="137">Data_E (expected)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152876" xml-lang="en-US" l10n="U" oldref="138">1</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159279" xml-lang="en-US" l10n="U" oldref="139">
<item type="input">195</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149105" xml-lang="en-US" l10n="U" oldref="140">
<item type="input">170</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149922" xml-lang="en-US" l10n="U" oldref="141">2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148621" xml-lang="en-US" l10n="U" oldref="142">
<item type="input">151</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148987" xml-lang="en-US" l10n="U" oldref="143">
<item type="input">170</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149417" xml-lang="en-US" l10n="U" oldref="144">3</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148661" xml-lang="en-US" l10n="U" oldref="145">
<item type="input">148</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151128" xml-lang="en-US" l10n="U" oldref="146">
<item type="input">170</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148467" xml-lang="en-US" l10n="U" oldref="147">4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149237" xml-lang="en-US" l10n="U" oldref="148">
<item type="input">189</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145304" xml-lang="en-US" l10n="U" oldref="149">
<item type="input">170</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149927" xml-lang="en-US" l10n="U" oldref="150">5</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150630" xml-lang="en-US" l10n="U" oldref="151">
<item type="input">183</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150423" xml-lang="en-US" l10n="U" oldref="152">
<item type="input">170</item>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3143275" xml-lang="en-US" l10n="U" oldref="153">6</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3144750" xml-lang="en-US" l10n="U" oldref="154">
<item type="input">154</item>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153947" xml-lang="en-US" l10n="U" oldref="155">
<item type="input">170</item>
</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3149481" xml-lang="en-US" l10n="U" oldref="104">
<item type="input">=CHITEST(A1:A6;B1:B6)</item> equals 0.02. This is the probability which suffices the observed data of the theoretical Chi-square distribution.</paragraph>
</section>
<section id="chidist">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148690"><bookmark_value>CHIDIST function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_CHIVERT" id="bm_id3147521" localize="false"/><paragraph role="heading" id="hd_id3148690" xml-lang="en-US" level="2" l10n="U" oldref="106">CHIDIST</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_CHIVERT" id="bm_id3147521" localize="false"/>
+<paragraph role="heading" id="hd_id3148690" xml-lang="en-US" level="2" l10n="U" oldref="106">CHIDIST</paragraph>
<paragraph role="paragraph" id="par_id3156338" xml-lang="en-US" l10n="U" oldref="156"><ahelp hid="HID_FUNC_CHIVERT">Returns the probability value from the indicated Chi square that a hypothesis is confirmed.</ahelp> CHIDIST compares the Chi square value to be given for a random sample that is calculated from the sum of (observed value-expected value)^2/expected value for all values with the theoretical Chi square distribution and determines from this the probability of error for the hypothesis to be tested.</paragraph>
<paragraph role="paragraph" id="par_id3151316" xml-lang="en-US" l10n="U" oldref="157">The probability determined by CHIDIST can also be determined by CHITEST.</paragraph>
<paragraph role="heading" id="hd_id3155123" xml-lang="en-US" level="3" l10n="U" oldref="108">Syntax</paragraph>
@@ -362,18 +374,24 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3150603"><bookmark_value>EXPONDIST function</bookmark_value>
<bookmark_value>exponential distributions</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_EXPONVERT" id="bm_id3152962" localize="false"/><paragraph role="heading" id="hd_id3150603" xml-lang="en-US" level="2" l10n="U" oldref="115">EXPONDIST</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_EXPONVERT" id="bm_id3152962" localize="false"/>
+<paragraph role="heading" id="hd_id3150603" xml-lang="en-US" level="2" l10n="U" oldref="115">EXPONDIST</paragraph>
<paragraph role="paragraph" id="par_id3149563" xml-lang="en-US" l10n="U" oldref="116"><ahelp hid="HID_FUNC_EXPONVERT">Returns the exponential distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153789" xml-lang="en-US" level="3" l10n="U" oldref="117">Syntax</paragraph>
<paragraph role="code" id="par_id3150987" xml-lang="en-US" l10n="U" oldref="118">EXPONDIST(Number; Lambda; C)</paragraph>
<paragraph role="paragraph" id="par_id3154663" xml-lang="en-US" l10n="U" oldref="119">
<emph>Number</emph> is the value of the function.</paragraph>
<paragraph role="paragraph" id="par_id3154569" xml-lang="en-US" l10n="U" oldref="120">
-<emph>Lambda</emph> is the parameter value.</paragraph><comment>UFI removed a double bookmark</comment><paragraph role="paragraph" id="par_id3147332" xml-lang="en-US" l10n="U" oldref="121">
+<emph>Lambda</emph> is the parameter value.</paragraph><comment>UFI removed a double bookmark</comment>
+<paragraph role="paragraph" id="par_id3147332" xml-lang="en-US" l10n="U" oldref="121">
<emph>C</emph> is a logical value that determines the form of the function. <emph>C = 0</emph> calculates the density function, and <emph>C = 1</emph> calculates the distribution.</paragraph>
<paragraph role="heading" id="hd_id3146133" xml-lang="en-US" level="3" l10n="U" oldref="122">Example</paragraph>
<paragraph role="paragraph" id="par_id3150357" xml-lang="en-US" l10n="U" oldref="123">
<item type="input">=EXPONDIST(3;0.5;1)</item> returns 0.78.</paragraph>
</section>
-</sort></body>
+</sort>
+<section id="relatedtopics">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060182.xhp b/helpcontent2/source/text/scalc/01/04060182.xhp
index d2f93c4c3c..57aa859d47 100755
--- a/helpcontent2/source/text/scalc/01/04060182.xhp
+++ b/helpcontent2/source/text/scalc/01/04060182.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060182.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060182xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060182xml" indexer="include">
<title id="tit" xml-lang="en-US">Statistical Functions Part Two</title>
<filename>/text/scalc/01/04060182.xhp</filename>
</topic>
@@ -45,11 +43,13 @@
<body>
<paragraph role="heading" id="hd_id3154372" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="fh"><link href="text/scalc/01/04060182.xhp" name="Statistical Functions Part Two">Statistical Functions Part Two</link>
</variable></paragraph>
-<sort order="asc"><section id="finv">
+<sort order="asc">
+<section id="finv">
<bookmark xml-lang="en-US" branch="index" id="bm_id3145388"><bookmark_value>FINV function</bookmark_value>
<bookmark_value>inverse F probability distribution</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FINV" id="bm_id3146113" localize="false"/><paragraph role="heading" id="hd_id3145388" xml-lang="en-US" level="2" l10n="U" oldref="2">FINV</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FINV" id="bm_id3146113" localize="false"/>
+<paragraph role="heading" id="hd_id3145388" xml-lang="en-US" level="2" l10n="U" oldref="2">FINV</paragraph>
<paragraph role="paragraph" id="par_id3155089" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_FUNC_FINV">Returns the inverse of the F probability distribution.</ahelp> The F distribution is used for F tests in order to set the relation between two differing data sets.</paragraph>
<paragraph role="heading" id="hd_id3153816" xml-lang="en-US" level="3" l10n="U" oldref="4">Syntax</paragraph>
<paragraph role="code" id="par_id3153068" xml-lang="en-US" l10n="U" oldref="5">FINV(Number; DegreesFreedom1; DegreesFreedom2)</paragraph>
@@ -66,7 +66,8 @@
<section id="fisher">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150888"><bookmark_value>FISHER function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FISHER" id="bm_id3146782" localize="false"/><paragraph role="heading" id="hd_id3150888" xml-lang="en-US" level="2" l10n="U" oldref="12">FISHER</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FISHER" id="bm_id3146782" localize="false"/>
+<paragraph role="heading" id="hd_id3150888" xml-lang="en-US" level="2" l10n="U" oldref="12">FISHER</paragraph>
<paragraph role="paragraph" id="par_id3155384" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_FUNC_FISHER">Returns the Fisher transformation for x and creates a function close to a normal distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149898" xml-lang="en-US" level="3" l10n="U" oldref="14">Syntax</paragraph>
<paragraph role="code" id="par_id3143220" xml-lang="en-US" l10n="U" oldref="15">FISHER(Number)</paragraph>
@@ -80,7 +81,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3155758"><bookmark_value>FISHERINV function</bookmark_value>
<bookmark_value>inverse of Fisher transformation</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FISHERINV" id="bm_id3149317" localize="false"/><paragraph role="heading" id="hd_id3155758" xml-lang="en-US" level="2" l10n="U" oldref="20">FISHERINV</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FISHERINV" id="bm_id3149317" localize="false"/>
+<paragraph role="heading" id="hd_id3155758" xml-lang="en-US" level="2" l10n="U" oldref="20">FISHERINV</paragraph>
<paragraph role="paragraph" id="par_id3154734" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_FUNC_FISHERINV">Returns the inverse of the Fisher transformation for x and creates a function close to a normal distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155755" xml-lang="en-US" level="3" l10n="U" oldref="22">Syntax</paragraph>
<paragraph role="code" id="par_id3146108" xml-lang="en-US" l10n="U" oldref="23">FISHERINV(Number)</paragraph>
@@ -93,7 +95,8 @@
<section id="ftest">
<bookmark xml-lang="en-US" branch="index" id="bm_id3151390"><bookmark_value>FTEST function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FTEST" id="bm_id3159263" localize="false"/><paragraph role="heading" id="hd_id3151390" xml-lang="en-US" level="2" l10n="U" oldref="28">FTEST</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FTEST" id="bm_id3159263" localize="false"/>
+<paragraph role="heading" id="hd_id3151390" xml-lang="en-US" level="2" l10n="U" oldref="28">FTEST</paragraph>
<paragraph role="paragraph" id="par_id3150534" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_FUNC_FTEST">Returns the result of an F test.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3166466" xml-lang="en-US" level="3" l10n="U" oldref="30">Syntax</paragraph>
<paragraph role="code" id="par_id3153024" xml-lang="en-US" l10n="U" oldref="31">FTEST(Data1; Data2)</paragraph>
@@ -108,7 +111,8 @@
<section id="fdist">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150372"><bookmark_value>FDIST function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FVERT" id="bm_id3149722" localize="false"/><paragraph role="heading" id="hd_id3150372" xml-lang="en-US" level="2" l10n="U" oldref="37">FDIST</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_FVERT" id="bm_id3149722" localize="false"/>
+<paragraph role="heading" id="hd_id3150372" xml-lang="en-US" level="2" l10n="U" oldref="37">FDIST</paragraph>
<paragraph role="paragraph" id="par_id3152981" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="HID_FUNC_FVERT">Calculates the values of an F distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150484" xml-lang="en-US" level="3" l10n="U" oldref="39">Syntax</paragraph>
<paragraph role="code" id="par_id3145826" xml-lang="en-US" l10n="U" oldref="40">FDIST(Number; DegreesFreedom1; DegreesFreedom2)</paragraph>
@@ -125,7 +129,8 @@
<section id="gammainv">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154841"><bookmark_value>GAMMAINV function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GAMMAINV" id="bm_id3149249" localize="false"/><paragraph role="heading" id="hd_id3154841" xml-lang="en-US" level="2" l10n="U" oldref="47">GAMMAINV</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GAMMAINV" id="bm_id3149249" localize="false"/>
+<paragraph role="heading" id="hd_id3154841" xml-lang="en-US" level="2" l10n="U" oldref="47">GAMMAINV</paragraph>
<paragraph role="paragraph" id="par_id3153932" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="HID_FUNC_GAMMAINV">Returns the inverse of the Gamma cumulative distribution.</ahelp> This function allows you to search for variables with different distribution.</paragraph>
<paragraph role="heading" id="hd_id3149949" xml-lang="en-US" level="3" l10n="U" oldref="49">Syntax</paragraph>
<paragraph role="code" id="par_id3155828" xml-lang="en-US" l10n="U" oldref="50">GAMMAINV(Number; Alpha; Beta)</paragraph>
@@ -143,7 +148,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3154806"><bookmark_value>GAMMALN function</bookmark_value>
<bookmark_value>natural logarithm of Gamma function</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GAMMALN" id="bm_id3149511" localize="false"/><paragraph role="heading" id="hd_id3154806" xml-lang="en-US" level="2" l10n="U" oldref="57">GAMMALN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GAMMALN" id="bm_id3149511" localize="false"/>
+<paragraph role="heading" id="hd_id3154806" xml-lang="en-US" level="2" l10n="U" oldref="57">GAMMALN</paragraph>
<paragraph role="paragraph" id="par_id3148572" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid="HID_FUNC_GAMMALN">Returns the natural logarithm of the Gamma function: G(x).</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152999" xml-lang="en-US" level="3" l10n="U" oldref="59">Syntax</paragraph>
<paragraph role="code" id="par_id3153112" xml-lang="en-US" l10n="U" oldref="60">GAMMALN(Number)</paragraph>
@@ -156,7 +162,8 @@
<section id="gammadist">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150132"><bookmark_value>GAMMADIST function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GAMMAVERT" id="bm_id3154330" localize="false"/><paragraph role="heading" id="hd_id3150132" xml-lang="en-US" level="2" l10n="U" oldref="65">GAMMADIST</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GAMMAVERT" id="bm_id3154330" localize="false"/>
+<paragraph role="heading" id="hd_id3150132" xml-lang="en-US" level="2" l10n="U" oldref="65">GAMMADIST</paragraph>
<paragraph role="paragraph" id="par_id3155931" xml-lang="en-US" l10n="U" oldref="66"><ahelp hid="HID_FUNC_GAMMAVERT">Returns the values of a Gamma distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147373" xml-lang="en-US" level="3" l10n="U" oldref="67">Syntax</paragraph>
<paragraph role="code" id="par_id3155436" xml-lang="en-US" l10n="U" oldref="68">GAMMADIST(Number; Alpha; Beta; C)</paragraph>
@@ -176,7 +183,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3150272"><bookmark_value>GAUSS function</bookmark_value>
<bookmark_value>normal distribution; standard</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GAUSS" id="bm_id3149388" localize="false"/><paragraph role="heading" id="hd_id3150272" xml-lang="en-US" level="2" l10n="U" oldref="76">GAUSS</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GAUSS" id="bm_id3149388" localize="false"/>
+<paragraph role="heading" id="hd_id3150272" xml-lang="en-US" level="2" l10n="U" oldref="76">GAUSS</paragraph>
<paragraph role="paragraph" id="par_id3149030" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid="HID_FUNC_GAUSS">Returns the standard normal cumulative distribution.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id2059694" xml-lang="en-US" l10n="NEW">It is GAUSS(x)=NORMSDIST(x)-0.5</paragraph>
<paragraph role="heading" id="hd_id3153551" xml-lang="en-US" level="3" l10n="U" oldref="78">Syntax</paragraph>
@@ -193,7 +201,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3148425"><bookmark_value>GEOMEAN function</bookmark_value>
<bookmark_value>means;geometric</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GEOMITTEL" id="bm_id3149777" localize="false"/><paragraph role="heading" id="hd_id3148425" xml-lang="en-US" level="2" l10n="U" oldref="85">GEOMEAN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GEOMITTEL" id="bm_id3149777" localize="false"/>
+<paragraph role="heading" id="hd_id3148425" xml-lang="en-US" level="2" l10n="U" oldref="85">GEOMEAN</paragraph>
<paragraph role="paragraph" id="par_id3156257" xml-lang="en-US" l10n="U" oldref="86"><ahelp hid="HID_FUNC_GEOMITTEL">Returns the geometric mean of a sample.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147167" xml-lang="en-US" level="3" l10n="U" oldref="87">Syntax</paragraph>
<paragraph role="code" id="par_id3153720" xml-lang="en-US" l10n="U" oldref="88">GEOMEAN(Number1; Number2; ...Number30)</paragraph>
@@ -207,7 +216,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3152966"><bookmark_value>TRIMMEAN function</bookmark_value>
<bookmark_value>means;of data set without margin data</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GESTUTZTMITTEL" id="bm_id3145081" localize="false"/><paragraph role="heading" id="hd_id3152966" xml-lang="en-US" level="2" l10n="U" oldref="94">TRIMMEAN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GESTUTZTMITTEL" id="bm_id3145081" localize="false"/>
+<paragraph role="heading" id="hd_id3152966" xml-lang="en-US" level="2" l10n="U" oldref="94">TRIMMEAN</paragraph>
<paragraph role="paragraph" id="par_id3149716" xml-lang="en-US" l10n="U" oldref="95"><ahelp hid="HID_FUNC_GESTUTZTMITTEL">Returns the mean of a data set without the Alpha percent of data at the margins.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149281" xml-lang="en-US" level="3" l10n="U" oldref="96">Syntax</paragraph>
<paragraph role="code" id="par_id3154821" xml-lang="en-US" l10n="U" oldref="97">TRIMMEAN(Data; Alpha)</paragraph>
@@ -222,7 +232,8 @@
<section id="ztest">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153216"><bookmark_value>ZTEST function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GTEST" id="bm_id3147569" localize="false"/><paragraph role="heading" id="hd_id3153216" xml-lang="en-US" level="2" l10n="U" oldref="103">ZTEST</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GTEST" id="bm_id3147569" localize="false"/>
+<paragraph role="heading" id="hd_id3153216" xml-lang="en-US" level="2" l10n="U" oldref="103">ZTEST</paragraph>
<paragraph role="paragraph" id="par_id3150758" xml-lang="en-US" l10n="U" oldref="104"><ahelp hid="HID_FUNC_GTEST">Returns the two-tailed P value of a z test with standard distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="3" l10n="U" oldref="105">Syntax</paragraph>
<paragraph role="code" id="par_id3153274" xml-lang="en-US" l10n="U" oldref="106">ZTEST(Data; Number; Sigma)</paragraph>
@@ -240,7 +251,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3153623"><bookmark_value>HARMEAN function</bookmark_value>
<bookmark_value>means;harmonic</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_HARMITTEL" id="bm_id3154052" localize="false"/><paragraph role="heading" id="hd_id3153623" xml-lang="en-US" level="2" l10n="U" oldref="113">HARMEAN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_HARMITTEL" id="bm_id3154052" localize="false"/>
+<paragraph role="heading" id="hd_id3153623" xml-lang="en-US" level="2" l10n="U" oldref="113">HARMEAN</paragraph>
<paragraph role="paragraph" id="par_id3155102" xml-lang="en-US" l10n="U" oldref="114"><ahelp hid="HID_FUNC_HARMITTEL">Returns the harmonic mean of a data set.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146900" xml-lang="en-US" level="3" l10n="U" oldref="115">Syntax</paragraph>
<paragraph role="code" id="par_id3149287" xml-lang="en-US" l10n="U" oldref="116">HARMEAN(Number1; Number2; ...Number30)</paragraph>
@@ -254,7 +266,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3152801"><bookmark_value>HYPGEOMDIST function</bookmark_value>
<bookmark_value>sampling without replacement</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_HYPGEOMVERT" id="bm_id3153910" localize="false"/><paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="2" l10n="U" oldref="122">HYPGEOMDIST</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_HYPGEOMVERT" id="bm_id3153910" localize="false"/>
+<paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="2" l10n="U" oldref="122">HYPGEOMDIST</paragraph>
<paragraph role="paragraph" id="par_id3159341" xml-lang="en-US" l10n="U" oldref="123"><ahelp hid="HID_FUNC_HYPGEOMVERT">Returns the hypergeometric distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154697" xml-lang="en-US" level="3" l10n="U" oldref="124">Syntax</paragraph>
<paragraph role="code" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="125">HYPGEOMDIST(X; NSample; Successes; NPopulation)</paragraph>
@@ -270,5 +283,9 @@
<paragraph role="paragraph" id="par_id3154904" xml-lang="en-US" l10n="U" oldref="131">
<item type="input">=HYPGEOMDIST(2;2;90;100)</item> yields 0.81. If 90 out of 100 pieces of buttered toast fall from the table and hit the floor with the buttered side first, then if 2 pieces of buttered toast are dropped from the table, the probability is 81%, that both will strike buttered side first.</paragraph>
</section>
-</sort></body>
+</sort>
+<section id="relatedtopics">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060183.xhp b/helpcontent2/source/text/scalc/01/04060183.xhp
index 4442a3589b..7ef96b3843 100755
--- a/helpcontent2/source/text/scalc/01/04060183.xhp
+++ b/helpcontent2/source/text/scalc/01/04060183.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060183.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060183xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060183xml" indexer="include">
<title id="tit" xml-lang="en-US">Statistical Functions Part Three</title>
<filename>/text/scalc/01/04060183.xhp</filename>
</topic>
@@ -45,10 +43,12 @@
<body>
<paragraph role="heading" id="hd_id3166425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="kl"><link href="text/scalc/01/04060183.xhp" name="Statistical Functions Part Three">Statistical Functions Part Three</link>
</variable></paragraph>
-<sort order="asc"><section id="large">
+<sort order="asc">
+<section id="large">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149530"><bookmark_value>LARGE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KGROESSTE" id="bm_id3150883" localize="false"/><paragraph role="heading" id="hd_id3149530" xml-lang="en-US" level="2" l10n="U" oldref="2">LARGE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KGROESSTE" id="bm_id3150883" localize="false"/>
+<paragraph role="heading" id="hd_id3149530" xml-lang="en-US" level="2" l10n="U" oldref="2">LARGE</paragraph>
<paragraph role="paragraph" id="par_id3150518" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_FUNC_KGROESSTE">Returns the Rank_c-th largest value in a data set.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152990" xml-lang="en-US" level="3" l10n="U" oldref="4">Syntax</paragraph>
<paragraph role="code" id="par_id3154372" xml-lang="en-US" l10n="U" oldref="5">LARGE(Data; RankC)</paragraph>
@@ -63,7 +63,8 @@
<section id="small">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154532"><bookmark_value>SMALL function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KKLEINSTE" id="bm_id3148609" localize="false"/><paragraph role="heading" id="hd_id3154532" xml-lang="en-US" level="2" l10n="U" oldref="11">SMALL</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KKLEINSTE" id="bm_id3148609" localize="false"/>
+<paragraph role="heading" id="hd_id3154532" xml-lang="en-US" level="2" l10n="U" oldref="11">SMALL</paragraph>
<paragraph role="paragraph" id="par_id3157981" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_FUNC_KKLEINSTE">Returns the Rank_c-th smallest value in a data set.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154957" xml-lang="en-US" level="3" l10n="U" oldref="13">Syntax</paragraph>
<paragraph role="code" id="par_id3153974" xml-lang="en-US" l10n="U" oldref="14">SMALL(Data; RankC)</paragraph>
@@ -78,7 +79,8 @@
<section id="confidence">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153559"><bookmark_value>CONFIDENCE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KONFIDENZ" id="bm_id3153803" localize="false"/><paragraph role="heading" id="hd_id3153559" xml-lang="en-US" level="2" l10n="U" oldref="20">CONFIDENCE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KONFIDENZ" id="bm_id3153803" localize="false"/>
+<paragraph role="heading" id="hd_id3153559" xml-lang="en-US" level="2" l10n="U" oldref="20">CONFIDENCE</paragraph>
<paragraph role="paragraph" id="par_id3153814" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="HID_FUNC_KONFIDENZ">Returns the (1-alpha) confidence interval for a normal distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149315" xml-lang="en-US" level="3" l10n="U" oldref="22">Syntax</paragraph>
<paragraph role="code" id="par_id3147501" xml-lang="en-US" l10n="U" oldref="23">CONFIDENCE(Alpha; StDev; Size)</paragraph>
@@ -96,7 +98,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3148746"><bookmark_value>CORREL function</bookmark_value>
<bookmark_value>coefficient of correlation</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KORREL" id="bm_id3147403" localize="false"/><paragraph role="heading" id="hd_id3148746" xml-lang="en-US" level="2" l10n="U" oldref="30">CORREL</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KORREL" id="bm_id3147403" localize="false"/>
+<paragraph role="heading" id="hd_id3148746" xml-lang="en-US" level="2" l10n="U" oldref="30">CORREL</paragraph>
<paragraph role="paragraph" id="par_id3147299" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="HID_FUNC_KORREL">Returns the correlation coefficient between two data sets.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156397" xml-lang="en-US" level="3" l10n="U" oldref="32">Syntax</paragraph>
<paragraph role="code" id="par_id3153023" xml-lang="en-US" l10n="U" oldref="33">CORREL(Data1; Data2)</paragraph>
@@ -111,7 +114,8 @@
<section id="covar">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150652"><bookmark_value>COVAR function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KOVAR" id="bm_id3152983" localize="false"/><paragraph role="heading" id="hd_id3150652" xml-lang="en-US" level="2" l10n="U" oldref="39">COVAR</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KOVAR" id="bm_id3152983" localize="false"/>
+<paragraph role="heading" id="hd_id3150652" xml-lang="en-US" level="2" l10n="U" oldref="39">COVAR</paragraph>
<paragraph role="paragraph" id="par_id3146875" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="HID_FUNC_KOVAR">Returns the covariance of the product of paired deviations.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149013" xml-lang="en-US" level="3" l10n="U" oldref="41">Syntax</paragraph>
<paragraph role="code" id="par_id3150740" xml-lang="en-US" l10n="U" oldref="42">COVAR(Data1; Data2)</paragraph>
@@ -127,7 +131,8 @@
<section id="critbinom">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147472"><bookmark_value>CRITBINOM function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KRITBINOM" id="bm_id3154848" localize="false"/><paragraph role="heading" id="hd_id3147472" xml-lang="en-US" level="2" l10n="U" oldref="48">CRITBINOM</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KRITBINOM" id="bm_id3154848" localize="false"/>
+<paragraph role="heading" id="hd_id3147472" xml-lang="en-US" level="2" l10n="U" oldref="48">CRITBINOM</paragraph>
<paragraph role="paragraph" id="par_id3149254" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_FUNC_KRITBINOM">Returns the smallest value for which the cumulative binomial distribution is less than or equal to a criterion value.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153930" xml-lang="en-US" level="3" l10n="U" oldref="50">Syntax</paragraph>
<paragraph role="code" id="par_id3148586" xml-lang="en-US" l10n="U" oldref="51">CRITBINOM(Trials; SP; Alpha)</paragraph>
@@ -144,7 +149,8 @@
<section id="kurt">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155956"><bookmark_value>KURT function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KURT" id="bm_id3146847" localize="false"/><paragraph role="heading" id="hd_id3155956" xml-lang="en-US" level="2" l10n="U" oldref="58">KURT</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_KURT" id="bm_id3146847" localize="false"/>
+<paragraph role="heading" id="hd_id3155956" xml-lang="en-US" level="2" l10n="U" oldref="58">KURT</paragraph>
<paragraph role="paragraph" id="par_id3153108" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="HID_FUNC_KURT">Returns the kurtosis of a data set (at least 4 values required).</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150334" xml-lang="en-US" level="3" l10n="U" oldref="60">Syntax</paragraph>
<paragraph role="code" id="par_id3154508" xml-lang="en-US" l10n="U" oldref="61">KURT(Number1; Number2; ...Number30)</paragraph>
@@ -159,7 +165,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3150928"><bookmark_value>LOGINV function</bookmark_value>
<bookmark_value>inverse of lognormal distribution</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_LOGINV" id="bm_id3156062" localize="false"/><paragraph role="heading" id="hd_id3150928" xml-lang="en-US" level="2" l10n="U" oldref="66">LOGINV</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_LOGINV" id="bm_id3156062" localize="false"/>
+<paragraph role="heading" id="hd_id3150928" xml-lang="en-US" level="2" l10n="U" oldref="66">LOGINV</paragraph>
<paragraph role="paragraph" id="par_id3145297" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="HID_FUNC_LOGINV">Returns the inverse of the lognormal distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3151016" xml-lang="en-US" level="3" l10n="U" oldref="68">Syntax</paragraph>
<paragraph role="code" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="69">LOGINV(Number; Mean; StDev)</paragraph>
@@ -177,7 +184,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3158417"><bookmark_value>LOGNORMDIST function</bookmark_value>
<bookmark_value>cumulative lognormal distribution</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_LOGNORMVERT" id="bm_id3155366" localize="false"/><paragraph role="heading" id="hd_id3158417" xml-lang="en-US" level="2" l10n="U" oldref="76">LOGNORMDIST</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_LOGNORMVERT" id="bm_id3155366" localize="false"/>
+<paragraph role="heading" id="hd_id3158417" xml-lang="en-US" level="2" l10n="U" oldref="76">LOGNORMDIST</paragraph>
<paragraph role="paragraph" id="par_id3154953" xml-lang="en-US" l10n="U" oldref="77"><ahelp hid="HID_FUNC_LOGNORMVERT">Returns the cumulative lognormal distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3150474" xml-lang="en-US" level="3" l10n="U" oldref="78">Syntax</paragraph>
<paragraph role="code" id="par_id3150686" xml-lang="en-US" l10n="U" oldref="79">LOGNORMDIST(Number; Mean; StDev)</paragraph>
@@ -191,5 +199,9 @@
<paragraph role="paragraph" id="par_id3149778" xml-lang="en-US" l10n="U" oldref="84">
<item type="input">=LOGNORMDIST(0.1;0;1)</item> returns 0.01.</paragraph>
</section>
-</sort></body>
+</sort>
+<section id="relatedtopics">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060184.xhp b/helpcontent2/source/text/scalc/01/04060184.xhp
index db6c55bad0..fb3aa2fb43 100755
--- a/helpcontent2/source/text/scalc/01/04060184.xhp
+++ b/helpcontent2/source/text/scalc/01/04060184.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060184.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0104060184xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060184xml" indexer="include">
<title id="tit" xml-lang="en-US">Statistical Functions Part Four</title>
<filename>/text/scalc/01/04060184.xhp</filename>
</topic>
@@ -45,10 +43,12 @@
<body>
<paragraph role="heading" id="hd_id3153415" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="mq"><link href="text/scalc/01/04060184.xhp" name="Statistical Functions Part Four">Statistical Functions Part Four</link>
</variable></paragraph>
-<sort order="asc"><section id="max">
+<sort order="asc">
+<section id="max">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154511"><bookmark_value>MAX function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MAX" id="bm_id3146972" localize="false"/><paragraph role="heading" id="hd_id3154511" xml-lang="en-US" level="2" l10n="U" oldref="2">MAX</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MAX" id="bm_id3146972" localize="false"/>
+<paragraph role="heading" id="hd_id3154511" xml-lang="en-US" level="2" l10n="U" oldref="2">MAX</paragraph>
<paragraph role="paragraph" id="par_id3153709" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_FUNC_MAX">Returns the maximum value in a list of arguments.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id9282509" xml-lang="en-US" l10n="NEW">Returns 0 if no numeric value and no error was encountered in the cell range(s) passed as cell reference(s). Text cells are ignored by MIN() and MAX(). The functions MINA() and MAXA() return 0 if no value (numeric or text) and no error was encountered. Passing a literal string argument to MIN() or MAX(), e.g. MIN("string"), still results in an error.</paragraph>
<paragraph role="heading" id="hd_id3154256" xml-lang="en-US" level="3" l10n="U" oldref="4">Syntax</paragraph>
@@ -64,7 +64,8 @@
<section id="maxa">
<bookmark xml-lang="en-US" branch="index" id="bm_id3166426"><bookmark_value>MAXA function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MAXA" id="bm_id3150304" localize="false"/><paragraph role="heading" id="hd_id3166426" xml-lang="en-US" level="2" l10n="U" oldref="139">MAXA</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MAXA" id="bm_id3150304" localize="false"/>
+<paragraph role="heading" id="hd_id3166426" xml-lang="en-US" level="2" l10n="U" oldref="139">MAXA</paragraph>
<paragraph role="paragraph" id="par_id3150363" xml-lang="en-US" l10n="U" oldref="140"><ahelp hid="HID_FUNC_MAXA">Returns the maximum value in a list of arguments. In opposite to MAX, here you can enter text. The value of the text is 0.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id7689443" xml-lang="en-US" l10n="NEW">The functions MINA() and MAXA() return 0 if no value (numeric or text) and no error was encountered.</paragraph>
<paragraph role="heading" id="hd_id3150516" xml-lang="en-US" level="3" l10n="U" oldref="141">Syntax</paragraph>
@@ -80,7 +81,8 @@
<section id="median">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153820"><bookmark_value>MEDIAN function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MEDIAN" id="bm_id3153069" localize="false"/><paragraph role="heading" id="hd_id3153820" xml-lang="en-US" level="2" l10n="U" oldref="11">MEDIAN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MEDIAN" id="bm_id3153069" localize="false"/>
+<paragraph role="heading" id="hd_id3153820" xml-lang="en-US" level="2" l10n="U" oldref="11">MEDIAN</paragraph>
<paragraph role="paragraph" id="par_id3151241" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_FUNC_MEDIAN">Returns the median of a set of numbers. In a set containing an uneven number of values, the median will be the number in the middle of the set and in a set containing an even number of values, it will be the mean of the two values in the middle of the set.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148871" xml-lang="en-US" level="3" l10n="U" oldref="13">Syntax</paragraph>
<paragraph role="code" id="par_id3155264" xml-lang="en-US" l10n="U" oldref="14">MEDIAN(Number1; Number2; ...Number30)</paragraph>
@@ -93,7 +95,8 @@
<section id="min">
<bookmark xml-lang="en-US" branch="index" id="bm_id3154541"><bookmark_value>MIN function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MIN" id="bm_id3159226" localize="false"/><paragraph role="heading" id="hd_id3154541" xml-lang="en-US" level="2" l10n="U" oldref="19">MIN</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MIN" id="bm_id3159226" localize="false"/>
+<paragraph role="heading" id="hd_id3154541" xml-lang="en-US" level="2" l10n="U" oldref="19">MIN</paragraph>
<paragraph role="paragraph" id="par_id3143222" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_FUNC_MIN">Returns the minimum value in a list of arguments.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id2301400" xml-lang="en-US" l10n="NEW">Returns 0 if no numeric value and no error was encountered in the cell range(s) passed as cell reference(s). Text cells are ignored by MIN() and MAX(). The functions MINA() and MAXA() return 0 if no value (numeric or text) and no error was encountered. Passing a literal string argument to MIN() or MAX(), e.g. MIN("string"), still results in an error.</paragraph>
<paragraph role="heading" id="hd_id3154651" xml-lang="en-US" level="3" l10n="U" oldref="21">Syntax</paragraph>
@@ -107,7 +110,8 @@
<section id="mina">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147504"><bookmark_value>MINA function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MINA" id="bm_id3155752" localize="false"/><paragraph role="heading" id="hd_id3147504" xml-lang="en-US" level="2" l10n="U" oldref="148">MINA</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MINA" id="bm_id3155752" localize="false"/>
+<paragraph role="heading" id="hd_id3147504" xml-lang="en-US" level="2" l10n="U" oldref="148">MINA</paragraph>
<paragraph role="paragraph" id="par_id3147249" xml-lang="en-US" l10n="U" oldref="149"><ahelp hid="HID_FUNC_MINA">Returns the minimum value in a list of arguments. Here you can also enter text. The value of the text is 0.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id4294564" xml-lang="en-US" l10n="NEW">The functions MINA() and MAXA() return 0 if no value (numeric or text) and no error was encountered.</paragraph>
<paragraph role="heading" id="hd_id3150435" xml-lang="en-US" level="3" l10n="U" oldref="150">Syntax</paragraph>
@@ -124,7 +128,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3166465"><bookmark_value>AVEDEV function</bookmark_value>
<bookmark_value>averages;statistical functions</bookmark_value>
</bookmark><comment>mw added "averages;"</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MITTELABW" id="bm_id3156396" localize="false"/><paragraph role="heading" id="hd_id3166465" xml-lang="en-US" level="2" l10n="U" oldref="27">AVEDEV</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MITTELABW" id="bm_id3156396" localize="false"/>
+<paragraph role="heading" id="hd_id3166465" xml-lang="en-US" level="2" l10n="U" oldref="27">AVEDEV</paragraph>
<paragraph role="paragraph" id="par_id3150373" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="HID_FUNC_MITTELABW">Returns the average of the absolute deviations of data points from their mean.</ahelp> Displays the diffusion in a data set.</paragraph>
<paragraph role="heading" id="hd_id3150038" xml-lang="en-US" level="3" l10n="U" oldref="29">Syntax</paragraph>
<paragraph role="code" id="par_id3145636" xml-lang="en-US" l10n="U" oldref="30">AVEDEV(Number1; Number2; ...Number30)</paragraph>
@@ -138,7 +143,8 @@
<section id="average">
<bookmark xml-lang="en-US" branch="index" id="bm_id3145824"><bookmark_value>AVERAGE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MITTELWERT" id="bm_id3146878" localize="false"/><paragraph role="heading" id="hd_id3145824" xml-lang="en-US" level="2" l10n="U" oldref="35">AVERAGE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MITTELWERT" id="bm_id3146878" localize="false"/>
+<paragraph role="heading" id="hd_id3145824" xml-lang="en-US" level="2" l10n="U" oldref="35">AVERAGE</paragraph>
<paragraph role="paragraph" id="par_id3150482" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="HID_FUNC_MITTELWERT">Returns the average of the arguments.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146943" xml-lang="en-US" level="3" l10n="U" oldref="37">Syntax</paragraph>
<paragraph role="code" id="par_id3154679" xml-lang="en-US" l10n="U" oldref="38">AVERAGE(Number1; Number2; ...Number30)</paragraph>
@@ -152,7 +158,8 @@
<section id="averagea">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148754"><bookmark_value>AVERAGEA function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MITTELWERTA" id="bm_id3149690" localize="false"/><paragraph role="heading" id="hd_id3148754" xml-lang="en-US" level="2" l10n="U" oldref="157">AVERAGEA</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MITTELWERTA" id="bm_id3149690" localize="false"/>
+<paragraph role="heading" id="hd_id3148754" xml-lang="en-US" level="2" l10n="U" oldref="157">AVERAGEA</paragraph>
<paragraph role="paragraph" id="par_id3145138" xml-lang="en-US" l10n="U" oldref="158"><ahelp hid="HID_FUNC_MITTELWERTA">Returns the average of the arguments. The value of a text is 0.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153326" xml-lang="en-US" level="3" l10n="U" oldref="159">Syntax</paragraph>
<paragraph role="code" id="par_id3149734" xml-lang="en-US" l10n="U" oldref="160">AVERAGEA(Value1; Value2; ... Value30)</paragraph>
@@ -167,7 +174,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3153933"><bookmark_value>MODE function</bookmark_value>
<bookmark_value>most common value</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MODALWERT" id="bm_id3149253" localize="false"/><paragraph role="heading" id="hd_id3153933" xml-lang="en-US" level="2" l10n="U" oldref="43">MODE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_MODALWERT" id="bm_id3149253" localize="false"/>
+<paragraph role="heading" id="hd_id3153933" xml-lang="en-US" level="2" l10n="U" oldref="43">MODE</paragraph>
<paragraph role="paragraph" id="par_id3153085" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="HID_FUNC_MODALWERT">Returns the most common value in a data set.</ahelp> If there are several values with the same frequency, it returns the smallest value. An error occurs when a value doesn't appear twice.</paragraph>
<paragraph role="heading" id="hd_id3153003" xml-lang="en-US" level="3" l10n="U" oldref="45">Syntax</paragraph>
<paragraph role="code" id="par_id3155950" xml-lang="en-US" l10n="U" oldref="46">MODE(Number1; Number2; ...Number30)</paragraph>
@@ -182,7 +190,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3149879"><bookmark_value>NEGBINOMDIST function</bookmark_value>
<bookmark_value>negative binomial distribution</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_NEGBINOMVERT" id="bm_id3159135" localize="false"/><paragraph role="heading" id="hd_id3149879" xml-lang="en-US" level="2" l10n="U" oldref="51">NEGBINOMDIST</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_NEGBINOMVERT" id="bm_id3159135" localize="false"/>
+<paragraph role="heading" id="hd_id3149879" xml-lang="en-US" level="2" l10n="U" oldref="51">NEGBINOMDIST</paragraph>
<paragraph role="paragraph" id="par_id3155437" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="HID_FUNC_NEGBINOMVERT">Returns the negative binomial distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145351" xml-lang="en-US" level="3" l10n="U" oldref="53">Syntax</paragraph>
<paragraph role="code" id="par_id3150935" xml-lang="en-US" l10n="U" oldref="54">NEGBINOMDIST(X; R; SP)</paragraph>
@@ -200,7 +209,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3155516"><bookmark_value>NORMINV function</bookmark_value>
<bookmark_value>normal distribution;inverse of</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_NORMINV" id="bm_id3149396" localize="false"/><paragraph role="heading" id="hd_id3155516" xml-lang="en-US" level="2" l10n="U" oldref="61">NORMINV</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_NORMINV" id="bm_id3149396" localize="false"/>
+<paragraph role="heading" id="hd_id3155516" xml-lang="en-US" level="2" l10n="U" oldref="61">NORMINV</paragraph>
<paragraph role="paragraph" id="par_id3154634" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="HID_FUNC_NORMINV">Returns the inverse of the normal cumulative distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153227" xml-lang="en-US" level="3" l10n="U" oldref="63">Syntax</paragraph>
<paragraph role="code" id="par_id3147534" xml-lang="en-US" l10n="U" oldref="64">NORMINV(Number; Mean; StDev)</paragraph>
@@ -218,7 +228,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3153722"><bookmark_value>NORMDIST function</bookmark_value>
<bookmark_value>density function</bookmark_value>
</bookmark><comment>mw added one entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_NORMVERT" id="bm_id3147484" localize="false"/><paragraph role="heading" id="hd_id3153722" xml-lang="en-US" level="2" l10n="U" oldref="71">NORMDIST</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_NORMVERT" id="bm_id3147484" localize="false"/>
+<paragraph role="heading" id="hd_id3153722" xml-lang="en-US" level="2" l10n="U" oldref="71">NORMDIST</paragraph>
<paragraph role="paragraph" id="par_id3150386" xml-lang="en-US" l10n="CHG" oldref="72"><ahelp hid="HID_FUNC_NORMVERT">Returns the density function or the normal cumulative distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3083282" xml-lang="en-US" level="3" l10n="U" oldref="73">Syntax</paragraph>
<paragraph role="code" id="par_id3150613" xml-lang="en-US" l10n="U" oldref="74">NORMDIST(Number; Mean; StDev; C)</paragraph>
@@ -239,7 +250,8 @@
<section id="pearson">
<bookmark xml-lang="en-US" branch="index" id="bm_id3152934"><bookmark_value>PEARSON function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_PEARSON" id="bm_id3156103" localize="false"/><paragraph role="heading" id="hd_id3152934" xml-lang="en-US" level="2" l10n="U" oldref="83">PEARSON</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_PEARSON" id="bm_id3156103" localize="false"/>
+<paragraph role="heading" id="hd_id3152934" xml-lang="en-US" level="2" l10n="U" oldref="83">PEARSON</paragraph>
<paragraph role="paragraph" id="par_id3153216" xml-lang="en-US" l10n="U" oldref="84"><ahelp hid="HID_FUNC_PEARSON">Returns the Pearson product moment correlation coefficient r.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147081" xml-lang="en-US" level="3" l10n="U" oldref="85">Syntax</paragraph>
<paragraph role="code" id="par_id3156133" xml-lang="en-US" l10n="U" oldref="86">PEARSON(Data1; Data2)</paragraph>
@@ -254,7 +266,8 @@
<section id="phi">
<bookmark xml-lang="en-US" branch="index" id="bm_id3152806"><bookmark_value>PHI function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_PHI" id="bm_id3153757" localize="false"/><paragraph role="heading" id="hd_id3152806" xml-lang="en-US" level="2" l10n="U" oldref="92">PHI</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_PHI" id="bm_id3153757" localize="false"/>
+<paragraph role="heading" id="hd_id3152806" xml-lang="en-US" level="2" l10n="U" oldref="92">PHI</paragraph>
<paragraph role="paragraph" id="par_id3150254" xml-lang="en-US" l10n="U" oldref="93"><ahelp hid="HID_FUNC_PHI">Returns the values of the distribution function for a standard normal distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154748" xml-lang="en-US" level="3" l10n="U" oldref="94">Syntax</paragraph>
<paragraph role="code" id="par_id3149976" xml-lang="en-US" l10n="U" oldref="95">PHI(Number)</paragraph>
@@ -271,7 +284,8 @@
<section id="poisson">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153985"><bookmark_value>POISSON function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_POISSON" id="bm_id3156011" localize="false"/><paragraph role="heading" id="hd_id3153985" xml-lang="en-US" level="2" oldref="102">POISSON</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_POISSON" id="bm_id3156011" localize="false"/>
+<paragraph role="heading" id="hd_id3153985" xml-lang="en-US" level="2" oldref="102">POISSON</paragraph>
<paragraph role="paragraph" id="par_id3154298" xml-lang="en-US" l10n="U" oldref="103"><ahelp hid="HID_FUNC_POISSON">Returns the Poisson distribution.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3159183" xml-lang="en-US" level="3" l10n="U" oldref="104">Syntax</paragraph>
<paragraph role="code" id="par_id3146093" xml-lang="en-US" l10n="U" oldref="105">POISSON(Number; Mean; C)</paragraph>
@@ -288,7 +302,8 @@
<section id="percentile">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153100"><bookmark_value>PERCENTILE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_QUANTIL" id="bm_id3155394" localize="false"/><paragraph role="heading" id="hd_id3153100" xml-lang="en-US" level="2" l10n="U" oldref="112">PERCENTILE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_QUANTIL" id="bm_id3155394" localize="false"/>
+<paragraph role="heading" id="hd_id3153100" xml-lang="en-US" level="2" l10n="U" oldref="112">PERCENTILE</paragraph>
<paragraph role="paragraph" id="par_id3154940" xml-lang="en-US" l10n="U" oldref="113"><ahelp hid="HID_FUNC_QUANTIL">Returns the alpha-percentile of data values in an array.</ahelp> A percentile returns the scale value for a data series which goes from the smallest (Alpha=0) to the largest value (alpha=1) of a data series. For <item type="literal">Alpha</item> = 25%, the percentile means the first quartile; <item type="literal">Alpha</item> = 50% is the MEDIAN.</paragraph>
<paragraph role="heading" id="hd_id3150531" xml-lang="en-US" level="3" l10n="U" oldref="114">Syntax</paragraph>
<paragraph role="code" id="par_id3148813" xml-lang="en-US" l10n="U" oldref="115">PERCENTILE(Data; Alpha)</paragraph>
@@ -303,7 +318,8 @@
<section id="percentrank">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148807"><bookmark_value>PERCENTRANK function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_QUANTILSRANG" id="bm_id3154902" localize="false"/><paragraph role="heading" id="hd_id3148807" xml-lang="en-US" level="2" l10n="U" oldref="121">PERCENTRANK</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_QUANTILSRANG" id="bm_id3154902" localize="false"/>
+<paragraph role="heading" id="hd_id3148807" xml-lang="en-US" level="2" l10n="U" oldref="121">PERCENTRANK</paragraph>
<paragraph role="paragraph" id="par_id3153573" xml-lang="en-US" l10n="U" oldref="122"><ahelp hid="HID_FUNC_QUANTILSRANG">Returns the percentage rank of a value in a sample.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147512" xml-lang="en-US" level="3" l10n="U" oldref="123">Syntax</paragraph>
<paragraph role="code" id="par_id3147238" xml-lang="en-US" l10n="U" oldref="124">PERCENTRANK(Data; Value)</paragraph>
@@ -318,7 +334,8 @@
<section id="quartile">
<bookmark xml-lang="en-US" branch="index" id="bm_id3166442"><bookmark_value>QUARTILE function</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FUNC_QUARTILE" id="bm_id3150709" localize="false"/><paragraph role="heading" id="hd_id3166442" xml-lang="en-US" level="2" l10n="U" oldref="130">QUARTILE</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FUNC_QUARTILE" id="bm_id3150709" localize="false"/>
+<paragraph role="heading" id="hd_id3166442" xml-lang="en-US" level="2" l10n="U" oldref="130">QUARTILE</paragraph>
<paragraph role="paragraph" id="par_id3146958" xml-lang="en-US" l10n="U" oldref="131"><ahelp hid="HID_FUNC_QUARTILE">Returns the quartile of a data set.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152942" xml-lang="en-US" level="3" l10n="U" oldref="132">Syntax</paragraph>
<paragraph role="code" id="par_id3153684" xml-lang="en-US" l10n="U" oldref="133">QUARTILE(Data; Type)</paragraph>
@@ -330,5 +347,9 @@
<paragraph role="paragraph" id="par_id3159276" xml-lang="en-US" l10n="CHG" oldref="137">
<item type="input">=QUARTILE(A1:A50;2)</item> returns the value of which 50% of the scale corresponds to the lowest to highest values in the range A1:A50.</paragraph>
</section>
-</sort></body>
+</sort>
+<section id="relatedtopics">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060185.xhp b/helpcontent2/source/text/scalc/01/04060185.xhp
index 3118110a04..a01c0d71de 100755
--- a/helpcontent2/source/text/scalc/01/04060185.xhp
+++ b/helpcontent2/source/text/scalc/01/04060185.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060185.xhp,v $
- *
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +35,7 @@
<meta>
-<topic id="textscalc0104060185xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104060185xml" indexer="include">
<title id="tit" xml-lang="en-US">Statistical Functions Part Five</title>
<filename>/text/scalc/01/04060185.xhp</filename>
</topic>
@@ -456,5 +454,8 @@
<item type="input">=WEIBULL(2;1;1;1)</item> returns 0.86.</paragraph>
</section>
</sort>
+<section id="relatedtopics">
+<embed href="text/scalc/01/04060100.xhp#drking"/>
+</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04070100.xhp b/helpcontent2/source/text/scalc/01/04070100.xhp
index d432951673..000d38c154 100644
--- a/helpcontent2/source/text/scalc/01/04070100.xhp
+++ b/helpcontent2/source/text/scalc/01/04070100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04070100.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,28 +30,25 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalc0104070100xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104070100xml" indexer="include">
<title id="tit" xml-lang="en-US">Define Names</title>
<filename>/text/scalc/01/04070100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-13T14:54:03">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/FID_DEFINE_NAME" id="bm_id4757802" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FID_DEFINE_NAME" id="bm_id4757802" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DefineName" id="bm_id3155922" localize="false"/>
<paragraph role="heading" id="hd_id3156330" xml-lang="en-US" level="1" l10n="U" oldref="1">Define Names</paragraph>
<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="2"><variable id="namenfestlegentext"><ahelp hid=".uno:DefineName">Opens a dialog where you can specify a name for a selected area.</ahelp>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="31">Use the mouse to define ranges or type the reference into the <emph>Define Name </emph>dialog fields.</paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000404.xhp#einafe"/>
+<embed href="text/scalc/00/00000404.xhp#einafe"/>
</section>
<paragraph role="paragraph" id="par_id3155131" xml-lang="en-US" l10n="U" oldref="30">The <emph>Sheet Area</emph> box on the Formula bar contains a list of defined names for the ranges. Click a name from this box to highlight the corresponding reference on the spreadsheet. Names given formulas or parts of a formula are not listed here.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_NAMES:ED_NAME" id="bm_id3151114" localize="false"/>
@@ -60,7 +58,7 @@
<paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="2" l10n="U" oldref="9">Assigned to</paragraph>
<paragraph role="paragraph" id="par_id3147435" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:EDIT:RID_SCDLG_NAMES:ED_ASSIGN">The reference of the selected area name is shown here as an absolute value.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3146986" xml-lang="en-US" l10n="U" oldref="12">To insert a new area reference, place the cursor in this field and use your mouse to select the desired area in any sheet of your spreadsheet document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_NAMES:RB_ASSIGN" id="bm_id3159155" localize="false"/><embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
<bookmark xml-lang="en-US" branch="hid/SC:MOREBUTTON:RID_SCDLG_NAMES:BTN_MORE" id="bm_id3148455" localize="false"/>
<paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="2" l10n="U" oldref="13">More</paragraph>
<paragraph role="paragraph" id="par_id3149958" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_NAMES:BTN_MORE">Allows you to specify the <emph>Area type </emph>(optional) for the reference.</ahelp></paragraph>
@@ -81,6 +79,6 @@
<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_NAMES:BTN_ADD" id="bm_id3150207" localize="false"/>
<paragraph role="heading" id="hd_id3155112" xml-lang="en-US" level="2" l10n="U" oldref="27">Add/Modify</paragraph>
<paragraph role="paragraph" id="par_id3159236" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_NAMES:BTN_ADD">Click the <emph>Add</emph> button to add the defined name to the list. Click the <emph>Modify</emph> button to enter another name for an already existing name selected from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_NAMES:BTN_REMOVE" id="bm_id3150089" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04070400.xhp b/helpcontent2/source/text/scalc/01/04070400.xhp
index 24e82a70e8..5a69e9fc00 100644
--- a/helpcontent2/source/text/scalc/01/04070400.xhp
+++ b/helpcontent2/source/text/scalc/01/04070400.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04070400.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,31 +30,28 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalc0104070400xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0104070400xml" indexer="include">
<title id="tit" xml-lang="en-US">Define Label Range</title>
<filename>/text/scalc/01/04070400.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-10T11:39:59">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150791"><bookmark_value>sheets; defining label ranges</bookmark_value>
<bookmark_value>label ranges in sheets</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SID_DEFINE_COLROWNAMERANGES" id="bm_id9319643" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_DEFINE_COLROWNAMERANGES" id="bm_id9319643" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DefineLabelRange" id="bm_id3150447" localize="false"/>
<paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="define_label_range"><link href="text/scalc/01/04070400.xhp">Define Label Range</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3150868" xml-lang="en-US" l10n="U" oldref="2"><variable id="beschtext"><ahelp hid=".uno:DefineLabelRange">Opens a dialog in which you can define a label range.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000404.xhp#einabesch"/>
+<embed href="text/scalc/00/00000404.xhp#einabesch"/>
</section>
<embed href="text/scalc/guide/address_auto.xhp#address_auto"/>
<paragraph role="paragraph" id="par_id3155411" xml-lang="en-US" l10n="U" oldref="13">The cell contents of a label range can be used like names in formulas - $[officename] recognizes these names in the same manner that it does the predefined names of the weekdays and months. These names are automatically completed when typed into a formula. In addition, the names defined by label ranges will have priority over names defined by automatically generated ranges.</paragraph>
@@ -62,7 +60,7 @@
<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_COLROWNAMERANGES:ED_AREA" id="bm_id3148457" localize="false"/>
<paragraph role="heading" id="hd_id3145801" xml-lang="en-US" level="2" l10n="U" oldref="3">Range</paragraph>
<paragraph role="paragraph" id="par_id3154731" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:EDIT:RID_SCDLG_COLROWNAMERANGES:ED_AREA">Displays the cell reference of each label range.</ahelp> In order to remove a label range from the list box, select it and then click <emph>Delete</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_COLROWNAMERANGES:RB_AREA" id="bm_id3149400" localize="false"/><embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_COLROWNAMERANGES:BTN_COLHEAD" id="bm_id3155064" localize="false"/>
<paragraph role="heading" id="hd_id3149121" xml-lang="en-US" level="3" l10n="U" oldref="5">Contains column labels</paragraph>
<paragraph role="paragraph" id="par_id3150330" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_COLROWNAMERANGES:BTN_COLHEAD">Includes column labels in the current label range.</ahelp></paragraph>
@@ -72,11 +70,11 @@
<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_COLROWNAMERANGES:ED_DATA" id="bm_id3146919" localize="false"/>
<paragraph role="heading" id="hd_id3159264" xml-lang="en-US" level="3" l10n="U" oldref="11">For data range</paragraph>
<paragraph role="paragraph" id="par_id3154703" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:EDIT:RID_SCDLG_COLROWNAMERANGES:ED_DATA">Sets the data range for which the selected label range is valid. To modify it, click in the sheet and select another range with the mouse.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_COLROWNAMERANGES:RB_DATA" id="bm_id3155962" localize="false"/><embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_COLROWNAMERANGES:BTN_ADD" id="bm_id3150299" localize="false"/>
<paragraph role="heading" id="hd_id3145789" xml-lang="en-US" level="2" l10n="U" oldref="9">Add</paragraph>
<paragraph role="paragraph" id="par_id3147005" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_COLROWNAMERANGES:BTN_ADD">Adds the current label range to the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_COLROWNAMERANGES:BTN_REMOVE" id="bm_id3153839" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<section id="relatedtopics">
<embed href="text/scalc/guide/address_auto.xhp#address_auto"/>
</section>
diff --git a/helpcontent2/source/text/scalc/01/05050100.xhp b/helpcontent2/source/text/scalc/01/05050100.xhp
index 6e1a5a3e23..df262cb4c3 100644
--- a/helpcontent2/source/text/scalc/01/05050100.xhp
+++ b/helpcontent2/source/text/scalc/01/05050100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05050100.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalc0105050100xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0105050100xml" indexer="include">
<title id="tit" xml-lang="en-US">Rename Sheet</title>
<filename>/text/scalc/01/05050100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-08-16T13:29:58">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3147336"><bookmark_value>worksheet names</bookmark_value>
@@ -48,25 +46,23 @@
<bookmark_value>sheets; renaming</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SC:MODALDIALOG:RID_SCDLG_STRINPUT" id="bm_id3149166" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FID_TAB_RENAME" id="bm_id8359250" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FID_TAB_RENAME" id="bm_id8359250" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Name" id="bm_id3153252" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FID_TAB_MENU_RENAME" id="bm_id9504501" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FID_TAB_MENU_RENAME" id="bm_id9504501" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:RenameTable" id="bm_id3159400" localize="false"/>
<paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="1" l10n="U" oldref="1">Rename Sheet</paragraph>
<paragraph role="paragraph" id="par_id3150792" xml-lang="en-US" l10n="U" oldref="2"><variable id="umbenennentext"><ahelp hid=".uno:RenameTable">This command opens a dialog where you can assign a different name to the current sheet.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000405.xhp#fotu"/>
+<embed href="text/scalc/00/00000405.xhp#fotu"/>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_SC_RENAME_NAME" id="bm_id3156280" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_STRINPUT:ED_INPUT" id="bm_id3154908" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SC_APPEND_NAME" id="bm_id3151041" localize="false"/>
<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
-<paragraph role="paragraph" id="par_id3155131" xml-lang="en-US" l10n="C"><ahelp hid="HID_SC_APPEND_NAME">Enter a new name for the sheet here.</ahelp> Allowed characters are letters, numbers, spaces, and the underline character.</paragraph>
-<paragraph role="tip" id="par_id3153092" xml-lang="en-US" l10n="U" oldref="5">You can also open the<emph> Rename Sheet </emph>dialog through the context menu by positioning the mouse pointer over a sheet tab at the bottom of the window and <switchinline select="sys"><caseinline select="MAC">clicking while pressing Ctrl
-</caseinline><defaultinline>clicking the right mouse button</defaultinline></switchinline>.</paragraph>
-<paragraph role="tip" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="6">Alternatively, click the sheet tab while pressing the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key. Now you can change the name directly. <switchinline select="sys"><caseinline select="UNIX"><embedvar href="text/shared/00/00000099.xhp#winmanager"/>
+<paragraph role="paragraph" id="par_id3155131" xml-lang="en-US" l10n="C"><ahelp hid="HID_SC_APPEND_NAME">Enter a new name for the sheet here.</ahelp></paragraph>
+<paragraph role="tip" id="par_id3153092" xml-lang="en-US" l10n="U" oldref="5">You can also open the<emph> Rename Sheet </emph>dialog through the context menu by positioning the mouse pointer over a sheet tab at the bottom of the window and <switchinline select="sys"><caseinline select="MAC">clicking while pressing Control</caseinline><defaultinline>clicking the right mouse button</defaultinline></switchinline>.</paragraph>
+<paragraph role="tip" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="6">Alternatively, click the sheet tab while pressing the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Alt</defaultinline></switchinline> key. Now you can change the name directly. <switchinline select="sys"><caseinline select="UNIX"><embedvar href="text/shared/00/00000099.xhp#winmanager"/>
</caseinline></switchinline></paragraph>
<section id="relatedtopics">
<embed href="text/scalc/guide/rename_table.xhp#rename_table"/>
diff --git a/helpcontent2/source/text/scalc/01/05080300.xhp b/helpcontent2/source/text/scalc/01/05080300.xhp
index d9ebc0b019..6be1baf33c 100644
--- a/helpcontent2/source/text/scalc/01/05080300.xhp
+++ b/helpcontent2/source/text/scalc/01/05080300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05080300.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,29 +30,24 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalc0105080300xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0105080300xml" indexer="include">
<title id="tit" xml-lang="en-US">Edit Print Ranges</title>
<filename>/text/scalc/01/05080300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-09T13:47:09">UFI: added spec "Calc Print Settings Sheet Property "Print Entire Sheet""
-dedr: reviewed
-</lastedited>
-</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SID_OPENDLG_EDIT_PRINTAREA" id="bm_id2248794" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_OPENDLG_EDIT_PRINTAREA" id="bm_id2248794" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:EditPrintArea" id="bm_id3145673" localize="false"/>
<paragraph role="heading" id="hd_id3153088" xml-lang="en-US" level="1" l10n="U" oldref="1">Edit Print Ranges</paragraph>
<paragraph role="paragraph" id="par_id3159488" xml-lang="en-US" l10n="U" oldref="2"><variable id="druckbereichetext"><ahelp hid=".uno:EditPrintArea">Opens a dialog where you can specify the print range.</ahelp>
</variable> You can also set the rows or columns which are to be repeated in every page.</paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000405.xhp#fodbbe"/>
+<embed href="text/scalc/00/00000405.xhp#fodbbe"/>
</section>
<embed href="text/scalc/guide/print_title_row.xhp#print_title_row"/>
<paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US" l10n="NEW">
@@ -63,9 +59,7 @@ dedr: reviewed
<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:EDIT:RID_SCDLG_AREAS:ED_PRINTAREA">Allows you to modify a defined print range.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3145174" xml-lang="en-US" l10n="CHG" oldref="5">Select <emph>-none-</emph> to remove a print range definition for the current spreadsheet. Select <emph>-entire sheet-</emph> to set the current sheet as a print range. Select <emph>-selection-</emph> to define the selected area of a spreadsheet as the print range. By selecting <emph>-user-defined-</emph>, you can define a print range that you have already defined using the <emph>Format - Print Ranges - Define</emph> command. If you have given a name to a range using the <emph>Insert - Names - Define</emph> command, this name will be displayed and can be selected from the list box.</paragraph>
<paragraph role="paragraph" id="par_id3145272" xml-lang="en-US" l10n="U" oldref="6">In the right-hand text box, you can enter a print range by reference or by name. If the cursor is in the <emph>Print range</emph> text box, you can also select the print range in the spreadsheet with your mouse.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_AREAS:RB_PRINTAREA" id="bm_id3152596" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_AREAS:RB_REPEATROW" id="bm_id3146975" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_AREAS:RB_REPEATCOL" id="bm_id3154321" localize="false"/><embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_AREAS:LB_REPEATROW" id="bm_id3147435" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_AREAS:ED_REPEATROW" id="bm_id3153190" localize="false"/>
<paragraph role="heading" id="hd_id3149260" xml-lang="en-US" level="2" l10n="U" oldref="7">Rows to repeat</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/05110000.xhp b/helpcontent2/source/text/scalc/01/05110000.xhp
index 1c13f1f652..0e8560a7b4 100755
--- a/helpcontent2/source/text/scalc/01/05110000.xhp
+++ b/helpcontent2/source/text/scalc/01/05110000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05110000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,28 +30,25 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalc0105110000xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0105110000xml" indexer="include">
<title id="tit" xml-lang="en-US">AutoFormat</title>
<filename>/text/scalc/01/05110000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-17T14:41:46">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SID_AUTOFORMAT" id="bm_id9247611" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_AUTOFORMAT" id="bm_id9247611" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoFormat" id="bm_id2998138" localize="false"/>
<paragraph role="heading" id="hd_id3149666" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="autoformat"><link href="text/scalc/01/05110000.xhp" name="AutoFormat">AutoFormat</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145367" xml-lang="en-US" l10n="U" oldref="2"><variable id="autoformattext"><ahelp hid=".">Use this command to apply an AutoFormat to a selected sheet area or to define your own AutoFormats.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000405.xhp#foatfo"/>
+<embed href="text/scalc/00/00000405.xhp#foatfo"/>
</section>
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_AUTOFORMAT:LB_FORMAT" id="bm_id3145645" localize="false"/>
<paragraph role="heading" id="hd_id3148455" xml-lang="en-US" level="2" l10n="U" oldref="3">Format</paragraph>
@@ -61,7 +59,7 @@
<paragraph role="paragraph" id="par_id3154017" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_AUTOFORMAT:BTN_ADD">Allows you to add the current formatting of a range of at least 4 x 4 cells to the list of predefined AutoFormats.</ahelp> The <link href="text/shared/01/05150101.xhp" name="Add AutoFormat">Add AutoFormat</link> dialog then appears.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SC_AUTOFMT_NAME" id="bm_id3153713" localize="false"/>
<paragraph role="paragraph" id="par_id3153708" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_SC_AUTOFMT_NAME">Enter a name and click <emph>OK</emph>. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_AUTOFORMAT:BTN_REMOVE" id="bm_id3153766" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<bookmark xml-lang="en-US" branch="hid/SC:MOREBUTTON:RID_SCDLG_AUTOFORMAT:BTN_MORE" id="bm_id3154254" localize="false"/>
<paragraph role="heading" id="hd_id3150044" xml-lang="en-US" level="2" l10n="U" oldref="7">More</paragraph>
<paragraph role="paragraph" id="par_id3146920" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_AUTOFORMAT:BTN_MORE">Opens the <emph>Formatting</emph> section, which displays the formatting overrides that can be applied to the spreadsheet. Deselecting an option keeps the format of the current spreadsheet for that format type.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/scalc/01/05120000.xhp b/helpcontent2/source/text/scalc/01/05120000.xhp
index 4dcb72396c..a57f05498d 100644
--- a/helpcontent2/source/text/scalc/01/05120000.xhp
+++ b/helpcontent2/source/text/scalc/01/05120000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05120000.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalc0105120000xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0105120000xml" indexer="include">
<title id="tit" xml-lang="en-US">Conditional Formatting</title>
<filename>/text/scalc/01/05120000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-05-11T15:31:50">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/SID_OPENDLG_CONDFRMT" id="bm_id5008046" localize="false"/>
@@ -51,7 +47,7 @@
<paragraph role="paragraph" id="par_id3163710" xml-lang="en-US" l10n="U" oldref="2"><variable id="bedingtetext"><ahelp hid=".uno:ConditionalFormatDialog">Choose <emph>Conditional Formatting</emph> to define format styles depending on certain conditions.</ahelp>
</variable> If a style was already assigned to a cell, it remains unchanged. The style entered here is then evaluated. You can enter three conditions that query the contents of cell values or formulas. The conditions are evaluated from 1 to 3. If the condition 1 matches the condition, the defined style will be used. Otherwise, condition 2 is evaluated, and its defined style used. If this style does not match, condition 3 is evaluated.</paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000405.xhp#bedingte"/>
+<embed href="text/scalc/00/00000405.xhp#bedingte"/>
</section>
<paragraph role="warning" id="par_id2414014" xml-lang="en-US" l10n="NEW">To apply conditional formatting, AutoCalculate must be enabled. Choose Tools - Cell Contents - AutoCalculate (you see a check mark next to the command when AutoCalculate is enabled).</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153189"><bookmark_value>conditional formatting; conditions</bookmark_value>
@@ -88,12 +84,7 @@
<paragraph role="paragraph" id="par_id3150784" xml-lang="en-US" l10n="U" oldref="14">Cell value is equal 0: Cell style Null value (You must have already defined a cell style with this name before assigning it to a condition).</paragraph>
<paragraph role="paragraph" id="par_id3150365" xml-lang="en-US" l10n="U" oldref="15">Cell value is between $B$20 and $B$21: Cell style Result (The corresponding value limits must already exist in cells B20 and B21)</paragraph>
<paragraph role="paragraph" id="par_id3152992" xml-lang="en-US" l10n="U" oldref="16">Formula is SUM($A$1:$A$5)=10: Cell style Result (The selected cells are formatted with the Result style if the sum of the contents in cells A1 to A5 is equal to 10.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND1_1" id="bm_id3155380" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND2_1" id="bm_id3150202" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_1" id="bm_id3150886" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND1_2" id="bm_id3150370" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND2_2" id="bm_id3150519" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_2" id="bm_id3155532" localize="false"/><embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_idN107E1" xml-lang="en-US" l10n="NEW">
<embedvar href="text/scalc/guide/cellstyle_conditional.xhp#cellstyle_conditional"/>
diff --git a/helpcontent2/source/text/scalc/01/06040000.xhp b/helpcontent2/source/text/scalc/01/06040000.xhp
index bb9982a253..7d1993fffa 100644
--- a/helpcontent2/source/text/scalc/01/06040000.xhp
+++ b/helpcontent2/source/text/scalc/01/06040000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06040000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,27 +30,24 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalc0106040000xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0106040000xml" indexer="include">
<title id="tit" xml-lang="en-US">Goal Seek</title>
<filename>/text/scalc/01/06040000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-20T10:24:15">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SID_OPENDLG_SOLVE" id="bm_id4741970" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_OPENDLG_SOLVE" id="bm_id4741970" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:GoalSeekDialog" id="bm_id3153088" localize="false"/>
<paragraph role="heading" id="hd_id3155629" xml-lang="en-US" level="1" l10n="U" oldref="1">Goal Seek</paragraph>
<paragraph role="paragraph" id="par_id3145119" xml-lang="en-US" l10n="U" oldref="2"><variable id="zielwertsuchetext"><ahelp hid=".uno:GoalSeekDialog">Opens a dialog where you can solve an equation with a variable.</ahelp>
</variable> After a successful search, a dialog with the results opens, allowing you to apply the result and the target value directly to the cell.</paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000406.xhp#exzws"/>
+<embed href="text/scalc/00/00000406.xhp#exzws"/>
</section>
<paragraph role="heading" id="hd_id3149656" xml-lang="en-US" level="2" l10n="U" oldref="3">Default</paragraph>
<paragraph role="paragraph" id="par_id3151211" xml-lang="en-US" l10n="U" oldref="4">In this section, you can define the variables in your formula.</paragraph>
@@ -62,7 +60,6 @@
<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_SOLVER:ED_VARCELL" id="bm_id3154013" localize="false"/>
<paragraph role="heading" id="hd_id3150012" xml-lang="en-US" level="3" l10n="U" oldref="9">Variable cell</paragraph>
<paragraph role="paragraph" id="par_id3147427" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:EDIT:RID_SCDLG_SOLVER:ED_VARCELL">Specifies the reference for the cell that contains the value you want to adjust in order to reach the target.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SOLVER:RB_FORMULACELL" id="bm_id3153364" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SOLVER:RB_VARCELL" id="bm_id3153363" localize="false"/><embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/06080000.xhp b/helpcontent2/source/text/scalc/01/06080000.xhp
index c6c4f74074..33e18158cf 100644
--- a/helpcontent2/source/text/scalc/01/06080000.xhp
+++ b/helpcontent2/source/text/scalc/01/06080000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06080000.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0106080000xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0106080000xml" indexer="include">
<title id="tit" xml-lang="en-US">Recalculate</title>
<filename>/text/scalc/01/06080000.xhp</filename>
</topic>
@@ -49,11 +47,12 @@
<bookmark_value>cell contents; recalculating</bookmark_value>
</bookmark><comment>mw changed "recalculating;...", "formulas;..." and "cell..." entries and deleted "recalculating formulas"</comment>
<bookmark xml-lang="en-US" branch="hid/FID_RECALC" id="bm_id2661876" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Calculate" id="bm_id3156329" localize="false"/><paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/06080000.xhp" name="Recalculate">Recalculate</link></paragraph>
-<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Calculate">Recalculates the current sheet. Use <item type="menuitem">Tools - Cell Contents - Recalculate</item> or press <item type="keycode">F9</item> to recalculate all changed formulas in the current sheet. Press <item type="keycode">Shift+Ctrl+F9</item> to recalculate all cells in all sheets.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Calculate" id="bm_id3156329" localize="false"/>
+<paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/06080000.xhp" name="Recalculate">Recalculate</link></paragraph>
+<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Calculate">Recalculates the current sheet. Use <item type="menuitem">Tools - Cell Contents - Recalculate</item> or press F9 to recalculate all changed formulas in the current sheet. </ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/scalc/00/00000406.xhp#exnb"/>
+<embed href="text/scalc/00/00000406.xhp#exnb"/>
</section>
<paragraph role="paragraph" id="par_id3150793" xml-lang="en-US" l10n="U" oldref="5">After the document has been recalculated, the display is refreshed. Any charts contained in the sheet are also refreshed.</paragraph>
</body>
diff --git a/helpcontent2/source/text/scalc/01/06130000.xhp b/helpcontent2/source/text/scalc/01/06130000.xhp
index 1ef19f621c..baa204fafe 100644
--- a/helpcontent2/source/text/scalc/01/06130000.xhp
+++ b/helpcontent2/source/text/scalc/01/06130000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06130000.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -72,7 +72,7 @@ YJ: checked</lastedited>
<paragraph role="paragraph" id="par_idN1066D" xml-lang="en-US" l10n="NEW">To view more completions, press <item type="keycode">Tab</item> to scroll forward, or <item type="keycode">Shift+Tab</item> to scroll backward.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_idN10679" xml-lang="en-US" l10n="NEW">To see a list of all available AutoInput text items for the current column, press <item type="keycode">Ctrl+D</item>.</paragraph>
+<paragraph role="paragraph" id="par_idN10679" xml-lang="en-US" l10n="NEW">To see a list of all available AutoInput text items for the current column, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+D.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="U" oldref="3">When typing formulas using characters that match previous entries, a Help tip will appear listing the last ten functions used from <emph>Function Wizard</emph>, from all defined range names, from all database range names, and from the content of all label ranges.</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12010000.xhp b/helpcontent2/source/text/scalc/01/12010000.xhp
index 2db9eb3882..90c05ed505 100644
--- a/helpcontent2/source/text/scalc/01/12010000.xhp
+++ b/helpcontent2/source/text/scalc/01/12010000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 12010000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,28 +30,25 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalc0112010000xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0112010000xml" indexer="include">
<title id="tit" xml-lang="en-US">Define Database Range</title>
<filename>/text/scalc/01/12010000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-20T10:37:08">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/SID_DEFINE_DBNAME" id="bm_id6632476" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_DEFINE_DBNAME" id="bm_id6632476" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DefineDBName" id="bm_id3147335" localize="false"/>
<paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="1" l10n="U" oldref="1">Define Database Range</paragraph>
<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="2"><variable id="bereichtext"><ahelp hid=".uno:DefineDBName">Defines a database range based on the selected cells in your sheet.</ahelp>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="5">You can only select a rectangular cell range.</paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000412.xhp#dbrbf"/>
+<embed href="text/scalc/00/00000412.xhp#dbrbf"/>
</section>
<bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_DBNAMES:ED_NAME" id="bm_id3150868" localize="false"/>
<paragraph role="heading" id="hd_id3156422" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
@@ -58,11 +56,11 @@
<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_DBNAMES:ED_DBAREA" id="bm_id3155133" localize="false"/>
<paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="2" l10n="U" oldref="6">Range</paragraph>
<paragraph role="paragraph" id="par_id3150441" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SC:EDIT:RID_SCDLG_DBNAMES:ED_DBAREA">Displays the selected cell range.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_DBNAMES:RB_DBAREA" id="bm_id3149262" localize="false"/><embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_DBNAMES:BTN_ADD" id="bm_id3153951" localize="false"/>
<paragraph role="heading" id="hd_id3153188" xml-lang="en-US" level="2" l10n="U" oldref="10">Add/Modify</paragraph>
<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_DBNAMES:BTN_ADD">Adds the selected cell range to the database range list, or modifies an existing database range.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_DBNAMES:BTN_REMOVE" id="bm_id3146120" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<bookmark xml-lang="en-US" branch="hid/SC:MOREBUTTON:RID_SCDLG_DBNAMES:BTN_MORE" id="bm_id3152596" localize="false"/>
<paragraph role="heading" id="hd_id3150010" xml-lang="en-US" level="2" l10n="U" oldref="12">More &gt;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_DBNAMES:BTN_MORE">Shows additional <link href="text/scalc/01/12010100.xhp" name="options">options</link>.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12040000.xhp b/helpcontent2/source/text/scalc/01/12040000.xhp
index 8856ec6be6..493bb5201d 100755
--- a/helpcontent2/source/text/scalc/01/12040000.xhp
+++ b/helpcontent2/source/text/scalc/01/12040000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 12040000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,22 +32,23 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0112040000xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0112040000xml" indexer="include">
<title id="tit" xml-lang="en-US">Filter</title>
<filename>/text/scalc/01/12040000.xhp</filename>
</topic>
</meta>
<body>
-<section id="filter"><comment>MW deleted index entry</comment><paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/12040000.xhp" name="Filter">Filter</link></paragraph>
-<paragraph role="paragraph" id="par_id3155131" xml-lang="en-US" l10n="U" oldref="2">Contains filter commands.</paragraph>
+<section id="filter">
+<bookmark xml-lang="en-US" branch="hid/.uno:FilterMenu" id="bm_id102920080228246" localize="false"/>
+<paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/12040000.xhp" name="Filter">Filter</link></paragraph>
+<paragraph role="paragraph" id="par_id3155131" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Shows commands to filter your data.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="7">$[officename] automatically recognizes predefined database ranges.</paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000412.xhp#dnftr"/>
+<embed href="text/scalc/00/00000412.xhp#dnftr"/>
</section>
<paragraph role="paragraph" id="par_id3153363" xml-lang="en-US" l10n="U" oldref="3">The following filtering options are available:</paragraph>
<embed href="text/scalc/01/12040100.xhp#autofilter"/>
diff --git a/helpcontent2/source/text/scalc/01/12040201.xhp b/helpcontent2/source/text/scalc/01/12040201.xhp
index 2a86ac7917..dea806d13c 100755
--- a/helpcontent2/source/text/scalc/01/12040201.xhp
+++ b/helpcontent2/source/text/scalc/01/12040201.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 12040201.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalc0112040201xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0112040201xml" indexer="include">
<title id="tit" xml-lang="en-US">More</title>
<filename>/text/scalc/01/12040201.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-21T10:41:52">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="hd_id3148492" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/12040201.xhp" name="More">More</link></paragraph>
@@ -51,7 +47,7 @@
<paragraph role="paragraph" id="par_id3159400" xml-lang="en-US" l10n="U" oldref="2"><variable id="zusaetzetext"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_SPEC_FILTER:BTN_MORE">Shows additional filter options.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000412.xhp#filterzus"/>
+<embed href="text/scalc/00/00000412.xhp#filterzus"/>
</section>
<paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="2" l10n="U" oldref="3">Options</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_FILTER:BTN_CASE" id="bm_id3151210" localize="false"/>
@@ -70,8 +66,7 @@
<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_SPEC_FILTER:ED_COPY_AREA" id="bm_id3153093" localize="false"/>
<paragraph role="heading" id="hd_id3155306" xml-lang="en-US" level="3" l10n="U" oldref="9">Copy results to</paragraph>
<paragraph role="paragraph" id="par_id3154319" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:EDIT:RID_SCDLG_SPEC_FILTER:ED_COPY_AREA">Select the check box, and then select the cell range where you want to display the filter results.</ahelp> You can also select a named range from the list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_FILTER:RB_COPY_AREA" id="bm_id3150010" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA" id="bm_id3146985" localize="false"/><embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_FILTER:BTN_REGEXP" id="bm_id3153726" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_REGEXP" id="bm_id3153144" localize="false"/>
<paragraph role="heading" id="hd_id3145272" xml-lang="en-US" level="3" l10n="U" oldref="11">Regular expression</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12040300.xhp b/helpcontent2/source/text/scalc/01/12040300.xhp
index aa6541babf..caa3965d50 100644
--- a/helpcontent2/source/text/scalc/01/12040300.xhp
+++ b/helpcontent2/source/text/scalc/01/12040300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 12040300.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalc0112040300xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0112040300xml" indexer="include">
<title id="tit" xml-lang="en-US">Advanced Filter</title>
<filename>/text/scalc/01/12040300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-05-11T09:39:53">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/SID_SPECIAL_FILTER" id="bm_id4998774" localize="false"/>
@@ -49,7 +47,7 @@
<paragraph role="paragraph" id="par_id3156281" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="spezialfilter"><ahelp hid=".uno:DataFilterSpecialFilter">Defines an advanced filter.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000412.xhp#dnfspz"/>
+<embed href="text/scalc/00/00000412.xhp#dnfspz"/>
</section>
<paragraph role="paragraph" id="par_idN105EB" xml-lang="en-US" l10n="NEW">
<embedvar href="text/scalc/guide/filters.xhp#filters"/>
@@ -58,7 +56,7 @@
<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_SPEC_FILTER:ED_CRITERIA_AREA" id="bm_id3151113" localize="false"/>
<paragraph role="heading" id="hd_id3153771" xml-lang="en-US" level="2" l10n="U" oldref="25">Read filter criteria from</paragraph>
<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SC:EDIT:RID_SCDLG_SPEC_FILTER:ED_CRITERIA_AREA">Select the named range, or enter the cell range that contains the filter criteria that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA" id="bm_id3153190" localize="false"/><embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
<paragraph role="heading" id="hd_id3153188" xml-lang="en-US" level="2" l10n="U" oldref="27"><link href="text/scalc/01/12040201.xhp" name="More">More</link></paragraph>
<embed href="text/scalc/01/12040201.xhp#zusaetzetext"/>
</body>
diff --git a/helpcontent2/source/text/scalc/01/12060000.xhp b/helpcontent2/source/text/scalc/01/12060000.xhp
index a9b8032ffe..8bff0c78ff 100644
--- a/helpcontent2/source/text/scalc/01/12060000.xhp
+++ b/helpcontent2/source/text/scalc/01/12060000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 12060000.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,37 +30,38 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textscalc0112060000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Multiple Operations</title>
+<topic id="textscalc0112060000xml" indexer="include">
+<title id="tit" xml-lang="en-US">Multiple Operations</title>
<filename>/text/scalc/01/12060000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
- <bookmark xml-lang="en-US" branch="hid/SID_OPENDLG_TABOP" id="bm_id9116957" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:TableOperationDialog" xml-lang="en-US" id="bm_id3151210"/><paragraph role="heading" level="1" id="hd_id3153381" l10n="U" xml-lang="en-US" oldref="1">Multiple Operations</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3154140" xml-lang="en-US" oldref="2"><variable id="mehrfachoperationen"><ahelp hid=".uno:TableOperationDialog" visibility="visible">Applies the same formula to different cells, but with different parameter values.</ahelp></variable></paragraph>
- <section id="howtoget">
- <embed href="text/scalc/00/00000412.xhp#dnmfo"/>
+<bookmark xml-lang="en-US" branch="hid/SID_OPENDLG_TABOP" id="bm_id9116957" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:TableOperationDialog" id="bm_id3151210" localize="false"/>
+<paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="1" l10n="U" oldref="1">Multiple Operations</paragraph>
+<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="2"><variable id="mehrfachoperationen"><ahelp hid=".uno:TableOperationDialog">Applies the same formula to different cells, but with different parameter values.</ahelp>
+</variable></paragraph>
+<section id="howtoget">
+<embed href="text/scalc/00/00000412.xhp#dnmfo"/>
</section>
- <embed href="text/scalc/guide/multioperation.xhp#multioperation"/>
- <paragraph xml-lang="en-US" oldref="5" role="note" id="par_id3152598" l10n="U">The <emph>Row</emph> or <emph>Column</emph> box must contain a reference to the first cell of the selected range.</paragraph><paragraph role="note" id="par_id3154011" l10n="U" xml-lang="en-US" oldref="16">If you export a spreadsheet containing multiple operations to Microsoft Excel, the location of the cells containing the formula must be fully defined relative to the data range.</paragraph>
- <paragraph role="heading" level="2" id="hd_id3156441" l10n="U" xml-lang="en-US" oldref="3">Defaults</paragraph>
- <bookmark branch="hid/SC:EDIT:RID_SCDLG_TABOP:ED_FORMULARANGE" xml-lang="en-US" id="bm_id3149581"/><paragraph role="heading" level="3" id="hd_id3154492" l10n="U" xml-lang="en-US" oldref="6">Formulas</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3151073" xml-lang="en-US" oldref="7"><ahelp hid="SC:EDIT:RID_SCDLG_TABOP:ED_FORMULARANGE" visibility="visible">Enter the cell references for the cells containing the formulas that you want to use in the multiple operation.</ahelp></paragraph>
- <bookmark branch="hid/SC:EDIT:RID_SCDLG_TABOP:ED_ROWCELL" xml-lang="en-US" id="bm_id3156286"/><paragraph role="heading" level="3" id="hd_id3154729" l10n="U" xml-lang="en-US" oldref="8">Row</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3148456" xml-lang="en-US" oldref="9"><ahelp hid="SC:EDIT:RID_SCDLG_TABOP:ED_ROWCELL" visibility="visible">Enter the input cell reference that you want to use as a variable for the rows in the data table.</ahelp></paragraph>
- <bookmark branch="hid/SC:EDIT:RID_SCDLG_TABOP:ED_COLCELL" xml-lang="en-US" id="bm_id3149123"/><paragraph role="heading" level="3" id="hd_id3150718" l10n="U" xml-lang="en-US" oldref="14">Column</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150327" xml-lang="en-US" oldref="15"><ahelp hid="SC:EDIT:RID_SCDLG_TABOP:ED_COLCELL" visibility="visible">Enter the input cell reference that you want to use as a variable for the columns in the data table.</ahelp></paragraph>
- <bookmark branch="hid/SC:IMAGEBUTTON:RID_SCDLG_TABOP:RB_FORMULARANGE" xml-lang="en-US" id="bm_id3149785"/><bookmark branch="hid/SC:IMAGEBUTTON:RID_SCDLG_TABOP:RB_ROWCELL" xml-lang="en-US" id="bm_id3149019"/><bookmark branch="hid/SC:IMAGEBUTTON:RID_SCDLG_TABOP:RB_COLCELL" xml-lang="en-US" id="bm_id3153712"/><embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
-
- </body>
+<embed href="text/scalc/guide/multioperation.xhp#multioperation"/>
+<paragraph role="note" id="par_id3152598" xml-lang="en-US" l10n="U" oldref="5">The <emph>Row</emph> or <emph>Column</emph> box must contain a reference to the first cell of the selected range.</paragraph>
+<paragraph role="note" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="16">If you export a spreadsheet containing multiple operations to Microsoft Excel, the location of the cells containing the formula must be fully defined relative to the data range.</paragraph>
+<paragraph role="heading" id="hd_id3156441" xml-lang="en-US" level="2" l10n="U" oldref="3">Defaults</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_TABOP:ED_FORMULARANGE" id="bm_id3149581" localize="false"/>
+<paragraph role="heading" id="hd_id3154492" xml-lang="en-US" level="3" l10n="U" oldref="6">Formulas</paragraph>
+<paragraph role="paragraph" id="par_id3151073" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SC:EDIT:RID_SCDLG_TABOP:ED_FORMULARANGE">Enter the cell references for the cells containing the formulas that you want to use in the multiple operation.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_TABOP:ED_ROWCELL" id="bm_id3156286" localize="false"/>
+<paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="3" l10n="U" oldref="8">Row</paragraph>
+<paragraph role="paragraph" id="par_id3148456" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SC:EDIT:RID_SCDLG_TABOP:ED_ROWCELL">Enter the input cell reference that you want to use as a variable for the rows in the data table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_TABOP:ED_COLCELL" id="bm_id3149123" localize="false"/>
+<paragraph role="heading" id="hd_id3150718" xml-lang="en-US" level="3" l10n="U" oldref="14">Column</paragraph>
+<paragraph role="paragraph" id="par_id3150327" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SC:EDIT:RID_SCDLG_TABOP:ED_COLCELL">Enter the input cell reference that you want to use as a variable for the columns in the data table.</ahelp></paragraph>
+<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/12070000.xhp b/helpcontent2/source/text/scalc/01/12070000.xhp
index da8ca3f771..7a8e2d9fce 100644
--- a/helpcontent2/source/text/scalc/01/12070000.xhp
+++ b/helpcontent2/source/text/scalc/01/12070000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 12070000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalc0112070000xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0112070000xml" indexer="include">
<title id="tit" xml-lang="en-US">Consolidate</title>
<filename>/text/scalc/01/12070000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-05-30T16:21:57">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/SID_OPENDLG_CONSOLIDATE" id="bm_id4927741" localize="false"/>
@@ -49,7 +47,7 @@
<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="2"><variable id="konsolidieren"><ahelp hid=".uno:DataConsolidate">Combines data from one or more independent cell ranges and calculates a new range using the function that you specify.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000412.xhp#dnksd"/>
+<embed href="text/scalc/00/00000412.xhp#dnksd"/>
</section>
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_FUNC" id="bm_id3149958" localize="false"/>
<paragraph role="heading" id="hd_id3150010" xml-lang="en-US" level="2" l10n="U" oldref="8">Function</paragraph>
@@ -61,13 +59,12 @@
<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_CONSOLIDATE:ED_DATA_AREA" id="bm_id3154018" localize="false"/>
<paragraph role="heading" id="hd_id3147397" xml-lang="en-US" level="2" l10n="U" oldref="12">Source data range</paragraph>
<paragraph role="paragraph" id="par_id3153836" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC:EDIT:RID_SCDLG_CONSOLIDATE:ED_DATA_AREA">Specifies the cell range that you want to consolidate with the cell ranges listed in the <emph>Consolidation ranges </emph>box. Select a cell range in a sheet, and then click <emph>Add</emph>. You can also select a the name of a predefined cell from the <emph>Source data range </emph>list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONSOLIDATE:RB_DATA_AREA" id="bm_id3145640" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONSOLIDATE:RB_DEST_AREA" id="bm_id3153713" localize="false"/><embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_DEST_AREA" id="bm_id3156383" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCDLG_CONSOLIDATE:ED_DEST_AREA" id="bm_id3156382" localize="false"/>
<paragraph role="heading" id="hd_id3155768" xml-lang="en-US" level="2" l10n="U" oldref="15">Copy results to</paragraph>
<paragraph role="paragraph" id="par_id3147341" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SC:EDIT:RID_SCDLG_CONSOLIDATE:ED_DEST_AREA">Displays the first cell in the range where the consolidation results will be displayed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_REMOVE" id="bm_id3146916" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen1"/>
+<embed href="text/shared/00/00000001.xhp#loeschen1"/>
<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_ADD" id="bm_id3145228" localize="false"/>
<paragraph role="heading" id="hd_id3147345" xml-lang="en-US" level="2" l10n="U" oldref="17">Add</paragraph>
<paragraph role="paragraph" id="par_id3155335" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_ADD">Adds the cell range specified in the <emph>Source data range</emph> box to the <emph>Consolidation ranges </emph>box.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12090102.xhp b/helpcontent2/source/text/scalc/01/12090102.xhp
index cf314ba5f8..8aae0bc50a 100644
--- a/helpcontent2/source/text/scalc/01/12090102.xhp
+++ b/helpcontent2/source/text/scalc/01/12090102.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 12090102.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0112090102xml" indexer="include" status="PUBLISH">
+<topic id="textscalc0112090102xml" indexer="include">
<title id="tit" xml-lang="en-US">DataPilot</title>
<filename>/text/scalc/01/12090102.xhp</filename>
</topic>
@@ -47,10 +45,11 @@
<bookmark_value>DataPilot function;drill down</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_PIVOT_TABLE" id="bm_id1491879" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DataPilotExec" id="bm_id3154514" localize="false"/><paragraph role="heading" id="hd_id3149165" xml-lang="en-US" level="1" l10n="U" oldref="1">DataPilot</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DataPilotExec" id="bm_id3154514" localize="false"/>
+<paragraph role="heading" id="hd_id3149165" xml-lang="en-US" level="1" l10n="U" oldref="1">DataPilot</paragraph>
<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="CHG" oldref="13"><ahelp hid=".uno:DataPilotExec">Specify the layout of the table that is generated by the DataPilot.</ahelp></paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000412.xhp#dndpaz"/>
+<embed href="text/scalc/00/00000412.xhp#dndpaz"/>
</section>
<embed href="text/scalc/guide/datapilot.xhp#datapilot"/>
<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="34">The DataPilot displays data fields as buttons which you can drag and drop to define the DataPilot table.</paragraph>
@@ -58,40 +57,52 @@
<bookmark xml-lang="en-US" branch="hid/HID_SC_DPLAY_COLUMN" id="bm_id9569689" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SC_DPLAY_ROW" id="bm_id7529526" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SC_DPLAY_DATA" id="bm_id2920621" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_DPLAY_PAGE" id="bm_id7411420" localize="false"/><comment>UFI: changed help id from 59001 to dply_page</comment><paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="2" l10n="U" oldref="18">Layout</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_DPLAY_PAGE" id="bm_id7411420" localize="false"/><comment>UFI: changed help id from 59001 to dply_page</comment>
+<paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="2" l10n="U" oldref="18">Layout</paragraph>
<paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="HID_SC_DPLAY_SELECT">To define the layout of a DataPilot 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 DataPilot table.</paragraph>
<paragraph role="paragraph" id="par_id3147229" xml-lang="en-US" l10n="CHG" oldref="20">$[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 role="paragraph" id="par_id3145749" xml-lang="en-US" l10n="CHG" oldref="21">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/sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_REMOVE" id="bm_id1926938" localize="false"/><paragraph role="heading" id="hd_id3149260" xml-lang="en-US" level="2" l10n="U" oldref="28">Remove</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_REMOVE" id="bm_id1926938" localize="false"/>
+<paragraph role="heading" id="hd_id3149260" xml-lang="en-US" level="2" l10n="U" oldref="28">Remove</paragraph>
<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SC_PUSHBUTTON_RID_SCDLG_PIVOT_LAYOUT_BTN_REMOVE">Removes the selected data field from the table layout.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_OPTIONS" id="bm_id269783" localize="false"/><paragraph role="heading" id="hd_id3145273" xml-lang="en-US" level="2" l10n="U" oldref="26">Options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_OPTIONS" id="bm_id269783" localize="false"/>
+<paragraph role="heading" id="hd_id3145273" xml-lang="en-US" level="2" l10n="U" oldref="26">Options</paragraph>
<paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SC_PUSHBUTTON_RID_SCDLG_PIVOT_LAYOUT_BTN_OPTIONS">Opens the <link href="text/scalc/01/12090105.xhp" name="Data Field"><emph>Data Field</emph></link> dialog where you can change the function that is associated with the selected field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_MoreButton_RID_SCDLG_PIVOT_LAYOUT_BTN_MORE" id="bm_id4284798" localize="false"/><paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="2" l10n="U" oldref="22">More</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc_MoreButton_RID_SCDLG_PIVOT_LAYOUT_BTN_MORE" id="bm_id4284798" localize="false"/>
+<paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="2" l10n="U" oldref="22">More</paragraph>
<paragraph role="paragraph" id="par_id3145647" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_PIVOT_LAYOUT:BTN_MORE">Displays or hides additional options for defining the DataPilot table.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3151073" xml-lang="en-US" level="2" l10n="U" oldref="2">Result</paragraph>
<paragraph role="paragraph" id="par_id3155417" xml-lang="en-US" l10n="U" oldref="3">Specify the settings for displaying the results of the DataPilot table.</paragraph>
<bookmark xml-lang="en-US" branch="hid/sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_OUTAREA" id="bm_id7419660" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc_ListBox_RID_SCDLG_PIVOT_LAYOUT_LB_OUTAREA" id="bm_id2334665" localize="false"/><paragraph role="heading" id="hd_id3155603" xml-lang="en-US" level="3" l10n="U" oldref="4">Results to</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc_ListBox_RID_SCDLG_PIVOT_LAYOUT_LB_OUTAREA" id="bm_id2334665" localize="false"/>
+<paragraph role="heading" id="hd_id3155603" xml-lang="en-US" level="3" l10n="U" oldref="4">Results to</paragraph>
<paragraph role="paragraph" id="par_id3153838" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SC:EDIT:RID_SCDLG_PIVOT_LAYOUT:ED_OUTAREA">Select the area where you want to display the results of the DataPilot table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_PIVOT_LAYOUT:RB_OUTAREA" id="bm_id3155067" localize="false"/><embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
+<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
<paragraph role="warning" id="par_id3155961" xml-lang="en-US" l10n="CHG" oldref="6">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.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_IGNEMPTYROWS" id="bm_id7835016" localize="false"/><paragraph role="heading" id="hd_id3147364" xml-lang="en-US" level="3" l10n="U" oldref="7">Ignore empty rows</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_IGNEMPTYROWS" id="bm_id7835016" localize="false"/>
+<paragraph role="heading" id="hd_id3147364" xml-lang="en-US" level="3" l10n="U" oldref="7">Ignore empty rows</paragraph>
<paragraph role="paragraph" id="par_id3154022" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_IGNEMPTYROWS">Ignores empty fields in the data source.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_DETECTCAT" id="bm_id5103305" localize="false"/><paragraph role="heading" id="hd_id3155114" xml-lang="en-US" level="3" l10n="U" oldref="9">Identify categories</paragraph>
-<paragraph role="paragraph" id="par_id3145257" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_DETECTCAT">Automatically assigns rows without labels to the next highest category as specified by a row label.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALCOL" id="bm_id2163457" localize="false"/><paragraph role="heading" id="hd_id3149207" xml-lang="en-US" level="3" l10n="U" oldref="14">Total columns</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_DETECTCAT" id="bm_id5103305" localize="false"/>
+<paragraph role="heading" id="hd_id3155114" xml-lang="en-US" level="3" l10n="U" oldref="9">Identify categories</paragraph>
+<paragraph role="paragraph" id="par_id3145257" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_DETECTCAT">Automatically assigns rows without labels to the category of the row above.</ahelp><comment>i93137</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALCOL" id="bm_id2163457" localize="false"/>
+<paragraph role="heading" id="hd_id3149207" xml-lang="en-US" level="3" l10n="U" oldref="14">Total columns</paragraph>
<paragraph role="paragraph" id="par_id3166426" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALCOL">Calculates and displays the grand total of the column calculation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALROW" id="bm_id3748588" localize="false"/><paragraph role="heading" id="hd_id3150364" xml-lang="en-US" level="3" l10n="U" oldref="16">Total rows</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_TOTALROW" id="bm_id3748588" localize="false"/>
+<paragraph role="heading" id="hd_id3150364" xml-lang="en-US" level="3" l10n="U" oldref="16">Total rows</paragraph>
<paragraph role="paragraph" id="par_id3152583" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALROW">Calculates and displays the grand total of the row calculation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_FILTER" id="bm_id6004516" localize="false"/><paragraph role="heading" id="par_idN10897" xml-lang="en-US" level="3" l10n="NEW">Add filter</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_FILTER" id="bm_id6004516" localize="false"/>
+<paragraph role="heading" id="par_idN10897" xml-lang="en-US" level="3" l10n="NEW">Add filter</paragraph>
<paragraph role="paragraph" id="par_idN1089B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a Filter button to DataPilot tables that are based on spreadsheet data.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_DP_FILTER" id="bm_id4442201" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DataPilotFilter" id="bm_id6278267" localize="false"/><paragraph role="paragraph" id="par_idN108B2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Filter dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_DRILLDOWN" id="bm_id7366252" localize="false"/><paragraph role="heading" id="par_idN108C9" xml-lang="en-US" level="3" l10n="NEW">Enable drill to details</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DataPilotFilter" id="bm_id6278267" localize="false"/>
+<paragraph role="paragraph" id="par_idN108B2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Filter dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_PIVOT_LAYOUT_BTN_DRILLDOWN" id="bm_id7366252" localize="false"/>
+<paragraph role="heading" id="par_idN108C9" xml-lang="en-US" level="3" l10n="NEW">Enable drill to details</paragraph>
<paragraph role="paragraph" id="par_idN108CD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">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.</ahelp></paragraph>
<paragraph role="heading" id="par_idN108DC" xml-lang="en-US" level="3" l10n="NEW">To examine details inside a DataPilot table</paragraph>
<paragraph role="paragraph" id="par_idN108E0" xml-lang="en-US" l10n="NEW">Do one of the following:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN108E6" xml-lang="en-US" l10n="CHG">Select a range of cells and choose <emph>Data - Group and Outline - Show Details</emph>.</paragraph>
</listitem>
@@ -100,7 +111,8 @@
</listitem>
</list>
<paragraph role="paragraph" id="par_idN108F1" xml-lang="en-US" l10n="NEW">If you double-click a field which has adjacent fields at the same level, the <emph>Show Detail</emph> dialog opens:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc_ListBox_RID_SCDLG_DPSHOWDETAIL_LB_DIMS" id="bm_id9630726" localize="false"/><paragraph role="heading" id="par_idN10900" xml-lang="en-US" level="3" l10n="NEW">Show Detail</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc_ListBox_RID_SCDLG_DPSHOWDETAIL_LB_DIMS" id="bm_id9630726" localize="false"/>
+<paragraph role="heading" id="par_idN10900" xml-lang="en-US" level="3" l10n="NEW">Show Detail</paragraph>
<paragraph role="paragraph" id="par_idN10904" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose the field that you want to view the details for.</ahelp></paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3149817" xml-lang="en-US" l10n="U" oldref="35"><link href="text/scalc/04/01020000.xhp" name="DataPilot shortcut keys">DataPilot shortcut keys</link></paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12120100.xhp b/helpcontent2/source/text/scalc/01/12120100.xhp
index 21621b6e0d..657f9ddd7a 100755
--- a/helpcontent2/source/text/scalc/01/12120100.xhp
+++ b/helpcontent2/source/text/scalc/01/12120100.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 12120100.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -142,7 +142,7 @@ YJ: checked</lastedited>
<paragraph role="paragraph" id="par_id3153967" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SC:TRISTATEBOX:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKS">In conjunction with <emph>Tools - Detective - Mark invalid Data</emph>, this defines that blank cells are shown as invalid data (disabled) or not (enabled).</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:TP_VALIDATION_VALUES:CB_SHOWLIST" id="bm_id5339518" localize="false"/>
<paragraph role="heading" id="par_idN10709" xml-lang="en-US" level="2" l10n="NEW">Show selection list</paragraph>
-<paragraph role="paragraph" id="par_idN1070D" xml-lang="en-US" l10n="NEW"><ahelp hid="sc:CheckBox:TP_VALIDATION_VALUES:CB_SHOWLIST">Shows a list of all valid strings or values to select from. The list can also be opened by selecting the cell and pressing Ctrl+D.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1070D" xml-lang="en-US" l10n="NEW"><ahelp hid="sc:CheckBox:TP_VALIDATION_VALUES:CB_SHOWLIST">Shows a list of all valid strings or values to select from. The list can also be opened by selecting the cell and pressing Ctrl+D (Mac: Command+D).</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:TP_VALIDATION_VALUES:CB_SORTLIST" id="bm_id6317331" localize="false"/>
<paragraph role="heading" id="par_idN10724" xml-lang="en-US" level="3" l10n="NEW">Sort entries ascending</paragraph>
<paragraph role="paragraph" id="par_idN10728" xml-lang="en-US" l10n="NEW"><ahelp hid="sc:CheckBox:TP_VALIDATION_VALUES:CB_SORTLIST">Sorts the selection list in ascending order and filters duplicates from the list. If not checked, the order from the data source is taken.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/scalc/01/func_datevalue.xhp b/helpcontent2/source/text/scalc/01/func_datevalue.xhp
index 4d3379d7c7..3fc44c72a8 100644
--- a/helpcontent2/source/text/scalc/01/func_datevalue.xhp
+++ b/helpcontent2/source/text/scalc/01/func_datevalue.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: func_datevalue.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -55,6 +55,6 @@
<emph>Text</emph> is a valid date expression and must be entered with quotation marks.</paragraph>
<paragraph role="heading" id="hd_id3156309" xml-lang="en-US" level="3" l10n="U" oldref="24">Example</paragraph>
<paragraph role="paragraph" id="par_id3155841" xml-lang="en-US" l10n="CHG" oldref="25">
-<emph>=DATEVALUE("1954-07-20") y</emph>ields 19925.</paragraph>
+<emph>=DATEVALUE("1954-07-20")</emph> yields 19925.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/makefile.mk b/helpcontent2/source/text/scalc/01/makefile.mk
index 351c2ac911..268654dd3f 100644
--- a/helpcontent2/source/text/scalc/01/makefile.mk
+++ b/helpcontent2/source/text/scalc/01/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.13 $
+# $Revision: 1.13.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/scalc/01/text2columns.xhp b/helpcontent2/source/text/scalc/01/text2columns.xhp
index 72059ada3c..1155bdfbf7 100644
--- a/helpcontent2/source/text/scalc/01/text2columns.xhp
+++ b/helpcontent2/source/text/scalc/01/text2columns.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: text2columns.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc01text2columnsxml" indexer="include" status="PUBLISH">
+<topic id="textscalc01text2columnsxml" indexer="include">
<title id="tit" xml-lang="en-US">Text to Columns</title>
<filename>/text/scalc/01/text2columns.xhp</filename>
</topic>
@@ -45,11 +43,12 @@
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id8004394"><bookmark_value>text to columns</bookmark_value>
</bookmark>
+<bookmark xml-lang="en-US" branch="hid/.uno:TextToColumns" id="bm_id1029200802260951" localize="false"/>
<paragraph role="heading" id="hd_id2300180" xml-lang="en-US" level="1" l10n="NEW"><link href="text/scalc/01/text2columns.xhp">Text to Columns</link></paragraph>
<paragraph role="paragraph" id="par_id655232" xml-lang="en-US" l10n="NEW"><variable id="text2columns">Opens the Text to Columns dialog, where you enter settings to expand the contents of selected cells to multiple cells.
</variable></paragraph>
<section id="howtoget">
- <embed href="text/scalc/00/00000412.xhp#text2columns"/>
+<embed href="text/scalc/00/00000412.xhp#text2columns"/>
</section>
<paragraph role="heading" id="hd_id9599597" xml-lang="en-US" level="2" l10n="NEW">To expand cell contents to multiple cells</paragraph>
<paragraph role="paragraph" id="par_id2021546" xml-lang="en-US" l10n="NEW">You can expand cells that contain comma separated values (CSV) into multiple cells in the same row. </paragraph>
diff --git a/helpcontent2/source/text/scalc/02/makefile.mk b/helpcontent2/source/text/scalc/02/makefile.mk
index aa47fe5269..de57389899 100644
--- a/helpcontent2/source/text/scalc/02/makefile.mk
+++ b/helpcontent2/source/text/scalc/02/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/scalc/04/01020000.xhp b/helpcontent2/source/text/scalc/04/01020000.xhp
index 8659cb8cff..37f9a79860 100755
--- a/helpcontent2/source/text/scalc/04/01020000.xhp
+++ b/helpcontent2/source/text/scalc/04/01020000.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01020000.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,14 +54,11 @@
<paragraph role="paragraph" id="par_id3155067" xml-lang="en-US" l10n="U" oldref="3">To fill a selected cell range with the formula that you entered on the <emph>Input line</emph>, press <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter. Hold down <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter+Shift to apply the cell format of the input cell to the entire cell range.</paragraph>
-<paragraph role="paragraph" id="par_id3153967" xml-lang="en-US" l10n="U" oldref="84">To create a matrix in which all the cells contain the same information as what you entered on the <emph>Input line</emph>, press Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter. You cannot edit the components of the matrix.</paragraph>
+<paragraph role="paragraph" id="par_id3153967" xml-lang="en-US" l10n="U" oldref="84">To create a matrix in which all the cells contain the same information as what you entered on the <emph>Input line</emph>, press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter. You cannot edit the components of the matrix.</paragraph>
<paragraph role="paragraph" id="par_id3166426" xml-lang="en-US" l10n="U" oldref="4">To select multiple cells in different areas of a sheet, hold down <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and drag in the different areas.</paragraph>
-<paragraph role="paragraph" id="par_id3150207" xml-lang="en-US" l10n="U" oldref="127">To select multiple sheets in a spreadsheet, hold down <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, and then click the name tabs at the lower edge of the workspace. To select only one sheet in a selection, hold down Shift, and then click the name tab of the sheet.</paragraph>
-<paragraph role="paragraph" id="par_id3166432" xml-lang="en-US" l10n="U" oldref="129">To insert a manual line break in a cell, click in the cell, and then press <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
+</caseinline><defaultinline>Ctrl </defaultinline></switchinline>and drag in the different areas.</paragraph>
+<paragraph role="paragraph" id="par_id3150207" xml-lang="en-US" l10n="U" oldref="127">To select multiple sheets in a spreadsheet, hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, and then click the name tabs at the lower edge of the workspace. To select only one sheet in a selection, hold down Shift, and then click the name tab of the sheet.</paragraph>
+<paragraph role="paragraph" id="par_id3166432" xml-lang="en-US" l10n="U" oldref="129">To insert a manual line break in a cell, click in the cell, and then press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
<paragraph role="paragraph" id="par_id3146978" xml-lang="en-US" l10n="U" oldref="130">To delete the contents of selected cells, press Delete. This opens the <link href="text/scalc/01/02150000.xhp" name="Delete Contents">Delete Contents</link> dialog, where you choose which contents of the cell you want to delete. To delete the contents of selected cells without a dialog, press the Backspace key.</paragraph>
<paragraph role="heading" id="hd_id3145386" xml-lang="en-US" level="2" l10n="U" oldref="85">Navigating in Spreadsheets</paragraph>
<table id="tbl_id5963927">
@@ -77,8 +74,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3146871" xml-lang="en-US" l10n="U" oldref="88"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Home</paragraph>
+<paragraph role="tablecontent" id="hd_id3146871" xml-lang="en-US" l10n="U" oldref="88"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Home</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3159093" xml-lang="en-US" l10n="U" oldref="89">Moves the cursor to the first cell in the sheet (A1).</paragraph>
@@ -86,8 +82,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145073" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + End</paragraph>
+<paragraph role="tablecontent" id="hd_id3145073" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+End</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3153283" xml-lang="en-US" l10n="U" oldref="91">Moves the cursor to the last cell on the sheet that contains data.</paragraph>
@@ -111,8 +106,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3143220" xml-lang="en-US" l10n="U" oldref="101"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Left Arrow</paragraph>
+<paragraph role="tablecontent" id="hd_id3143220" xml-lang="en-US" l10n="U" oldref="101"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Left Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="102">Moves the cursor to the left edge of the current data range. If the column to the left of the cell that contains the cursor is empty, the cursor moves to the next column to the left that contains data.</paragraph>
@@ -120,8 +114,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153554" xml-lang="en-US" l10n="U" oldref="103"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Right Arrow</paragraph>
+<paragraph role="tablecontent" id="hd_id3153554" xml-lang="en-US" l10n="U" oldref="103"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Right Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3155593" xml-lang="en-US" l10n="U" oldref="104">Moves the cursor to the right edge of the current data range. If the column to the right of the cell that contains the cursor is empty, the cursor moves to the next column to the right that contains data.</paragraph>
@@ -129,8 +122,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149317" xml-lang="en-US" l10n="U" oldref="105"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Up Arrow</paragraph>
+<paragraph role="tablecontent" id="hd_id3149317" xml-lang="en-US" l10n="U" oldref="105"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Up Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3153076" xml-lang="en-US" l10n="U" oldref="106">Moves the cursor to the top edge of the current data range. If the row above the cell that contains the cursor is empty, the cursor moves up to the next row that contains data.</paragraph>
@@ -138,8 +130,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147250" xml-lang="en-US" l10n="U" oldref="107"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Down Arrow</paragraph>
+<paragraph role="tablecontent" id="hd_id3147250" xml-lang="en-US" l10n="U" oldref="107"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Down Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3149054" xml-lang="en-US" l10n="U" oldref="108">Moves the cursor to the bottom edge of the current data range. If the row below the cell that contains the cursor is empty, the cursor moves down to the next row that contains data.</paragraph>
@@ -147,8 +138,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3148744" xml-lang="en-US" l10n="U" oldref="184"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + Arrow</paragraph>
+<paragraph role="tablecontent" id="hd_id3148744" xml-lang="en-US" l10n="U" oldref="184"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3159258" xml-lang="en-US" l10n="U" oldref="185">Selects all cells containing data from the current cell to the end of the continuous range of data cells, in the direction of the arrow pressed. If used to select rows and columns together, a rectangular cell range is selected.</paragraph>
@@ -156,8 +146,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3156399" xml-lang="en-US" l10n="U" oldref="109"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ Page Up</paragraph>
+<paragraph role="tablecontent" id="hd_id3156399" xml-lang="en-US" l10n="U" oldref="109"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3145236" xml-lang="en-US" l10n="U" oldref="110">Moves one sheet to the left.</paragraph>
@@ -166,8 +155,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147411" xml-lang="en-US" l10n="U" oldref="111"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Page Down</paragraph>
+<paragraph role="tablecontent" id="hd_id3147411" xml-lang="en-US" l10n="U" oldref="111"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Down</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3150372" xml-lang="en-US" l10n="U" oldref="112">Moves one sheet to the right.</paragraph>
@@ -194,7 +182,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10AFC" xml-lang="en-US" l10n="NEW">Shift + Ctrl + Page Up</paragraph>
+<paragraph role="tablecontent" id="par_idN10AFC" xml-lang="en-US" l10n="NEW">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_idN10B00" xml-lang="en-US" l10n="NEW">Adds the previous sheet to the current selection of sheets. If all the sheets in a spreadsheet are selected, this shortcut key combination only selects the previous sheet. Makes the previous sheet the current sheet.</paragraph>
@@ -202,7 +190,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10B03" xml-lang="en-US" l10n="NEW">Shift + Ctrl + Page Down</paragraph>
+<paragraph role="tablecontent" id="par_idN10B03" xml-lang="en-US" l10n="NEW">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Down</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_idN10B07" xml-lang="en-US" l10n="NEW">Adds the next sheet to the current selection of sheets. If all the sheets in a spreadsheet are selected, this shortcut key combination only selects the next sheet. Makes the next sheet the current sheet.</paragraph>
@@ -210,8 +198,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145826" xml-lang="en-US" l10n="U" oldref="96"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + *</paragraph>
+<paragraph role="tablecontent" id="hd_id3145826" xml-lang="en-US" l10n="U" oldref="96"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + *</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3148882" xml-lang="en-US" l10n="U" oldref="97">where (*) is the multiplication sign on the numeric key pad</paragraph>
@@ -220,8 +207,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151233" xml-lang="en-US" l10n="U" oldref="180"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + /</paragraph>
+<paragraph role="tablecontent" id="hd_id3151233" xml-lang="en-US" l10n="U" oldref="180"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + /</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3149949" xml-lang="en-US" l10n="U" oldref="181">where (/) is the division sign on the numeric key pad</paragraph>
@@ -230,7 +216,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id8163396" xml-lang="en-US" l10n="NEW">Ctrl+Plus key</paragraph>
+<paragraph role="tablecontent" id="par_id8163396" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Plus key</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id9901425" xml-lang="en-US" l10n="NEW">Insert cells (as in menu Insert - Cells)<comment>[sc-features] of 8.June07</comment></paragraph>
@@ -238,7 +224,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3389080" xml-lang="en-US" l10n="NEW">Ctrl+Minus key</paragraph>
+<paragraph role="tablecontent" id="par_id3389080" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Minus key</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id5104220" xml-lang="en-US" l10n="NEW">Delete cells (as in menu Edit - Delete Cells)</paragraph>
@@ -254,7 +240,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id5961180" xml-lang="en-US" l10n="NEW">Ctrl+` (see note below this table)</paragraph>
+<paragraph role="tablecontent" id="par_id5961180" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline> + ` (see note below this table)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id6407055" xml-lang="en-US" l10n="NEW">Displays or hides the formulas instead of the values in all cells.<comment>i56202</comment></paragraph>
@@ -276,8 +262,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154809" xml-lang="en-US" l10n="U" oldref="139"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F1</paragraph>
+<paragraph role="tablecontent" id="hd_id3154809" xml-lang="en-US" l10n="U" oldref="139"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F1</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3145140" xml-lang="en-US" l10n="U" oldref="138">Displays the note that is attached to the current cell</paragraph>
@@ -294,8 +279,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3146850" xml-lang="en-US" l10n="U" oldref="11"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F2</paragraph>
+<paragraph role="tablecontent" id="hd_id3146850" xml-lang="en-US" l10n="U" oldref="11"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F2</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3145162" xml-lang="en-US" l10n="U" oldref="12">Opens the Function Wizard.</paragraph>
@@ -303,8 +287,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147366" xml-lang="en-US" l10n="U" oldref="137">Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F2</paragraph>
+<paragraph role="tablecontent" id="hd_id3147366" xml-lang="en-US" l10n="U" oldref="137">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F2</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3155929" xml-lang="en-US" l10n="U" oldref="136">Moves the cursor to the <emph>Input line</emph> where you can enter a formula for the current cell.</paragraph>
@@ -312,8 +295,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153730" xml-lang="en-US" l10n="U" oldref="15"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
+<paragraph role="tablecontent" id="hd_id3153730" xml-lang="en-US" l10n="U" oldref="15"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3145245" xml-lang="en-US" l10n="U" oldref="16">Opens the <emph>Define Names</emph> dialog.</paragraph>
@@ -353,7 +335,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3148430" xml-lang="en-US" l10n="U" oldref="27">Ctrl+F5</paragraph>
+<paragraph role="tablecontent" id="hd_id3148430" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F5</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3153179" xml-lang="en-US" l10n="U" oldref="28">Traces precedents.</paragraph>
@@ -361,8 +343,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150568" xml-lang="en-US" l10n="U" oldref="135">Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F5</paragraph>
+<paragraph role="tablecontent" id="hd_id3150568" xml-lang="en-US" l10n="U" oldref="135">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F5</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3153551" xml-lang="en-US" l10n="U" oldref="134">Moves the cursor from the <emph>Input line </emph>to the <emph>Sheet area</emph> box.</paragraph>
@@ -378,8 +359,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150688" xml-lang="en-US" l10n="U" oldref="31"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7</paragraph>
+<paragraph role="tablecontent" id="hd_id3150688" xml-lang="en-US" l10n="U" oldref="31"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3149781" xml-lang="en-US" l10n="U" oldref="32">Opens the Thesaurus if the current cell contains text.</paragraph>
@@ -395,8 +375,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154313" xml-lang="en-US" l10n="U" oldref="37"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F8</paragraph>
+<paragraph role="tablecontent" id="hd_id3154313" xml-lang="en-US" l10n="U" oldref="37"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F8</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3150385" xml-lang="en-US" l10n="U" oldref="38">Highlights cells containing values.</paragraph>
@@ -412,7 +391,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9027069" xml-lang="en-US" l10n="NEW">Ctrl+Shift+F9</paragraph>
+<paragraph role="tablecontent" id="par_id9027069" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F9</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id1729178" xml-lang="en-US" l10n="NEW">Recalculates all formulas in all sheets.</paragraph>
@@ -420,8 +399,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3156300" xml-lang="en-US" l10n="U" oldref="41"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9</paragraph>
+<paragraph role="tablecontent" id="hd_id3156300" xml-lang="en-US" l10n="U" oldref="41"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3154817" xml-lang="en-US" l10n="U" oldref="42">Updates the selected chart.</paragraph>
@@ -445,8 +423,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147622" xml-lang="en-US" l10n="U" oldref="50">Shift<switchinline select="sys"><caseinline select="MAC">+Command
-</caseinline><defaultinline>+Ctrl</defaultinline></switchinline>+F11</paragraph>
+<paragraph role="tablecontent" id="hd_id3147622" xml-lang="en-US" l10n="U" oldref="50">Shift<switchinline select="sys"><caseinline select="MAC">+Command</caseinline><defaultinline>+Ctrl</defaultinline></switchinline>+F11</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3153215" xml-lang="en-US" l10n="U" oldref="51">Updates the templates.</paragraph>
@@ -462,8 +439,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3146859" xml-lang="en-US" l10n="U" oldref="54"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F12</paragraph>
+<paragraph role="tablecontent" id="hd_id3146859" xml-lang="en-US" l10n="U" oldref="54"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F12</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3156128" xml-lang="en-US" l10n="U" oldref="55">Ungroups the selected data range.</paragraph>
@@ -507,8 +483,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149293" xml-lang="en-US" l10n="U" oldref="125"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> + Shift + Arrow Key</paragraph>
+<paragraph role="tablecontent" id="hd_id3149293" xml-lang="en-US" l10n="U" oldref="125"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift+Arrow Key</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3159180" xml-lang="en-US" l10n="U" oldref="126">Optimizes the column width or row height based on the current cell.</paragraph>
@@ -530,8 +505,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145669" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+1 (not on the number pad)</paragraph>
+<paragraph role="tablecontent" id="hd_id3145669" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+1 (not on the number pad)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3149197" xml-lang="en-US" l10n="NEW">Open Format Cells dialog</paragraph>
@@ -539,8 +513,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145668" xml-lang="en-US" l10n="U" oldref="61"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+1 (not on the number pad)</paragraph>
+<paragraph role="tablecontent" id="hd_id3145668" xml-lang="en-US" l10n="U" oldref="61"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+1 (not on the number pad)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3149196" xml-lang="en-US" l10n="U" oldref="63">Two decimal places, thousands separator</paragraph>
@@ -548,8 +521,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155331" xml-lang="en-US" l10n="U" oldref="64"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+2 (not on the number pad)</paragraph>
+<paragraph role="tablecontent" id="hd_id3155331" xml-lang="en-US" l10n="U" oldref="64"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+2 (not on the number pad)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3150120" xml-lang="en-US" l10n="U" oldref="66">Standard exponential format</paragraph>
@@ -557,8 +529,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154932" xml-lang="en-US" l10n="U" oldref="67"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+3 (not on the number pad)</paragraph>
+<paragraph role="tablecontent" id="hd_id3154932" xml-lang="en-US" l10n="U" oldref="67"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+3 (not on the number pad)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3148822" xml-lang="en-US" l10n="U" oldref="69">Standard date format</paragraph>
@@ -566,8 +537,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3148829" xml-lang="en-US" l10n="U" oldref="70"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+4 (not on the number pad)</paragraph>
+<paragraph role="tablecontent" id="hd_id3148829" xml-lang="en-US" l10n="U" oldref="70"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+4 (not on the number pad)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3159152" xml-lang="en-US" l10n="U" oldref="72">Standard currency format</paragraph>
@@ -575,8 +545,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150776" xml-lang="en-US" l10n="U" oldref="73"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+5 (not on the number pad)</paragraph>
+<paragraph role="tablecontent" id="hd_id3150776" xml-lang="en-US" l10n="U" oldref="73"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+5 (not on the number pad)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3148800" xml-lang="en-US" l10n="U" oldref="75">Standard percentage format (two decimal places)</paragraph>
@@ -584,8 +553,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3158407" xml-lang="en-US" l10n="U" oldref="76"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+6 (not on the number pad)</paragraph>
+<paragraph role="tablecontent" id="hd_id3158407" xml-lang="en-US" l10n="U" oldref="76"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+6 (not on the number pad)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3148444" xml-lang="en-US" l10n="U" oldref="78">Standard format</paragraph>
@@ -669,8 +637,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155584" xml-lang="en-US" l10n="U" oldref="161"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> and the underlined character in the word "Row"</paragraph>
+<paragraph role="tablecontent" id="hd_id3155584" xml-lang="en-US" l10n="U" oldref="161"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and the underlined character in the word "Row"</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3152949" xml-lang="en-US" l10n="U" oldref="160">Copies or moves the current field into the "Row" area.</paragraph>
@@ -678,8 +645,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3159269" xml-lang="en-US" l10n="U" oldref="159"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> and the underlined character in the word "Column"</paragraph>
+<paragraph role="tablecontent" id="hd_id3159269" xml-lang="en-US" l10n="U" oldref="159"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and the underlined character in the word "Column"</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3149968" xml-lang="en-US" l10n="U" oldref="158">Copies or moves the current field into the "Column" area.</paragraph>
@@ -687,8 +653,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149923" xml-lang="en-US" l10n="U" oldref="157"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> and the underlined character in the word "Data"</paragraph>
+<paragraph role="tablecontent" id="hd_id3149923" xml-lang="en-US" l10n="U" oldref="157"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and the underlined character in the word "Data"</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3148649" xml-lang="en-US" l10n="U" oldref="156">Copies or moves the current field into the "Data" area.</paragraph>
@@ -696,7 +661,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149418" xml-lang="en-US" l10n="U" oldref="155">Ctrl+Up Arrow</paragraph>
+<paragraph role="tablecontent" id="hd_id3149418" xml-lang="en-US" l10n="U" oldref="155"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Up Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3154335" xml-lang="en-US" l10n="U" oldref="154">Moves the current field up one place.</paragraph>
@@ -704,7 +669,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3148462" xml-lang="en-US" l10n="U" oldref="153">Ctrl+Down Arrow</paragraph>
+<paragraph role="tablecontent" id="hd_id3148462" xml-lang="en-US" l10n="U" oldref="153"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Down Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3154603" xml-lang="en-US" l10n="U" oldref="152">Moves the current field down one place.</paragraph>
@@ -712,7 +677,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145373" xml-lang="en-US" l10n="U" oldref="151">Ctrl+Left Arrow</paragraph>
+<paragraph role="tablecontent" id="hd_id3145373" xml-lang="en-US" l10n="U" oldref="151"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Left Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3151125" xml-lang="en-US" l10n="U" oldref="150">Moves the current field one place to the left.</paragraph>
@@ -720,7 +685,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150423" xml-lang="en-US" l10n="U" oldref="149">Ctrl+Right Arrow</paragraph>
+<paragraph role="tablecontent" id="hd_id3150423" xml-lang="en-US" l10n="U" oldref="149"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Right Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3153316" xml-lang="en-US" l10n="U" oldref="148">Moves the current field one place to the right.</paragraph>
@@ -728,7 +693,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149519" xml-lang="en-US" l10n="U" oldref="147">Ctrl+Home</paragraph>
+<paragraph role="tablecontent" id="hd_id3149519" xml-lang="en-US" l10n="U" oldref="147"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Home</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3149237" xml-lang="en-US" l10n="U" oldref="146">Moves the current field to the first place.</paragraph>
@@ -736,7 +701,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145310" xml-lang="en-US" l10n="U" oldref="145">Ctrl+End</paragraph>
+<paragraph role="tablecontent" id="hd_id3145310" xml-lang="en-US" l10n="U" oldref="145"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+End</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3153942" xml-lang="en-US" l10n="U" oldref="144">Moves the current field to the last place.</paragraph>
@@ -744,8 +709,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149933" xml-lang="en-US" l10n="U" oldref="143"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+O</paragraph>
+<paragraph role="tablecontent" id="hd_id3149933" xml-lang="en-US" l10n="U" oldref="143"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+O</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3154798" xml-lang="en-US" l10n="U" oldref="142">Displays the options for the current field.</paragraph>
diff --git a/helpcontent2/source/text/scalc/04/makefile.mk b/helpcontent2/source/text/scalc/04/makefile.mk
index cd47d46d4d..549da6624b 100644
--- a/helpcontent2/source/text/scalc/04/makefile.mk
+++ b/helpcontent2/source/text/scalc/04/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/scalc/05/02140000.xhp b/helpcontent2/source/text/scalc/05/02140000.xhp
index 48d93bca67..3fe2f24654 100755
--- a/helpcontent2/source/text/scalc/05/02140000.xhp
+++ b/helpcontent2/source/text/scalc/05/02140000.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02140000.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -156,7 +156,7 @@
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3159259" xml-lang="en-US" l10n="U" oldref="41">
-<emph>Compiler:</emph> the total number of internal tokens, (that is, operators, variables, brackets) in the formula exceeds 512. <emph>Interpreter:</emph> the total number of matrices that the formula creates exceeds 150. This includes basic functions that receive too large an array as a parameter (max. 0xFFFE, for example, 65534 bytes).</paragraph>
+<emph>Compiler:</emph> the total number of internal tokens, (that is, operators, variables, brackets) in the formula exceeds 512.</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/scalc/05/makefile.mk b/helpcontent2/source/text/scalc/05/makefile.mk
index 2562ed6cdf..891c629076 100644
--- a/helpcontent2/source/text/scalc/05/makefile.mk
+++ b/helpcontent2/source/text/scalc/05/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.9.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/scalc/guide/auto_off.xhp b/helpcontent2/source/text/scalc/guide/auto_off.xhp
index ad26d12abd..946c53516d 100755
--- a/helpcontent2/source/text/scalc/guide/auto_off.xhp
+++ b/helpcontent2/source/text/scalc/guide/auto_off.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: auto_off.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalcguideauto_offxml" indexer="include" status="PUBLISH">
+<topic id="textscalcguideauto_offxml" indexer="include">
<title id="tit" xml-lang="en-US">Deactivating Automatic Changes</title>
<filename>/text/scalc/guide/auto_off.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-07T10:52:24">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149456"><bookmark_value>deactivating; automatic changes</bookmark_value>
@@ -59,15 +55,15 @@
<bookmark_value>date formats;avoiding conversion to</bookmark_value>
<bookmark_value>number completion on/off</bookmark_value>
<bookmark_value>text completion on/off</bookmark_value>
-</bookmark>
+<bookmark_value>word completion on/off</bookmark_value>
+</bookmark><comment>mw added one entry</comment>
<paragraph role="heading" id="hd_id3149456" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="auto_off"><link href="text/scalc/guide/auto_off.xhp" name="Deactivating Automatic Changes">Deactivating Automatic Changes</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3156442" xml-lang="en-US" l10n="U" oldref="2">By default, $[officename] automatically corrects many common typing errors and applies formatting while you type. You can immediately undo any automatic changes with <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z.</paragraph>
+<paragraph role="paragraph" id="par_id3156442" xml-lang="en-US" l10n="U" oldref="2">By default, $[officename] automatically corrects many common typing errors and applies formatting while you type. You can immediately undo any automatic changes with <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z.</paragraph>
<paragraph role="paragraph" id="par_id3145273" xml-lang="en-US" l10n="U" oldref="3">The following shows you how to deactivate and reactivate the automatic changes in $[officename] Calc:</paragraph>
<paragraph role="heading" id="hd_id3145748" xml-lang="en-US" level="2" l10n="U" oldref="4">Automatic text or number completion</paragraph>
<paragraph role="paragraph" id="par_id3154730" xml-lang="en-US" l10n="U" oldref="5">When making an entry in a cell, $[officename] Calc automatically suggests matching input found in the same column. This function is known as <emph>AutoInput</emph>.</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="6">To turn the AutoInput on and off, set or remove the check mark in front of <link href="text/scalc/01/06130000.xhp" name="Tools - Cell Contents - AutoInput"><emph>Tools - Cell Contents - AutoInput</emph></link>.</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/scalc/guide/background.xhp b/helpcontent2/source/text/scalc/guide/background.xhp
index 92247a5dc1..502569fc6e 100644
--- a/helpcontent2/source/text/scalc/guide/background.xhp
+++ b/helpcontent2/source/text/scalc/guide/background.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: background.xhp,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,58 +32,52 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalcguidebackgroundxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Defining Background Colors or Background Graphics</title>
+<topic id="textscalcguidebackgroundxhp" indexer="include">
+<title id="tit" xml-lang="en-US">Defining Background Colors or Background Graphics</title>
<filename>/text/scalc/guide/background.xhp</filename>
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id3149346"><bookmark_value>spreadsheets; backgrounds</bookmark_value>
<bookmark_value>backgrounds;cell ranges</bookmark_value>
<bookmark_value>tables; backgrounds</bookmark_value>
<bookmark_value>cells; backgrounds</bookmark_value>
-</bookmark>
- <comment>MW transferred 3 entries from shared/guide/background.xhp and added a new entry</comment>
- <paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1" l10n="U" oldref="1"><variable id="background"><link href="text/scalc/guide/background.xhp" name="Defining Background Colors or Background Graphics">Defining Background Colors or Background Graphics</link>
-</variable></paragraph>
- <comment>MW created this file from splitting shared/guide/background.xhp</comment>
- <paragraph xml-lang="en-US" id="par_id9520249" role="paragraph" l10n="NEW">You can define a background color or use a graphic as a background for cell ranges in $[officename] Calc.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3144760" role="heading" level="2" l10n="U" oldref="16">Applying a Background Color to a $[officename] Calc Spreadsheet</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3155429" role="listitem" l10n="U" oldref="17">Select the cells.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149260" role="listitem" l10n="U" oldref="18">Choose <emph>Format - Cells</emph> (or <emph>Format Cells</emph> from the context menu).</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3152938" role="listitem" l10n="U" oldref="19">On the <emph>Background</emph> tab page, select the background color.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="hd_id3146974" role="heading" level="2" l10n="U" oldref="20">Graphics in the Background of Cells</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3155414" role="listitem" l10n="CHG" oldref="21">Choose <emph>Insert - Picture - From File</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="22">Select the graphic and click <emph>Open</emph>.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153575" role="listitem" l10n="U" oldref="23">The graphic is inserted anchored to the current cell. You can move and scale the graphic as you want. In your context menu you can use the <emph>Arrange - To Background</emph> command to place this in the background. To select a graphic that has been placed in the background, use the <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link>
+<bookmark_value>rows, see also cells</bookmark_value>
+<bookmark_value>columns, see also cells</bookmark_value>
+</bookmark><comment>** Expression is faulty **</comment>
+<paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="background"><link href="text/scalc/guide/background.xhp" name="Defining Background Colors or Background Graphics">Defining Background Colors or Background Graphics</link>
+</variable></paragraph><comment>MW created this file from splitting shared/guide/background.xhp</comment>
+<paragraph role="paragraph" id="par_id9520249" xml-lang="en-US" l10n="NEW">You can define a background color or use a graphic as a background for cell ranges in $[officename] Calc.</paragraph>
+<paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="2" l10n="U" oldref="16">Applying a Background Color to a $[officename] Calc Spreadsheet</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3155429" xml-lang="en-US" l10n="U" oldref="17">Select the cells.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3149260" xml-lang="en-US" l10n="U" oldref="18">Choose <emph>Format - Cells</emph> (or <emph>Format Cells</emph> from the context menu).</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="19">On the <emph>Background</emph> tab page, select the background color.</paragraph>
+</listitem>
+</list>
+<paragraph role="heading" id="hd_id3146974" xml-lang="en-US" level="2" l10n="U" oldref="20">Graphics in the Background of Cells</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3155414" xml-lang="en-US" l10n="CHG" oldref="21">Choose <emph>Insert - Picture - From File</emph>.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="22">Select the graphic and click <emph>Open</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153575" xml-lang="en-US" l10n="U" oldref="23">The graphic is inserted anchored to the current cell. You can move and scale the graphic as you want. In your context menu you can use the <emph>Arrange - To Background</emph> command to place this in the background. To select a graphic that has been placed in the background, use the <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link>
</caseinline><defaultinline>Navigator</defaultinline></switchinline>.</paragraph>
- </listitem>
- </list>
- <section id="relatedtopics">
-
- <paragraph xml-lang="en-US" id="par_id51576" role="paragraph" l10n="NEW"><link href="text/shared/guide/background.xhp">Watermarks</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156180" role="paragraph" l10n="U" oldref="30"><link href="text/shared/01/05030600.xhp" name="Background tab page"><emph>Background</emph> tab page</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id7601245" role="paragraph" l10n="NEW"><link href="text/scalc/guide/format_table.xhp">Formatting Spreadsheets</link></paragraph>
-
- </section>
- </body>
+</listitem>
+</list>
+<section id="relatedtopics">
+<paragraph role="paragraph" id="par_id51576" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/background.xhp">Watermarks</link></paragraph>
+<paragraph role="paragraph" id="par_id3156180" xml-lang="en-US" l10n="U" oldref="30"><link href="text/shared/01/05030600.xhp" name="Background tab page"><emph>Background</emph> tab page</link></paragraph>
+<paragraph role="paragraph" id="par_id7601245" xml-lang="en-US" l10n="NEW"><link href="text/scalc/guide/format_table.xhp">Formatting Spreadsheets</link></paragraph>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/guide/calc_series.xhp b/helpcontent2/source/text/scalc/guide/calc_series.xhp
index b3e849d940..2cdce15710 100755
--- a/helpcontent2/source/text/scalc/guide/calc_series.xhp
+++ b/helpcontent2/source/text/scalc/guide/calc_series.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: calc_series.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -74,7 +74,7 @@
</listitem>
</list>
<paragraph role="tip" id="par_idN106EE" xml-lang="en-US" l10n="NEW">To quickly create a list of consecutive days, enter "Monday" in a cell, and drag the fill handle.</paragraph>
-<paragraph role="paragraph" id="par_id9720145" xml-lang="en-US" l10n="NEW">Hold down Ctrl if you do not want to fill the cells with different values.</paragraph>
+<paragraph role="paragraph" id="par_id9720145" xml-lang="en-US" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>if you do not want to fill the cells with different values.</paragraph>
<paragraph role="note" id="par_id3154490" xml-lang="en-US" l10n="CHG" oldref="18">If you select two or more adjacent cells that contain different numbers, and drag, the remaining cells are filled with the arithmetic pattern that is recognized in the numbers. The AutoFill function also recognizes customized lists that are defined under <item type="menuitem">Tools - Options - %PRODUCTNAME Calc - Sort Lists</item>.</paragraph>
<paragraph role="tip" id="par_idN10737" xml-lang="en-US" l10n="NEW">You can double-click the fill handle to automatically fill all empty columns of the current data block. For example, first enter Jan into A1 and drag the fill handle down to A12 to get the twelve months in the first column. Now enter some values into B1 and C1. Select those two cells, and double-click the fill handle. This fills automatically the data block B1:C12.</paragraph>
<paragraph role="heading" id="par_idN10713" xml-lang="en-US" level="2" l10n="NEW">Using a Defined Series</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/csv_files.xhp b/helpcontent2/source/text/scalc/guide/csv_files.xhp
index 9cd16689ae..b9108f68f8 100755
--- a/helpcontent2/source/text/scalc/guide/csv_files.xhp
+++ b/helpcontent2/source/text/scalc/guide/csv_files.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: csv_files.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,33 +32,31 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalcguidecsv_filesxml" indexer="include" status="PUBLISH">
+<topic id="textscalcguidecsv_filesxml" indexer="include">
<title id="tit" xml-lang="en-US"> Importing and Exporting CSV Files </title>
<filename>/text/scalc/guide/csv_files.xhp</filename>
</topic>
-<history>
-<created date="2004-04-27T15:58:35">UFI: new guide</created>
-<lastedited date="2006-10-24T12:55:39">UFI: do we need screenshots in this file? FPE: Repaired stored file name and link; dedr: reviewed</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id892361"><bookmark_value>number series import</bookmark_value>
<bookmark_value>data series import</bookmark_value>
-<bookmark_value>importing; text databases</bookmark_value>
+<bookmark_value>exporting; tables as text</bookmark_value>
+<bookmark_value>importing; tables as text</bookmark_value>
<bookmark_value>delimited values and files</bookmark_value>
<bookmark_value>comma separated files and values</bookmark_value>
<bookmark_value>text file import and export</bookmark_value>
<bookmark_value>csv files;importing and exporting</bookmark_value>
-</bookmark>
+<bookmark_value>tables; importing/exporting as text</bookmark_value>
+<bookmark_value>text documents; importing to spreadsheets</bookmark_value>
+</bookmark><comment>MW deleted "importing;text data bases" and copied 4 index entries from scalc/guide/csv_formula.xhp</comment>
<paragraph role="heading" id="par_idN10862" xml-lang="en-US" level="1" l10n="NEW"><variable id="csv_files"><link href="text/scalc/guide/csv_files.xhp">Opening and Saving Text CSV Files</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10880" xml-lang="en-US" l10n="NEW">Comma Separated Values (CSV) is text file format that you can use to exchange data from a database or a spreadsheet between applications. Each line in a Text CSV file represents a record in the database, or a row in a spreadsheet. Each field in a database record or cell in a spreadsheet row is usually separated by a comma. However, you can use other characters to delimit a field, such as a tabulator character.</paragraph>
<paragraph role="paragraph" id="par_idN10886" xml-lang="en-US" l10n="NEW">If the content of a field or cell contains a comma, the contents of the field or cell <emph>must</emph> be enclosed by single quotes (') or double quotes (").</paragraph>
-<paragraph role="note" id="par_idN106FC" xml-lang="en-US" l10n="NEW">When you export a spreadsheet to CSV format, only the data on the current sheet is saved. All other information, including formulas and formatting, is lost.</paragraph>
-<paragraph role="heading" id="par_idN10890" xml-lang="en-US" level="2" l10n="CHG">To Open a Text CSV file in Calc</paragraph>
+<paragraph role="heading" id="par_idN10890" xml-lang="en-US" level="2" l10n="CHG">To Open a Text CSV File in Calc</paragraph>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN10897" xml-lang="en-US" l10n="NEW">Choose <emph>File - Open</emph>.</paragraph>
@@ -83,6 +81,7 @@
</listitem>
</list>
<paragraph role="heading" id="par_idN108FA" xml-lang="en-US" level="2" l10n="NEW">To Save a Sheet as a Text CSV File</paragraph>
+<paragraph role="note" id="par_idN106FC" xml-lang="en-US" l10n="NEW">When you export a spreadsheet to CSV format, only the data on the current sheet is saved. All other information, including formulas and formatting, is lost.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN10901" xml-lang="en-US" l10n="NEW">Open the Calc sheet that you want to save as a Text CSV file.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/csv_formula.xhp b/helpcontent2/source/text/scalc/guide/csv_formula.xhp
index 4e00477141..126fe5d3a8 100755
--- a/helpcontent2/source/text/scalc/guide/csv_formula.xhp
+++ b/helpcontent2/source/text/scalc/guide/csv_formula.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: csv_formula.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,28 +32,21 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalcguidecsv_formulaxml" indexer="include" status="PUBLISH">
+<topic id="textscalcguidecsv_formulaxml" indexer="include">
<title id="tit" xml-lang="en-US">Importing and Exporting Text Files</title>
<filename>/text/scalc/guide/csv_formula.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-22T13:47:28">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153726"><bookmark_value>csv files;spreadsheets</bookmark_value>
-<bookmark_value>formulas; saving as csv files</bookmark_value>
-<bookmark_value>exporting; tables as text</bookmark_value>
-<bookmark_value>importing; tables as text</bookmark_value>
-<bookmark_value>inserting; text files with data</bookmark_value>
-<bookmark_value>tables; importing/exporting as text</bookmark_value>
-<bookmark_value>text documents; importing to spreadsheets</bookmark_value>
-</bookmark><comment>mw changed "text;" to "text documents;"</comment>
-<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="csv_formula"><link href="text/scalc/guide/csv_formula.xhp" name="Importing and Exporting Text Files">Importing and Exporting Text Files</link>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3153726"><bookmark_value>csv files;formulas</bookmark_value>
+<bookmark_value>formulas; importing/exporting as csv files</bookmark_value>
+<bookmark_value>exporting;formulas as csv files</bookmark_value>
+<bookmark_value>importing;csv files with formulas</bookmark_value>
+</bookmark><comment>mw deleted "inserting;", copied 4 index entries to scalc/guide/csv_files.xhp, changed "csv files;" and "formulas;" and added 2 index entries</comment>
+<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="csv_formula"><link href="text/scalc/guide/csv_formula.xhp" name="Importing and Exporting Text Files">Importing and Exporting CSV Text Files with Formulas</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3149402" xml-lang="en-US" l10n="U" oldref="2">Comma separated values (CSV) files are text files that contain the cell contents of a single sheet. Commas, semicolons, or other characters can be used as the field delimiters between the cells. Text strings are put in quotation marks, numbers are written without quotation marks.</paragraph>
<paragraph role="heading" id="hd_id3150715" xml-lang="en-US" level="2" l10n="U" oldref="15">Importing a CSV File</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp
index edd081ace7..a2c3aad4e2 100755
--- a/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_createtable.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: datapilot_createtable.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -67,7 +67,7 @@ YJ: checked</lastedited>
<paragraph role="listitem" id="par_id3146974" xml-lang="en-US" l10n="CHG" oldref="16">By double-clicking on one of the fields in the <emph>Data Fields</emph> area you can call up the <link href="text/scalc/01/12090105.xhp" name="Data Field"><emph>Data Field</emph></link> dialog.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="17">Use the <emph>Data Field</emph> dialog to select the calculations to be used for the data. To make a multiple selection, press the Ctrl key while clicking the desired calculation.</paragraph>
+<paragraph role="paragraph" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="17">Use the <emph>Data Field</emph> dialog to select the calculations to be used for the data. To make a multiple selection, press the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key while clicking the desired calculation.</paragraph>
<list type="unordered">
<listitem>
<paragraph role="listitem" id="par_id3150329" xml-lang="en-US" l10n="CHG" oldref="13">The order of the buttons can be changed at any time by moving them to a different position in the area with the mouse.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/edit_multitables.xhp b/helpcontent2/source/text/scalc/guide/edit_multitables.xhp
index 24807ed91c..71b635961c 100755
--- a/helpcontent2/source/text/scalc/guide/edit_multitables.xhp
+++ b/helpcontent2/source/text/scalc/guide/edit_multitables.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: edit_multitables.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -56,8 +56,8 @@
<paragraph xml-lang="en-US" id="par_id3150868" role="paragraph" l10n="U" oldref="6">In $[officename] Calc, you can insert values, text or formulas that are simultaneously copied to other selected sheets of your document.</paragraph>
<list type="unordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153768" role="listitem" l10n="U" oldref="8">Select all desired sheets by holding down the Ctrl key and clicking the corresponding register tabs that are still gray at the bottom margin of the workspace. All selected register tabs are now white.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10614" role="paragraph" l10n="NEW">You can use Shift+Ctrl+Page Up or Page Down to select multiple sheets using the keyboard.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153768" role="listitem" l10n="U" oldref="8">Select all desired sheets by holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key and clicking the corresponding register tabs that are still gray at the bottom margin of the workspace. All selected register tabs are now white.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10614" role="paragraph" l10n="NEW">You can use Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up or Page Down to select multiple sheets using the keyboard.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3147435" role="listitem" l10n="U" oldref="7">Now when you insert values, text or formulas into the active sheet, they will also appear in the identical positions in the other selected sheets. For example, data entered in cell A1 of the active sheet is automatically entered into cell A1 of any other seleted sheet.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/finding.xhp b/helpcontent2/source/text/scalc/guide/finding.xhp
index 1039f92414..ca65b40dc2 100644
--- a/helpcontent2/source/text/scalc/guide/finding.xhp
+++ b/helpcontent2/source/text/scalc/guide/finding.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: finding.xhp,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -88,7 +88,7 @@
<paragraph role="paragraph" id="par_id3808404" xml-lang="en-US" l10n="NEW">When you click <emph>Find</emph>, Calc will select the next cell that contains your text. You can watch and edit the text, then click <emph>Find</emph> again to advance to the next found cell. </paragraph>
<list type="unordered">
<listitem>
-<paragraph role="paragraph" id="par_id2394482" xml-lang="en-US" l10n="NEW">If you closed the dialog, you can press a key combination (Ctrl+Shift+F) to find the next cell without opening the dialog. </paragraph>
+<paragraph role="paragraph" id="par_id2394482" xml-lang="en-US" l10n="NEW">If you closed the dialog, you can press a key combination (<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F) to find the next cell without opening the dialog. </paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id631733" xml-lang="en-US" l10n="NEW">By default, Calc searches the current sheet. Click <emph>More Options</emph>, then enable <emph>Search in all sheets</emph> to search through all sheets of the document.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/format_table.xhp b/helpcontent2/source/text/scalc/guide/format_table.xhp
index 6b1ed675ab..e18ccd3af2 100755
--- a/helpcontent2/source/text/scalc/guide/format_table.xhp
+++ b/helpcontent2/source/text/scalc/guide/format_table.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: format_table.xhp,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -75,7 +75,7 @@
<paragraph role="heading" id="hd_id3153483" xml-lang="en-US" level="2" l10n="U" oldref="19">Formatting Borders and Backgrounds for Cells and Pages</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3154733" xml-lang="en-US" l10n="U" oldref="20">You can assign a format to any group of cells by first selecting the cells (for multiple selection, hold down the Ctrl key when clicking), and then activating the <emph>Format Cells</emph> dialog in <item type="menuitem">Format - Cell</item>. In this dialog, you can select attributes such as shadows and backgrounds.</paragraph>
+<paragraph role="listitem" id="par_id3154733" xml-lang="en-US" l10n="U" oldref="20">You can assign a format to any group of cells by first selecting the cells (for multiple selection, hold down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key when clicking), and then activating the <emph>Format Cells</emph> dialog in <item type="menuitem">Format - Cell</item>. In this dialog, you can select attributes such as shadows and backgrounds.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145116" xml-lang="en-US" l10n="U" oldref="21">To apply formatting attributes to an entire sheet, choose <emph>Format - Page</emph>. You can define headers and footers, for example, to appear on each printed page.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/formula_copy.xhp b/helpcontent2/source/text/scalc/guide/formula_copy.xhp
index d4b7ec2957..5198cc0f1c 100755
--- a/helpcontent2/source/text/scalc/guide/formula_copy.xhp
+++ b/helpcontent2/source/text/scalc/guide/formula_copy.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: formula_copy.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -58,15 +58,13 @@
<paragraph role="listitem" id="par_id3150439" xml-lang="en-US" l10n="U" oldref="30">Select the cell containing the formula.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3154319" xml-lang="en-US" l10n="U" oldref="31">Choose <emph>Edit - Copy</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ C to copy it.</paragraph>
+<paragraph role="listitem" id="par_id3154319" xml-lang="en-US" l10n="U" oldref="31">Choose <emph>Edit - Copy</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C to copy it.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3159155" xml-lang="en-US" l10n="U" oldref="32">Select the cell into which you want the formula to be copied.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153728" xml-lang="en-US" l10n="U" oldref="33">Choose <emph>Edit - Paste</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V. The formula will be positioned in the new cell.</paragraph>
+<paragraph role="listitem" id="par_id3153728" xml-lang="en-US" l10n="U" oldref="33">Choose <emph>Edit - Paste</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V. The formula will be positioned in the new cell.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3149961" xml-lang="en-US" l10n="U" oldref="34">If you want to copy a formula into multiple cells, there is a quick and easy way to copy into adjacent cell areas:</paragraph>
@@ -84,8 +82,7 @@
<paragraph role="listitem" id="par_id3153714" xml-lang="en-US" l10n="U" oldref="15">When you release the mouse button, the formula will be copied into the cells and automatically adjusted.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3156385" xml-lang="en-US" l10n="U" oldref="53">If you do not want values and texts to be automatically adjusted, then hold down the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key when dragging. Formulas, however, are always adjusted accordingly.</paragraph>
+<paragraph role="paragraph" id="par_id3156385" xml-lang="en-US" l10n="U" oldref="53">If you do not want values and texts to be automatically adjusted, then hold down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key when dragging. Formulas, however, are always adjusted accordingly.</paragraph>
</section>
<section id="relatedtopics">
<embed href="text/scalc/guide/relativ_absolut_ref.xhp#relativ_absolut_ref"/>
diff --git a/helpcontent2/source/text/scalc/guide/keyboard.xhp b/helpcontent2/source/text/scalc/guide/keyboard.xhp
index a7bbe6ab5f..b8c81b0617 100644
--- a/helpcontent2/source/text/scalc/guide/keyboard.xhp
+++ b/helpcontent2/source/text/scalc/guide/keyboard.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: keyboard.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -83,7 +83,7 @@
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149403" xml-lang="en-US" l10n="U" oldref="19">
-<item type="keycode">Ctrl+1</item> to <item type="keycode">Ctrl+8</item> - show all levels up to the specified number; hide all higher levels.</paragraph>
+<switchinline select="sys"><caseinline select="MAC">Command+1 to Command+8</caseinline><defaultinline>Ctrl+1 to Ctrl+8</defaultinline></switchinline> - show all levels up to the specified number; hide all higher levels.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150329" xml-lang="en-US" l10n="U" oldref="20">Use <item type="keycode">+</item> or <item type="keycode">-</item> to show or hide the focused outline group.</paragraph>
@@ -104,10 +104,10 @@
<paragraph role="listitem" id="par_id3155333" xml-lang="en-US" l10n="CHG" oldref="7">Press <item type="keycode">F6</item> until the <emph>Drawing</emph> toolbar is selected.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150345" xml-lang="en-US" l10n="U" oldref="4">If the selection tool is active, press <item type="keycode">Ctrl+Enter</item>. This selects the first drawing object or graphic in the sheet.</paragraph>
+<paragraph role="listitem" id="par_id3150345" xml-lang="en-US" l10n="U" oldref="4">If the selection tool is active, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter. This selects the first drawing object or graphic in the sheet.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3159240" xml-lang="en-US" l10n="U" oldref="3">With <item type="keycode">Ctrl+F6</item> you set the focus to the document.</paragraph>
+<paragraph role="listitem" id="par_id3159240" xml-lang="en-US" l10n="U" oldref="3">With <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 you set the focus to the document.</paragraph>
<paragraph role="listitem" id="par_id3155379" xml-lang="en-US" l10n="U" oldref="2">Now you can use <item type="keycode">Tab</item> to select the next drawing object or graphic and <item type="keycode">Shift+Tab</item> to select the previous one.</paragraph>
</listitem>
</list>
diff --git a/helpcontent2/source/text/scalc/guide/makefile.mk b/helpcontent2/source/text/scalc/guide/makefile.mk
index 9817814421..b3aa776e36 100644
--- a/helpcontent2/source/text/scalc/guide/makefile.mk
+++ b/helpcontent2/source/text/scalc/guide/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.18 $
+# $Revision: 1.18.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/scalc/guide/mark_cells.xhp b/helpcontent2/source/text/scalc/guide/mark_cells.xhp
index c426c60f2b..3f34af06f0 100755
--- a/helpcontent2/source/text/scalc/guide/mark_cells.xhp
+++ b/helpcontent2/source/text/scalc/guide/mark_cells.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: mark_cells.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -67,8 +67,7 @@
</listitem>
</list>
<paragraph role="heading" id="hd_id3154942" xml-lang="en-US" level="2" l10n="U" oldref="6">Select various dispersed cells</paragraph>
-<paragraph role="paragraph" id="par_id3156284" xml-lang="en-US" l10n="U" oldref="7">Mark at least one cell. Then while pressing <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, click each of the additional cells.</paragraph>
+<paragraph role="paragraph" id="par_id3156284" xml-lang="en-US" l10n="U" oldref="7">Mark at least one cell. Then while pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, click each of the additional cells.</paragraph>
<paragraph role="heading" id="hd_id3146971" xml-lang="en-US" level="2" l10n="U" oldref="8">Switch marking mode</paragraph>
<paragraph role="paragraph" id="par_id3155064" xml-lang="en-US" l10n="U" oldref="9">On the status bar, click the box with the legend STD / EXT / ADD to switch the marking mode:</paragraph>
<table id="tbl_id3145643">
@@ -101,7 +100,7 @@
<paragraph role="paragraph" id="par_id3145587" xml-lang="en-US" l10n="U" oldref="16">ADD</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="17">A mouse click in a cell adds it to the already marked cells. A mouse click in a marked cell unmarks it. Alternatively, Ctrl-click the cells.</paragraph>
+<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="17">A mouse click in a cell adds it to the already marked cells. A mouse click in a marked cell unmarks it. Alternatively, <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click the cells.</paragraph>
</tablecell>
</tablerow>
</table>
diff --git a/helpcontent2/source/text/scalc/guide/matrixformula.xhp b/helpcontent2/source/text/scalc/guide/matrixformula.xhp
index 00fd60959a..8bfeed24c7 100755
--- a/helpcontent2/source/text/scalc/guide/matrixformula.xhp
+++ b/helpcontent2/source/text/scalc/guide/matrixformula.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: matrixformula.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -71,8 +71,7 @@
<paragraph role="listitem" id="par_id3154018" xml-lang="en-US" l10n="U" oldref="21">Select the numbers in the second column in cells B1:B10.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150716" xml-lang="en-US" l10n="U" oldref="22">End the input with the matrix key combination: Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
+<paragraph role="listitem" id="par_id3150716" xml-lang="en-US" l10n="U" oldref="22">End the input with the matrix key combination: Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3145640" xml-lang="en-US" l10n="U" oldref="23">The matrix area is automatically protected against modifications, such as deleting rows or columns. It is, however, possible to edit any formatting, such as the cell background.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/move_dragdrop.xhp b/helpcontent2/source/text/scalc/guide/move_dragdrop.xhp
index 91f6fab522..355fa15071 100644
--- a/helpcontent2/source/text/scalc/guide/move_dragdrop.xhp
+++ b/helpcontent2/source/text/scalc/guide/move_dragdrop.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: move_dragdrop.xhp,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalcguidemove_dragdropxml" indexer="include" status="PUBLISH">
+<topic id="textscalcguidemove_dragdropxml" indexer="include">
<title id="tit" xml-lang="en-US">Moving Cells by Drag-and-Drop </title>
<filename>/text/scalc/guide/move_dragdrop.xhp</filename>
</topic>
@@ -45,14 +43,15 @@
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155686"><bookmark_value>drag and drop; moving cells</bookmark_value>
<bookmark_value>cells; moving by drag and drop </bookmark_value>
+<bookmark_value>columns;moving by drag and drop</bookmark_value>
<bookmark_value>moving;cells by drag and drop</bookmark_value>
<bookmark_value>inserting;cells, by drag and drop</bookmark_value>
-</bookmark>
+</bookmark><comment>mw added "columns;"</comment>
<paragraph role="heading" id="hd_id986358" xml-lang="en-US" level="1" l10n="NEW"><variable id="move_dragdrop"><link href="text/scalc/guide/move_dragdrop.xhp">Moving Cells by Drag-and-Drop</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id2760093" xml-lang="en-US" l10n="NEW">When you drag-and-drop a selection of cells on a Calc sheet, the cells normally overwrite the existing cells in the area where you drop. This is the normal <emph>overwrite mode</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id9527268" xml-lang="en-US" l10n="NEW">When you hold down the <item type="keycode">Alt</item> key while releasing the mouse button, you enter the <emph>insert mode</emph>.</paragraph>
-<list type="unordered">
+<paragraph role="paragraph" id="par_id9527268" xml-lang="en-US" l10n="NEW">When you hold down the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key while releasing the mouse button, you enter the <emph>insert mode</emph>.</paragraph>
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id79653" xml-lang="en-US" l10n="NEW">In insert mode, the existing cells where you drop will be shifted to the right or to the bottom, and the dropped cells are inserted into the now empty positions without overwriting. </paragraph>
</listitem>
@@ -65,66 +64,67 @@
<paragraph role="paragraph" id="par_id8040406" xml-lang="en-US" l10n="NEW">If you move cells in insert mode within the same row (only horizontally), then after insertion of the cells, all cells will be shifted to the left to fill the source area.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id2586748" xml-lang="en-US" l10n="NEW">In both modes, you can hold down the Ctrl key, or Ctrl+Shift keys while you release the mouse button to insert a copy or a link, respectively. </paragraph>
+<paragraph role="paragraph" id="par_id2586748" xml-lang="en-US" l10n="NEW">In both modes, you can hold down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key, or <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift keys while you release the mouse button to insert a copy or a link, respectively.</paragraph>
<table id="tbl_id1674855">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id5814081" xml-lang="en-US" l10n="NEW">Keys pressed while releasing the mouse button</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id6581316" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id9906613" xml-lang="en-US" l10n="NEW">No key</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id2815637" xml-lang="en-US" l10n="NEW">Cells are moved and overwrite the cells in the target area. Source cells are emptied.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id6161687" xml-lang="en-US" l10n="NEW">Ctrl key</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id6161687" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id4278389" xml-lang="en-US" l10n="NEW">Cells are copied and overwrite the cells in the target area. Source cells stay as they are.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2805566" xml-lang="en-US" l10n="NEW">Ctrl+Shift keys</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id2805566" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id5369121" xml-lang="en-US" l10n="NEW">Links to the source cells are inserted and overwrite the cells in the target area. Source cells stay as they are.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9518723" xml-lang="en-US" l10n="NEW">Alt key</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id9518723" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id2926419" xml-lang="en-US" l10n="NEW">Cells are moved and shift the cells in the target area to the right or to the bottom. Source cells are emptied, except if you move within the same rows on the same sheet. </paragraph>
<paragraph role="tablecontent" id="par_id4021423" xml-lang="en-US" l10n="NEW">If you move within the same rows on the same sheet, the cells in the target area shift to the right, and then the whole row shifts to fill the source area.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2783898" xml-lang="en-US" l10n="NEW">Alt+Ctrl keys</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id2783898" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Option+Command </caseinline><defaultinline>Alt+Ctrl </defaultinline></switchinline>keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id2785119" xml-lang="en-US" l10n="NEW">Cells are copied and shift the cells in the target area to the right or to the bottom. Source cells stay as they are.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id584124" xml-lang="en-US" l10n="NEW">Alt+Ctrl+Shift keys</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id584124" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Option+Command</caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>+Shift keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id5590990" xml-lang="en-US" l10n="NEW">Links to the source cells are inserted and shift the cells in the target area to the right or to the bottom. Source cells stay as they are.</paragraph>
</tablecell>
</tablerow>
</table>
+
<section id="relatedtopics">
<embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/>
<embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
diff --git a/helpcontent2/source/text/scalc/guide/multitables.xhp b/helpcontent2/source/text/scalc/guide/multitables.xhp
index 94bd137e17..7dc1f87a3d 100644
--- a/helpcontent2/source/text/scalc/guide/multitables.xhp
+++ b/helpcontent2/source/text/scalc/guide/multitables.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: multitables.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -64,10 +64,10 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="hd_id3154491" role="heading" level="2" l10n="U" oldref="11">Selecting Multiple Sheets</paragraph>
- <paragraph xml-lang="en-US" id="par_id3145251" role="paragraph" l10n="CHG" oldref="6">The sheet tab of the current sheet is always visible in white in front of the other sheet tabs. The other sheet tabs are gray when they are not selected. By clicking other sheet tabs while pressing <item type="keycode">Ctrl</item> you can select multiple sheets.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106B7" role="paragraph" l10n="CHG">You can use <item type="keycode">Shift</item>+<item type="keycode">Ctrl</item>+<item type="keycode">Page Up</item> or <item type="keycode">Page Down</item> to select multiple sheets using the keyboard.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145251" role="paragraph" l10n="CHG" oldref="6">The sheet tab of the current sheet is always visible in white in front of the other sheet tabs. The other sheet tabs are gray when they are not selected. By clicking other sheet tabs while pressing <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>you can select multiple sheets.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106B7" role="paragraph" l10n="CHG">You can use <item type="keycode">Shift</item>+<item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline></item>+<item type="keycode">Page Up</item> or <item type="keycode">Page Down</item> to select multiple sheets using the keyboard.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3155600" role="heading" level="2" l10n="U" oldref="12">Undoing a Selection</paragraph>
- <paragraph xml-lang="en-US" id="par_id3146969" role="paragraph" l10n="CHG" oldref="13">To undo the selection of a sheet, click its sheet tab again while pressing the <item type="keycode">Ctrl</item> key. The sheet that is currently visible cannot be removed from the selection.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146969" role="paragraph" l10n="CHG" oldref="13">To undo the selection of a sheet, click its sheet tab again while pressing the <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline></item>key. The sheet that is currently visible cannot be removed from the selection.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3156382" role="heading" level="2" l10n="CHG" oldref="15">Calculating Across Multiple Sheets</paragraph>
<paragraph xml-lang="en-US" id="par_id3155333" role="paragraph" l10n="CHG" oldref="16">You can refer to a range of sheets in a formula by specifying the first and last sheet of the range, for example, <item type="literal">=SUM(Sheet1.A1:Sheet3.A1) </item>sums up all A1 cells on Sheet1 through Sheet3.</paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/scalc/guide/print_landscape.xhp b/helpcontent2/source/text/scalc/guide/print_landscape.xhp
index 44a9eb88be..a629382075 100755
--- a/helpcontent2/source/text/scalc/guide/print_landscape.xhp
+++ b/helpcontent2/source/text/scalc/guide/print_landscape.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: print_landscape.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -71,8 +71,7 @@
<paragraph role="listitem" id="par_id3153305" xml-lang="en-US" l10n="CHG" oldref="10">
<emph>All sheets</emph> - All sheets will be printed.</paragraph>
<paragraph role="listitem" id="par_id3148871" xml-lang="en-US" l10n="CHG" oldref="12">
-<emph>Selected sheets</emph> - Only the selected sheets will be printed. All sheets whose names (at the bottom on the sheet tabs) are selected will be printed. By pressing <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while clicking a sheet name you can change this selection.</paragraph>
+<emph>Selected sheets</emph> - Only the selected sheets will be printed. All sheets whose names (at the bottom on the sheet tabs) are selected will be printed. By pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while clicking a sheet name you can change this selection.</paragraph>
<paragraph role="listitem" id="par_id3764763" xml-lang="en-US" l10n="NEW">
<emph>Selected cells</emph> - All selected cells are printed.</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/scalc/guide/rename_table.xhp b/helpcontent2/source/text/scalc/guide/rename_table.xhp
index 2f660c3cf1..c1182391de 100644
--- a/helpcontent2/source/text/scalc/guide/rename_table.xhp
+++ b/helpcontent2/source/text/scalc/guide/rename_table.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: rename_table.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalcguiderename_tablexml" indexer="include" status="PUBLISH">
+<topic id="textscalcguiderename_tablexml" indexer="include">
<title id="tit" xml-lang="en-US">Renaming Sheets</title>
<filename>/text/scalc/guide/rename_table.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-05-23T10:30:33">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150398"><bookmark_value>renaming sheets</bookmark_value>
@@ -63,12 +59,42 @@
<paragraph role="listitem" id="par_id3149260" xml-lang="en-US" l10n="U" oldref="15">Enter a new name for the sheet and click <emph>OK</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149667" xml-lang="en-US" l10n="U" oldref="27">Alternatively, hold down the <switchinline select="sys"><caseinline select="MAC">Option key
-</caseinline><defaultinline>Alt key</defaultinline></switchinline> and click on any sheet name and enter the new name directly.</paragraph>
+<paragraph role="listitem" id="par_id3149667" xml-lang="en-US" l10n="U" oldref="27">Alternatively, hold down the <switchinline select="sys"><caseinline select="MAC">Option key</caseinline><defaultinline>Alt key</defaultinline></switchinline> and click on any sheet name and enter the new name directly.</paragraph>
<embed href="text/shared/00/00000099.xhp#winmanager"/>
</listitem>
</list>
-<paragraph role="note" id="par_id3154754" xml-lang="en-US" l10n="C">Allowed characters are letters, numbers, spaces, and the underline character.</paragraph>
+<paragraph role="paragraph" id="par_id0909200810502833" xml-lang="en-US" l10n="NEW">Sheet names can contain almost any character. Some naming restrictions apply when you want to save the spreadsheet to Microsoft Excel format.</paragraph>
+<paragraph role="paragraph" id="par_id090920081050283" xml-lang="en-US" l10n="NEW">When saving to Microsoft Excel format, the following characters are not allowed in sheet names:</paragraph>
+<list type="unordered">
+<listitem>
+<paragraph role="paragraph" id="par_id090920081050281" xml-lang="en-US" l10n="NEW">colon :</paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0909200810502897" xml-lang="en-US" l10n="NEW">back slash \</paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id090920081050299" xml-lang="en-US" l10n="NEW">forward slash /</paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0909200810502913" xml-lang="en-US" l10n="NEW">question mark ?</paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id090920081050298" xml-lang="en-US" l10n="NEW">asterisk *</paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0909200810502969" xml-lang="en-US" l10n="NEW">left square bracket [</paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0909200810502910" xml-lang="en-US" l10n="NEW">right square bracket ]</paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0909200810502971" xml-lang="en-US" l10n="NEW">single quote ' as the first or last character of the name</paragraph>
+</listitem>
+</list>
+<paragraph role="paragraph" id="par_id090920081050307" xml-lang="en-US" l10n="NEW">In cell references, a sheet name has to be enclosed in single quotes ' if the name contains other characters than alphanumeric or underscore. A single quote contained within a name has to be escaped by doubling it (two single quotes). For example, you want to reference the cell A1 on a sheet with the following name:</paragraph>
+<paragraph role="paragraph" id="par_id0909200810503071" xml-lang="en-US" l10n="NEW">This year's sheet</paragraph>
+<paragraph role="paragraph" id="par_id0909200810503054" xml-lang="en-US" l10n="NEW">The reference must be enclosed in single quotes, and the one single quote inside the name must be doubled:</paragraph>
+<paragraph role="paragraph" id="par_id0909200810503069" xml-lang="en-US" l10n="NEW">'This year''s sheet'.A1</paragraph>
<paragraph role="paragraph" id="par_id3155444" xml-lang="en-US" l10n="U" oldref="16">The name of a sheet is independent of the name of the spreadsheet. You enter the spreadsheet name when you save it for the first time as a file. The document can contain up to 256 individual sheets, which can have different names.</paragraph>
<section id="relatedtopics">
<embed href="text/scalc/guide/multitables.xhp#multitables"/>
diff --git a/helpcontent2/source/text/scalc/guide/scenario.xhp b/helpcontent2/source/text/scalc/guide/scenario.xhp
index 5fba5632cd..dfde2e64f2 100755
--- a/helpcontent2/source/text/scalc/guide/scenario.xhp
+++ b/helpcontent2/source/text/scalc/guide/scenario.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: scenario.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -53,7 +53,7 @@
<paragraph role="paragraph" id="par_id3154704" xml-lang="en-US" l10n="U" oldref="16">To create a scenario, select all the cells that provide the data for the scenario. </paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3154020" xml-lang="en-US" l10n="CHG" oldref="17">Select the cells that contain the values that will change between scenarios. To select multiple cells, hold down the <item type="keycode">Ctrl</item> key as you click each cell.</paragraph>
+<paragraph role="listitem" id="par_id3154020" xml-lang="en-US" l10n="CHG" oldref="17">Select the cells that contain the values that will change between scenarios. To select multiple cells, hold down the <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline></item>key as you click each cell.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150364" xml-lang="en-US" l10n="U" oldref="18">Choose <emph>Tools - Scenarios</emph>. The <emph>Create Scenario</emph> dialog appears.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/sorted_list.xhp b/helpcontent2/source/text/scalc/guide/sorted_list.xhp
index 7a480845a9..19d91825f1 100755
--- a/helpcontent2/source/text/scalc/guide/sorted_list.xhp
+++ b/helpcontent2/source/text/scalc/guide/sorted_list.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: sorted_list.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -60,7 +60,7 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3159154" role="paragraph" l10n="U" oldref="7">Sort lists allow you to type one piece of information in a cell, then drag it to fill in a consecutive list of items.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148645" role="paragraph" l10n="U" oldref="4">For example, enter the text "Jan" or "January" in an empty cell. Select the cell and click the mouse on the lower right corner of the cell border. Then drag the selected cell a few cells to the right or downwards. When you release the mouse button, the highlighted cells will be filled with the names of the months.</paragraph>
- <paragraph xml-lang="en-US" id="par_id2367931" role="paragraph" l10n="NEW">Hold down Ctrl if you do not want to fill the cells with different values.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2367931" role="paragraph" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>if you do not want to fill the cells with different values.</paragraph>
<paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="5">The predefined series can be found under <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists</emph>. You can also create your own lists of text strings tailored to your needs, such as a list of your company's branch offices. When you use the information in these lists later (for example, as headings), just enter the first name in the list and expand the entry by dragging it with your mouse.</paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/scalc/guide/text_wrap.xhp b/helpcontent2/source/text/scalc/guide/text_wrap.xhp
index 80b075b5c9..9e5e8b7e05 100755
--- a/helpcontent2/source/text/scalc/guide/text_wrap.xhp
+++ b/helpcontent2/source/text/scalc/guide/text_wrap.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: text_wrap.xhp,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -53,8 +53,7 @@
<section id="wraptext">
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3156280" xml-lang="en-US" l10n="U" oldref="41">Pressing the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter keys inserts a manual line break. This shortcut only works directly in the cell, not in the input line.</paragraph>
+<paragraph role="listitem" id="par_id3156280" xml-lang="en-US" l10n="U" oldref="41">Pressing the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter keys inserts a manual line break. This shortcut only works directly in the cell, not in the input line.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3153142" xml-lang="en-US" l10n="U" oldref="43">If you want the text to automatically break at the right border of the cell, proceed as follows:</paragraph>
diff --git a/helpcontent2/source/text/scalc/main0103.xhp b/helpcontent2/source/text/scalc/main0103.xhp
index da6f06cbe4..ae04d503eb 100755
--- a/helpcontent2/source/text/scalc/main0103.xhp
+++ b/helpcontent2/source/text/scalc/main0103.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: main0103.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -51,7 +51,6 @@
<bookmark xml-lang="en-US" branch="hid/.uno:NormalViewMode" id="bm_id3422345" localize="false"/><paragraph role="heading" id="par_idN105AB" xml-lang="en-US" level="2" l10n="NEW">Normal</paragraph>
<paragraph role="paragraph" id="par_idN105AF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the normal view of the sheet.</ahelp></paragraph>
<embed href="text/scalc/01/03100000.xhp#seitenumbruchvorschau"/>
-<embed href="text/shared/01/03990000.xhp#symbolleisten"/>
<embed href="text/scalc/01/03090000.xhp#rechenleiste"/>
<embed href="text/shared/01/03060000.xhp#taskleiste"/>
<embed href="text/shared/01/03040000.xhp#ime"/>
diff --git a/helpcontent2/source/text/scalc/makefile.mk b/helpcontent2/source/text/scalc/makefile.mk
index d69b29f4e3..f4472b0ac3 100644
--- a/helpcontent2/source/text/scalc/makefile.mk
+++ b/helpcontent2/source/text/scalc/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/schart/00/makefile.mk b/helpcontent2/source/text/schart/00/makefile.mk
index a372356885..2695126e1b 100644
--- a/helpcontent2/source/text/schart/00/makefile.mk
+++ b/helpcontent2/source/text/schart/00/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/schart/01/04050000.xhp b/helpcontent2/source/text/schart/01/04050000.xhp
index 0a0310b431..b4ee3a429f 100644
--- a/helpcontent2/source/text/schart/01/04050000.xhp
+++ b/helpcontent2/source/text/schart/01/04050000.xhp
@@ -1,19 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
***********************************************************************
*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * $RCSfile: 04050000.xhp,v $fileonly,v $
*
- * $RCSfile: 04050000.xhp,v $
+ * $Revision: 1.9.4.3 $
*
- * $Revision: 1.9 $
+ * last change: $Author: ufi $ $Date: 2008/09/16 12:40:37 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +34,7 @@
<meta>
-<topic id="textschart0104050000xml" indexer="include">
+<topic id="textschart0104050000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Y Error Bars</title>
<filename>/text/schart/01/04050000.xhp</filename>
</topic>
@@ -46,15 +43,15 @@
<bookmark xml-lang="en-US" branch="hid/.uno:InsertStatistics" id="bm_id3154013" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertYErrorbar" id="bm_id877101" localize="false"/>
<paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/schart/01/04050000.xhp" name="Y Error Bars">Y Error Bars</link></paragraph><comment>i85330</comment>
-<paragraph role="paragraph" id="par_id3149666" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="statistik"><ahelp hid=".uno:InsertStatistics">Use the<emph> Y Error Bars </emph>dialog to display error bars for 2D charts.</ahelp>
+<paragraph role="paragraph" id="par_id3149666" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="statistik"><ahelp hid=".uno:InsertStatistics">Use the <emph>Y Error Bars</emph> dialog to display error bars for 2D charts.</ahelp>
</variable></paragraph>
<section id="howtoget">
<embed href="text/schart/00/00000004.xhp#efgsta"/>
</section>
<paragraph role="paragraph" id="par_id3401287" xml-lang="en-US" l10n="NEW">An error bar is an indicator line that spans over a range from y - NegativeErrorValue to y + PositiveErrorValue. In this term, y is the value of the data point. When "standard deviation" is selected, y is the mean value of the data series. NegativeErrorValue and PositiveErrorValue are the amounts calculated by the error bar function or given explicitly.</paragraph>
-<paragraph role="note" id="par_id3153965" xml-lang="en-US" l10n="CHG" oldref="23">The<emph> Insert - Y Error Bars </emph>menu command is only available for 2D charts.</paragraph>
+<paragraph role="note" id="par_id3153965" xml-lang="en-US" l10n="CHG" oldref="23">The <emph>Insert - Y Error Bars</emph> menu command is only available for 2D charts.</paragraph>
<paragraph role="heading" id="hd_id3150344" xml-lang="en-US" level="2" l10n="U" oldref="5">Error category</paragraph>
-<paragraph role="paragraph" id="par_id3150202" xml-lang="en-US" l10n="CHG" oldref="6">In the<emph> Error category </emph>area, you can choose different ways to display the error category.</paragraph>
+<paragraph role="paragraph" id="par_id3150202" xml-lang="en-US" l10n="CHG" oldref="6">In the <emph>Error category</emph> area, you can choose different ways to display the error category.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_NONE" id="bm_id3156445" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SCH:RADIOBUTTON:TP_STAT:RBT_NONE" id="bm_id3156449" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_STATISTIK_NO_ERROR" id="bm_id3862117" localize="false"/>
diff --git a/helpcontent2/source/text/schart/01/05040201.xhp b/helpcontent2/source/text/schart/01/05040201.xhp
index 169ef79bd0..ce62d70022 100644
--- a/helpcontent2/source/text/schart/01/05040201.xhp
+++ b/helpcontent2/source/text/schart/01/05040201.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05040201.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -93,9 +93,7 @@
<paragraph role="paragraph" id="par_id3145360" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="SCH:CHECKBOX:TP_SCALE_Y:CBX_LOGARITHM">Specifies that you want the axis to be subdivided logarithmically.</ahelp></paragraph>
<paragraph role="note" id="par_id3153956" xml-lang="en-US" l10n="U" oldref="61">Use this feature if you are working with values that differ sharply from each other. You can use logarithmic scaling to make the grid lines of the axis equidistant but have values that may increase or decrease.</paragraph>
<bookmark xml-lang="en-US" branch="hid/chart2_CheckBox_TP_SCALE_Y_CBX_REVERSE" id="bm_id4007080" localize="false"/><paragraph role="heading" id="hd_id9941404" xml-lang="en-US" level="3" l10n="NEW">Reverse direction</paragraph>
-<paragraph role="paragraph" id="par_id5581835" xml-lang="en-US" l10n="NEW"><ahelp hid="."><emph>Defines where the lower and where the higher values are displayed at </emph>
-<emph>the</emph>
-<emph> axis. The unchecked state is the</emph> mathematical direction.</ahelp> That means for Cartesian coordinate systems that the x-axis shows the lower values on the left and the y-axis shows the lower values at the bottom. For polar coordinate systems the mathematical angle axis direction is counterclockwise and the radial axis is from inner to outer.<comment>http://specs.openoffice.org/chart/Chart_Scales_and_Intervals.odt</comment></paragraph>
+<paragraph role="paragraph" id="par_id5581835" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Defines where the lower and where the higher values are displayed at the axis. The unchecked state is the mathematical direction.</ahelp> That means for Cartesian coordinate systems that the x-axis shows the lower values on the left and the y-axis shows the lower values at the bottom. For polar coordinate systems the mathematical angle axis direction is counterclockwise and the radial axis is from inner to outer.<comment>http://specs.openoffice.org/chart/Chart_Scales_and_Intervals.odt</comment></paragraph>
<paragraph role="heading" id="hd_id3149048" xml-lang="en-US" level="2" l10n="U" oldref="65">Major interval marks</paragraph>
<paragraph role="paragraph" id="par_id3150397" xml-lang="en-US" l10n="U" oldref="71">Specifies whether the marks are to be on the inner or outer side of the axis. It is possible to combine both: you will then see marks on both sides.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SCH:CHECKBOX:TP_SCALE_Y:CBX_TICKS_INNER" id="bm_id3146322" localize="false"/>
diff --git a/helpcontent2/source/text/schart/01/makefile.mk b/helpcontent2/source/text/schart/01/makefile.mk
index eb47e6014b..755bec1211 100644
--- a/helpcontent2/source/text/schart/01/makefile.mk
+++ b/helpcontent2/source/text/schart/01/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.10.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/schart/01/type_xy.xhp b/helpcontent2/source/text/schart/01/type_xy.xhp
index 4d34e1654a..b708e34516 100644
--- a/helpcontent2/source/text/schart/01/type_xy.xhp
+++ b/helpcontent2/source/text/schart/01/type_xy.xhp
@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
***********************************************************************
*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * $RCSfile: type_xy.xhp,v $fileonly,v $
*
- * $RCSfile: type_xy.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.2 $
+ *
+ * last change: $Author: ufi $ $Date: 2008/09/16 12:40:37 $
*
* This file is part of OpenOffice.org.
*
@@ -33,9 +31,8 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
<topic id="textschart01type_xyxhp" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Chart Type XY</title>
@@ -52,16 +49,17 @@
<bookmark_value>statistics in charts</bookmark_value>
<bookmark_value>variances in charts</bookmark_value>
<bookmark_value>standard deviation in charts</bookmark_value>
-</bookmark><comment>mw changed xy to XY (2x)</comment><paragraph role="heading" id="hd_id9346598" xml-lang="en-US" level="1" l10n="NEW"><variable id="type_xy"><link href="text/schart/01/type_xy.xhp">Chart Type XY (Scatter)</link>
+</bookmark><comment>mw changed xy to XY (2x)</comment>
+<paragraph role="heading" id="hd_id9346598" xml-lang="en-US" level="1" l10n="NEW"><variable id="type_xy"><link href="text/schart/01/type_xy.xhp">Chart Type XY (Scatter)</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id2003845" xml-lang="en-US" l10n="NEW">On the first page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link> you can choose a chart type. </paragraph>
<section id="howtoget">
- <embed href="text/schart/00/00000004.xhp#wiz"/>
+<embed href="text/schart/00/00000004.xhp#wiz"/>
</section>
<paragraph role="heading" id="hd_id7757194" xml-lang="en-US" level="2" l10n="NEW">XY (Scatter)</paragraph>
<paragraph role="paragraph" id="par_id5977965" xml-lang="en-US" l10n="NEW">An XY chart in its basic form is based on one data series consisting of a name, a list of x‑values, and a list of y‑values. Each value pair (x|y) is shown as a point in a coordinate system. The name of the data series is associated with the y‑values and shown in the legend.</paragraph>
<paragraph role="paragraph" id="par_id4381847" xml-lang="en-US" l10n="NEW">Choose an XY chart for the following example tasks:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id1336710" xml-lang="en-US" l10n="NEW">scale the x‑axis</paragraph>
</listitem>
@@ -78,8 +76,9 @@
<paragraph role="paragraph" id="par_id8925138" xml-lang="en-US" l10n="NEW">Your XY chart may have more than one data series.</paragraph>
<paragraph role="heading" id="hd_id5461897" xml-lang="en-US" level="2" l10n="NEW">XY Chart Variants</paragraph>
<paragraph role="paragraph" id="par_id8919339" xml-lang="en-US" l10n="NEW">You can choose an XY chart variant on the first page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart Wizard</link>, or by choosing <item type="menuitem">Format - Chart Type </item>for a chart in edit mode.</paragraph>
-<paragraph role="paragraph" id="par_id4634235" xml-lang="en-US" l10n="NEW">The chart is created with default settings. After the chart is finished, you can edit its properties to change the appearance. Line styles and icons can be changed on the <emph>Line</emph> tab page of the data series properties dialog.</paragraph>
-<paragraph role="paragraph" id="par_id5482039" xml-lang="en-US" l10n="CHG">Double-click any data point to open the <item type="menuitem">Data Series</item> dialog. Here you can click the <emph>Y Error Bars</emph> tab to enable the display of error bars. </paragraph>
+<paragraph role="paragraph" id="par_id4634235" xml-lang="en-US" l10n="NEW">The chart is created with default settings. After the chart is finished, you can edit its properties to change the appearance. Line styles and icons can be changed on the <emph>Line</emph>tab page of the data series properties dialog.</paragraph>
+<paragraph role="paragraph" id="par_id5482039" xml-lang="en-US" l10n="CHG">Double-click any data point to open the <item type="menuitem">Data Series</item> dialog. In this dialog, you can change many properties of the data series.</paragraph>
+<paragraph role="paragraph" id="par_id0805200810492449" xml-lang="en-US" l10n="NEW">For 2D charts, you can choose <item type="menuitem">Insert - Y Error Bars</item> to enable the display of error bars.</paragraph>
<paragraph role="paragraph" id="par_id6221198" xml-lang="en-US" l10n="NEW">You can enable the display of mean value lines and trend lines using commands on the Insert menu.</paragraph>
<paragraph role="heading" id="hd_id1393475" xml-lang="en-US" level="3" l10n="NEW">Points only</paragraph>
<paragraph role="paragraph" id="par_id6571550" xml-lang="en-US" l10n="NEW">Each data point is shown by an icon. %PRODUCTNAME uses default icons with different forms and colors for each data series. The default colors are set in <item type="menuitem">Tools - Options - Charts - Default Colors</item>. </paragraph>
@@ -97,7 +96,8 @@
<emph>Cubic Spline</emph> interpolates your data points with polynomials of degree 3. The transitions between the polynomial pieces are smooth, having the same slope and curvature. </paragraph>
<paragraph role="paragraph" id="par_id6128421" xml-lang="en-US" l10n="NEW">The <emph>Resolution</emph> determines how many line segments are calculated to draw a piece of polynomial between two data points. You can see the intermediate points if you click any data point.</paragraph>
<paragraph role="paragraph" id="par_id9280373" xml-lang="en-US" l10n="NEW">
-<emph>B-Spline</emph> uses the data points as control points to form a B-spline curve. Those curves are built piecewise from polynomials. The <emph>Data points order</emph> sets the degree k of these polynomials. <comment>Besides the first and last point the curve doesn't go through the data points but lays inside the convex hull of each k+1 adjacent data points. Having Resolution r and n+1 data points, r times n uniform line segments are used to draw the whole curve.</comment></paragraph><comment>Regina: watch issue 72218, which would bring a change to UI</comment><section id="relatedtopics">
+<emph>B-Spline</emph> uses the data points as control points to form a B-spline curve. Those curves are built piecewise from polynomials. The <emph>Data points order</emph> sets the degree k of these polynomials. <comment>Besides the first and last point the curve doesn't go through the data points but lays inside the convex hull of each k+1 adjacent data points. Having Resolution r and n+1 data points, r times n uniform line segments are used to draw the whole curve.</comment></paragraph><comment>Regina: watch issue 72218, which would bring a change to UI</comment>
+<section id="relatedtopics">
<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
<embed href="text/schart/01/wiz_chart_type.xhp#wiz_chart_type"/>
<embed href="text/schart/01/wiz_data_range.xhp#wiz_data_range"/>
diff --git a/helpcontent2/source/text/schart/02/makefile.mk b/helpcontent2/source/text/schart/02/makefile.mk
index 2ef19859e2..acdebe7a5f 100644
--- a/helpcontent2/source/text/schart/02/makefile.mk
+++ b/helpcontent2/source/text/schart/02/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/schart/04/01020000.xhp b/helpcontent2/source/text/schart/04/01020000.xhp
index 5a9f47dbd5..e8c9909d30 100755
--- a/helpcontent2/source/text/schart/04/01020000.xhp
+++ b/helpcontent2/source/text/schart/04/01020000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01020000.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -95,7 +95,7 @@
<paragraph role="paragraph" id="par_id3152988" xml-lang="en-US" l10n="U" oldref="24">Open group so that you can edit the individual components (in legend and data series).</paragraph>
</section>
<section id="StrgF3">
-<paragraph role="heading" id="hd_id3153815" xml-lang="en-US" level="3" l10n="U" oldref="25">Ctrl+F3</paragraph>
+<paragraph role="heading" id="hd_id3153815" xml-lang="en-US" level="3" l10n="U" oldref="25"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
<paragraph role="paragraph" id="par_id3153915" xml-lang="en-US" l10n="U" oldref="26">Exit group (in legend and data series).</paragraph>
</section>
<section id="+-">
diff --git a/helpcontent2/source/text/schart/04/makefile.mk b/helpcontent2/source/text/schart/04/makefile.mk
index 6daa19afd3..8e1b65540b 100644
--- a/helpcontent2/source/text/schart/04/makefile.mk
+++ b/helpcontent2/source/text/schart/04/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/schart/makefile.mk b/helpcontent2/source/text/schart/makefile.mk
index 2665a4e964..2f0fbb43d5 100644
--- a/helpcontent2/source/text/schart/makefile.mk
+++ b/helpcontent2/source/text/schart/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.9.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/sdraw/00/makefile.mk b/helpcontent2/source/text/sdraw/00/makefile.mk
index 963e31f408..eec47dcbeb 100644
--- a/helpcontent2/source/text/sdraw/00/makefile.mk
+++ b/helpcontent2/source/text/sdraw/00/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/sdraw/01/makefile.mk b/helpcontent2/source/text/sdraw/01/makefile.mk
index 5494d3b205..9d679d5b1e 100644
--- a/helpcontent2/source/text/sdraw/01/makefile.mk
+++ b/helpcontent2/source/text/sdraw/01/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/sdraw/04/01020000.xhp b/helpcontent2/source/text/sdraw/04/01020000.xhp
index a0d4bf7452..8e8df32f0c 100755
--- a/helpcontent2/source/text/sdraw/04/01020000.xhp
+++ b/helpcontent2/source/text/sdraw/04/01020000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01020000.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsdraw0401020000xml" indexer="include" status="PUBLISH">
+<topic id="textsdraw0401020000xml" indexer="include">
<title id="tit" xml-lang="en-US">Shortcut Keys for Drawings</title>
<filename>/text/sdraw/04/01020000.xhp</filename>
</topic>
@@ -56,460 +54,447 @@
<paragraph role="heading" id="hd_id3149121" xml-lang="en-US" level="2" l10n="U" oldref="3">Function Keys for Drawings</paragraph>
<table id="tbl_id9051789.00000001">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="hd_id3155768" xml-lang="en-US" l10n="U" oldref="4">Shortcut Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3153713" xml-lang="en-US" l10n="U" oldref="6">
<emph>Effect</emph>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150044" xml-lang="en-US" l10n="U" oldref="7">F2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152346" xml-lang="en-US" l10n="U" oldref="8">Add or edit text.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154705" xml-lang="en-US" l10n="U" oldref="9">F3</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147004" xml-lang="en-US" l10n="U" oldref="10">Opens group to edit individual objects.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155113" xml-lang="en-US" l10n="U" oldref="11"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3155113" xml-lang="en-US" l10n="U" oldref="11"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159238" xml-lang="en-US" l10n="U" oldref="12">Close group editor.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150199" xml-lang="en-US" l10n="U" oldref="13">Shift+F3</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152994" xml-lang="en-US" l10n="U" oldref="14">Opens the <emph>Duplicate</emph> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154488" xml-lang="en-US" l10n="U" oldref="15">F4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149406" xml-lang="en-US" l10n="U" oldref="16">Opens the <emph>Position and Size</emph> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148870" xml-lang="en-US" l10n="U" oldref="21">F5</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153917" xml-lang="en-US" l10n="U" oldref="22">Opens the <emph>Navigator</emph>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3157982" xml-lang="en-US" l10n="U" oldref="25">F7</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154649" xml-lang="en-US" l10n="U" oldref="26">Checks spelling.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3152869" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3152869" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154765" xml-lang="en-US" l10n="U" oldref="28">Opens the <emph>Thesaurus</emph>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3146962" xml-lang="en-US" l10n="U" oldref="29">F8</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154707" xml-lang="en-US" l10n="U" oldref="30">Edit points on/off.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149317" xml-lang="en-US" l10n="U" oldref="31"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F8</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149317" xml-lang="en-US" l10n="U" oldref="31"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F8</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147250" xml-lang="en-US" l10n="U" oldref="32">Fits to frame.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150434" xml-lang="en-US" l10n="U" oldref="35">F11</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151389" xml-lang="en-US" l10n="U" oldref="36">Opens Styles and Formatting window.</paragraph>
</tablecell>
</tablerow>
</table>
+
<bookmark xml-lang="en-US" branch="index" id="bm_id3150393"><bookmark_value>zooming;shortcut keys</bookmark_value>
<bookmark_value>drawings; zoom function in</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3150393" xml-lang="en-US" level="2" l10n="U" oldref="41">Shortcut Keys for Drawings</paragraph>
<table id="tbl_id1650440">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="hd_id3156401" xml-lang="en-US" l10n="U" oldref="42">Shortcut Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3146323" xml-lang="en-US" l10n="U" oldref="43">
<emph>Effect</emph>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149946" xml-lang="en-US" l10n="U" oldref="44">Plus(+) Key</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159119" xml-lang="en-US" l10n="U" oldref="45">Zooms in.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150655" xml-lang="en-US" l10n="U" oldref="46">Minus(-) Key</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145827" xml-lang="en-US" l10n="U" oldref="47">Zooms out.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149886" xml-lang="en-US" l10n="U" oldref="99">Multiple(×) Key (number pad)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150746" xml-lang="en-US" l10n="U" oldref="102">Zooms to fit entire page in screen.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154841" xml-lang="en-US" l10n="U" oldref="101">Divide (÷) Key (number pad)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153039" xml-lang="en-US" l10n="U" oldref="100">Zooms in on the current selection.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150867" xml-lang="en-US" l10n="U" oldref="52"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+G</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3150867" xml-lang="en-US" l10n="U" oldref="52"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+G</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149250" xml-lang="en-US" l10n="U" oldref="53">Groups selected objects.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149955" xml-lang="en-US" l10n="U" oldref="54">Shift+<switchinline select="sys"><caseinline select="MAC">Command+Option
-</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+A</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149955" xml-lang="en-US" l10n="U" oldref="54">Shift+<switchinline select="sys"><caseinline select="MAC">Command+Option</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+A</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148582" xml-lang="en-US" l10n="U" oldref="55">Ungroups selected group.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3146852" xml-lang="en-US" l10n="U" oldref="56"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+K</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3146852" xml-lang="en-US" l10n="U" oldref="56"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+K</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153110" xml-lang="en-US" l10n="U" oldref="57">Combines selected objects.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153567" xml-lang="en-US" l10n="U" oldref="58"><switchinline select="sys"><caseinline select="MAC">Command+Option
-</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Shift+K</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3153567" xml-lang="en-US" l10n="U" oldref="58"><switchinline select="sys"><caseinline select="MAC">Command+Option</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Shift+K</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147366" xml-lang="en-US" l10n="CHG" oldref="59">Uncombines selected objects.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153730" xml-lang="en-US" l10n="U" oldref="60"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift++</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3153730" xml-lang="en-US" l10n="U" oldref="60"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+ +</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155928" xml-lang="en-US" l10n="U" oldref="61">Bring to front.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145245" xml-lang="en-US" l10n="U" oldref="62"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>++</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3145245" xml-lang="en-US" l10n="U" oldref="62"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ +</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148393" xml-lang="en-US" l10n="U" oldref="63">Bring forward.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150928" xml-lang="en-US" l10n="U" oldref="64"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+-</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3150928" xml-lang="en-US" l10n="U" oldref="64"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ -</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156062" xml-lang="en-US" l10n="U" oldref="65">Send backward.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145298" xml-lang="en-US" l10n="U" oldref="66"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+-</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3145298" xml-lang="en-US" l10n="U" oldref="66"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+ -</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149028" xml-lang="en-US" l10n="U" oldref="67">Send to back.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3147533" xml-lang="en-US" level="2" l10n="U" oldref="68">Shortcut Keys Specific to Drawings</paragraph>
<table id="tbl_id4134342">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="hd_id3154865" xml-lang="en-US" l10n="U" oldref="69">Shortcut Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155370" xml-lang="en-US" l10n="U" oldref="70">
<emph>Effect</emph>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10AD7" xml-lang="en-US" l10n="NEW">PageUp</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AD7" xml-lang="en-US" l10n="NEW">Page Up</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10ADC" xml-lang="en-US" l10n="NEW">Switch to previous page</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10AE2" xml-lang="en-US" l10n="NEW">PageDown</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AE2" xml-lang="en-US" l10n="NEW">Page Down</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10AE7" xml-lang="en-US" l10n="NEW">Switch to next page</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10AED" xml-lang="en-US" l10n="NEW">Ctrl+PageUp</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AED" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10AF2" xml-lang="en-US" l10n="NEW">Switch to next layer</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10AF8" xml-lang="en-US" l10n="NEW">Ctrl+PageDown</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AF8" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Down</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10AFD" xml-lang="en-US" l10n="NEW">Switch to previous layer</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153927" xml-lang="en-US" l10n="U" oldref="71">Arrow Key</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155986" xml-lang="en-US" l10n="U" oldref="72">Moves the selected object in the direction of the arrow key.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3156259" xml-lang="en-US" l10n="U" oldref="73"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow Key</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3156259" xml-lang="en-US" l10n="U" oldref="73"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow Key</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147171" xml-lang="en-US" l10n="U" oldref="74">Moves the page view in the direction of the arrow key.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3083282" xml-lang="en-US" l10n="U" oldref="75">Shift+ drag with mouse</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3152484" xml-lang="en-US" l10n="U" oldref="79"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click while dragging an object. Note: you must first enable the <link href="text/shared/optionen/01070500.xhp" name="Copy when moving">Copy when moving</link> option in Tools - Options - %PRODUCTNAME Draw - General to use this shortcut key.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145620" xml-lang="en-US" l10n="U" oldref="76">The movement of the selected object is constrained by multiples of 45 degrees.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3152484" xml-lang="en-US" l10n="U" oldref="79"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Click while dragging an object. Note: you must first enable the <link href="text/shared/optionen/01070500.xhp" name="Copy when moving">Copy when moving</link> option in Tools - Options - %PRODUCTNAME Draw - General to use this shortcut key.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149450" xml-lang="en-US" l10n="U" oldref="80">Creates a copy of the dragged object when mouse button is released.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154643" xml-lang="en-US" l10n="CHG" oldref="104">Ctrl+Enter with keyboard focus (F6) on a drawing object icon on Tools bar</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3154643" xml-lang="en-US" l10n="CHG" oldref="104"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter with keyboard focus (F6) on a drawing object icon on Tools bar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150756" xml-lang="en-US" l10n="U" oldref="105">Inserts a drawing object of default size into the center of the current view.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3151189" xml-lang="en-US" l10n="U" oldref="106">Shift+F10</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151266" xml-lang="en-US" l10n="U" oldref="107">Opens the context menu for the selected object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3156100" xml-lang="en-US" l10n="U" oldref="108">F2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156323" xml-lang="en-US" l10n="U" oldref="109">Enters text mode.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3147563" xml-lang="en-US" l10n="U" oldref="110">Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150258" xml-lang="en-US" l10n="U" oldref="111">Enters text mode if a text object is selected.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155851" xml-lang="en-US" l10n="U" oldref="112">Ctrl+Enter</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3155851" xml-lang="en-US" l10n="U" oldref="112"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="113">Enters text mode if a text object is selected. If there are no text objects or if you have cycled through all of the text objects on the page, a new page is inserted.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149977" xml-lang="en-US" l10n="U" oldref="81"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline></paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149977" xml-lang="en-US" l10n="U" oldref="81"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152812" xml-lang="en-US" l10n="U" oldref="82">Press the <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key and drag with the mouse to draw or resize an object from the center of the object outward.</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3152812" xml-lang="en-US" l10n="U" oldref="82">Press the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key and drag with the mouse to draw or resize an object from the center of the object outward.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3143232" xml-lang="en-US" l10n="U" oldref="83"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> + click on an object</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3143232" xml-lang="en-US" l10n="U" oldref="83"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> + click on an object</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156007" xml-lang="en-US" l10n="U" oldref="84">Selects the object behind the currently selected object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147252" xml-lang="en-US" l10n="U" oldref="85"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift+click an object</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3147252" xml-lang="en-US" l10n="U" oldref="85"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift+click an object</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145666" xml-lang="en-US" l10n="U" oldref="86">Selects the object in front of the currently selected object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3155325" xml-lang="en-US" l10n="U" oldref="87">Shift key while selecting an object</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159343" xml-lang="en-US" l10n="U" oldref="88">Adds or removes object to or from the selection.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3083282" xml-lang="en-US" l10n="CHG" oldref="75">Shift+ drag while moving an object</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3145620" xml-lang="en-US" l10n="U" oldref="76">The movement of the selected object is constrained by multiples of 45 degrees.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154933" xml-lang="en-US" l10n="U" oldref="89">Shift+drag while creating or resizing an object</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148831" xml-lang="en-US" l10n="U" oldref="90">Constrains the dimensions of the object to multiples of 45 degrees.</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3148831" xml-lang="en-US" l10n="CHG" oldref="90">Constrains the size to keep the object's aspect ratio.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154205" xml-lang="en-US" l10n="U" oldref="91">Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148804" xml-lang="en-US" l10n="U" oldref="92">Cycles through the objects on the page in the order in which they were created.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3145410" xml-lang="en-US" l10n="U" oldref="93">Shift+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149764" xml-lang="en-US" l10n="U" oldref="94">Cycles through the objects on the page in the reverse-order in which they were created.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3158399" xml-lang="en-US" l10n="U" oldref="97">Esc</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3109840" xml-lang="en-US" l10n="U" oldref="98">Exits current mode.</paragraph>
</tablecell>
</tablerow>
</table>
+
<section id="Esc">
<paragraph role="heading" id="hd_id3154262" xml-lang="en-US" level="2" l10n="U" oldref="114">Shortcut Keys for 3D Effects (Illumination tab)</paragraph>
<table id="tbl_id7673268">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10E11" xml-lang="en-US" l10n="NEW">Shortcut Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10E17" xml-lang="en-US" l10n="NEW">
<emph>Effect</emph>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153578" xml-lang="en-US" l10n="U" oldref="115">Page Up</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147513" xml-lang="en-US" l10n="U" oldref="116">Changes the light source in the preview window.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148482" xml-lang="en-US" l10n="U" oldref="117">Page Down</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155364" xml-lang="en-US" l10n="U" oldref="118">Changes the light source in the preview window.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148906" xml-lang="en-US" l10n="U" oldref="119">Arrow keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154272" xml-lang="en-US" l10n="U" oldref="120">Moves the current light source in the direction of the arrow.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148923" xml-lang="en-US" l10n="U" oldref="121">Spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3166451" xml-lang="en-US" l10n="U" oldref="122">Enables the current light source and turns it on or off.</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<embed href="text/simpress/04/01020000.xhp#strgenter"/>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/sdraw/04/makefile.mk b/helpcontent2/source/text/sdraw/04/makefile.mk
index a7572b90d6..b8af3f6a4f 100644
--- a/helpcontent2/source/text/sdraw/04/makefile.mk
+++ b/helpcontent2/source/text/sdraw/04/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/sdraw/guide/cross_fading.xhp b/helpcontent2/source/text/sdraw/guide/cross_fading.xhp
index bd8be2744d..fd145b933f 100644
--- a/helpcontent2/source/text/sdraw/guide/cross_fading.xhp
+++ b/helpcontent2/source/text/sdraw/guide/cross_fading.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: cross_fading.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -74,7 +74,7 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="25">You can edit the individual objects of a group by selecting the group and pressing F3. Press Ctrl+F3 to exit the group editing mode.</paragraph>
+<paragraph role="paragraph" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="25">You can edit the individual objects of a group by selecting the group and pressing F3. Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3 to exit the group editing mode.</paragraph>
</tablecell>
</tablerow>
</table>
diff --git a/helpcontent2/source/text/sdraw/guide/draw_sector.xhp b/helpcontent2/source/text/sdraw/guide/draw_sector.xhp
index 00133307b9..2ea0a8f0bc 100644
--- a/helpcontent2/source/text/sdraw/guide/draw_sector.xhp
+++ b/helpcontent2/source/text/sdraw/guide/draw_sector.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: draw_sector.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -63,8 +63,7 @@
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3150199" xml-lang="en-US" l10n="U" oldref="34">Position the pointer at the edge of the circle you want to draw and drag to create the circle.</paragraph>
-<paragraph role="tip" id="par_id3148868" xml-lang="en-US" l10n="U" oldref="35">To create a circle by dragging from the center, press <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> while dragging.</paragraph>
+<paragraph role="tip" id="par_id3148868" xml-lang="en-US" l10n="U" oldref="35">To create a circle by dragging from the center, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> while dragging.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3145361" xml-lang="en-US" l10n="U" oldref="36">Release the mouse button when the circle has reached the size you want. A line corresponding to the circle radius appears in the circle.</paragraph>
diff --git a/helpcontent2/source/text/sdraw/guide/keyboard.xhp b/helpcontent2/source/text/sdraw/guide/keyboard.xhp
index 1fa68dd318..e4c5041831 100644
--- a/helpcontent2/source/text/sdraw/guide/keyboard.xhp
+++ b/helpcontent2/source/text/sdraw/guide/keyboard.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: keyboard.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -66,18 +66,18 @@
<paragraph role="paragraph" id="par_idN106CD" xml-lang="en-US" l10n="NEW">If there is an arrow next to the icon, the drawing tool opens a sub toolbar. Press the <item type="keycode">Up</item> or <item type="keycode">Down</item> arrow key to open the sub toolbar, then press the <item type="keycode">Right</item> or <item type="keycode">Left</item> key to select an icon.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="8">Press <item type="keycode">Ctrl+Enter</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="8">Press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</item>.</paragraph>
<paragraph role="paragraph" id="par_id3154705" xml-lang="en-US" l10n="U" oldref="7">The object is created at the center of the current document.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="U" oldref="6">To return to the document, press <item type="keycode">Ctrl+F6</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="U" oldref="6">To return to the document, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6</item>.</paragraph>
<paragraph role="paragraph" id="par_id3155062" xml-lang="en-US" l10n="U" oldref="5">You can use the arrow keys to position the object where you want. To choose a command from the context menu for the object, press <item type="keycode">Shift+F10</item>.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3150306" xml-lang="en-US" level="2" l10n="U" oldref="4">To Select an Object</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3152990" xml-lang="en-US" l10n="U" oldref="3">Press <item type="keycode">Ctrl+F6</item> to enter the document.</paragraph>
+<paragraph role="listitem" id="par_id3152990" xml-lang="en-US" l10n="U" oldref="3">Press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6</item> to enter the document.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145587" xml-lang="en-US" l10n="U" oldref="2">Press <item type="keycode">Tab</item> until you reach the object you want to select.</paragraph>
diff --git a/helpcontent2/source/text/sdraw/guide/main.xhp b/helpcontent2/source/text/sdraw/guide/main.xhp
index 62408910de..eea3118353 100755
--- a/helpcontent2/source/text/sdraw/guide/main.xhp
+++ b/helpcontent2/source/text/sdraw/guide/main.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: main.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsdrawguidemainxml" indexer="include" status="PUBLISH">
+<topic id="textsdrawguidemainxml" indexer="include">
<title id="tit" xml-lang="en-US">Instructions for Using $[officename] Draw</title>
<filename>/text/sdraw/guide/main.xhp</filename>
</topic>
@@ -46,7 +44,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3146119"><bookmark_value>Draw instructions</bookmark_value>
<bookmark_value>instructions; $[officename] Draw</bookmark_value>
<bookmark_value>Howtos for Draw</bookmark_value>
-</bookmark><comment>MW added an entry</comment><paragraph role="heading" id="hd_id3146119" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="main"><link href="text/sdraw/guide/main.xhp" name="Instructions for Using $[officename] Draw">Instructions for Using $[officename] Draw</link>
+</bookmark><comment>MW added an entry</comment>
+<paragraph role="heading" id="hd_id3146119" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="main"><link href="text/sdraw/guide/main.xhp" name="Instructions for Using $[officename] Draw">Instructions for Using $[officename] Draw</link>
</variable></paragraph>
<embed href="text/shared/00/00000099.xhp#table"/>
<paragraph role="heading" id="hd_id3143218" xml-lang="en-US" level="2" l10n="U" oldref="2">Editing and Grouping Objects</paragraph>
@@ -83,6 +82,7 @@
<embed href="text/shared/guide/linestyles.xhp#linestyles"/>
<embed href="text/shared/guide/lineend_define.xhp#lineend_define"/>
<embed href="text/shared/guide/linestyle_define.xhp#linestyle_define"/>
+<embed href="text/simpress/guide/gluepoints.xhp#gluepoints"/>
<section id="relatedtopics">
<embed href="text/simpress/guide/main.xhp#main"/>
</section>
diff --git a/helpcontent2/source/text/sdraw/guide/makefile.mk b/helpcontent2/source/text/sdraw/guide/makefile.mk
index 3e30a9526a..5ba3e99006 100644
--- a/helpcontent2/source/text/sdraw/guide/makefile.mk
+++ b/helpcontent2/source/text/sdraw/guide/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.9.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/sdraw/guide/rotate_object.xhp b/helpcontent2/source/text/sdraw/guide/rotate_object.xhp
index fd60d87abf..651669eec8 100644
--- a/helpcontent2/source/text/sdraw/guide/rotate_object.xhp
+++ b/helpcontent2/source/text/sdraw/guide/rotate_object.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: rotate_object.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsdrawguiderotate_objectxml" indexer="include" status="PUBLISH">
+<topic id="textsdrawguiderotate_objectxml" indexer="include">
<title id="tit" xml-lang="en-US">Rotating Objects</title>
<filename>/text/sdraw/guide/rotate_object.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-09-05T13:50:17">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154684"><bookmark_value>rotating; draw objects</bookmark_value>
@@ -53,23 +51,25 @@
<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="13">You can rotate an object around its default pivot point (center point) or a pivot point that you designate.</paragraph>
<table id="tbl_id3148575">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="E">
-<image id="img_id3154729" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="5.64mm" height="5.64mm"><alt id="alt_id3154729" xml-lang="en-US">Icon</alt>
+<image id="img_id3154729" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.564cm" height="0.564cm"><alt id="alt_id3154729" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150716" xml-lang="en-US" l10n="CHG" oldref="14">Select the object you want to rotate. On the <emph>Mode</emph> toolbar in $[officename] Draw or on the <emph>Drawing</emph> bar in $[officename] Impress, click the <emph>Rotate</emph> icon.</paragraph>
</tablecell>
</tablerow>
</table>
<paragraph role="paragraph" id="par_id3149021" xml-lang="en-US" l10n="U" oldref="69">Move the pointer to a corner handle so that the pointer changes to a rotate symbol. Drag the handle to rotate the object.</paragraph>
+<paragraph role="paragraph" id="par_id0930200803002335" xml-lang="en-US" l10n="NEW">Hold down the Shift key to restrict the rotation to multiples of 15 degrees.</paragraph>
+<paragraph role="paragraph" id="par_id0930200803002463" xml-lang="en-US" l10n="NEW">Right-click the object to open the context menu. Choose Position and Size - Rotation to enter an exact rotation value.</paragraph>
<table id="tbl_id3149126">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="E">
-<image id="img_id3154023" src="res/helpimg/rotieren.png" width="54.24mm" height="39.16mm"><alt id="alt_id3154023" xml-lang="en-US">Rotate object</alt>
+<image id="img_id3154023" src="res/helpimg/rotieren.png" width="5.424cm" height="3.916cm"><alt id="alt_id3154023" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
</tablerow>
diff --git a/helpcontent2/source/text/sdraw/main0103.xhp b/helpcontent2/source/text/sdraw/main0103.xhp
index 2d580c5612..d6ad466b5e 100755
--- a/helpcontent2/source/text/sdraw/main0103.xhp
+++ b/helpcontent2/source/text/sdraw/main0103.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: main0103.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -53,7 +53,6 @@
<paragraph role="paragraph" id="par_idN105B6" xml-lang="en-US" l10n="NEW">Switch to the master page view.</paragraph>
<embed href="text/simpress/01/03180000.xhp#anzeigequali"/>
<embed href="text/simpress/01/slidesorter.xhp#slidesorter"/>
-<embed href="text/shared/01/03990000.xhp#symbolleisten"/>
<embed href="text/shared/01/03060000.xhp#taskleiste"/>
<embed href="text/shared/01/03040000.xhp#ime"/>
<embed href="text/simpress/01/03060000.xhp#lineale"/>
diff --git a/helpcontent2/source/text/sdraw/main0210.xhp b/helpcontent2/source/text/sdraw/main0210.xhp
index 1004398215..e4176b3116 100755
--- a/helpcontent2/source/text/sdraw/main0210.xhp
+++ b/helpcontent2/source/text/sdraw/main0210.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: main0210.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -61,7 +61,6 @@
<embed href="text/simpress/02/10080000.xhp#kurve"/>
<embed href="text/simpress/00/00000004.xhp#sykurve"/>
<embed href="text/simpress/02/10100000.xhp#verbinder"/>
-<embed href="text/simpress/02/10100000.xhp#syverbinder"/>
<embed href="text/simpress/02/10090000.xhp#objekte"/>
<embed href="text/simpress/02/10090000.xhp#syobjekte"/>
<embed href="text/shared/02/basicshapes.xhp#basicshapes"/>
diff --git a/helpcontent2/source/text/sdraw/makefile.mk b/helpcontent2/source/text/sdraw/makefile.mk
index 0b288b0ca8..ec32369954 100644
--- a/helpcontent2/source/text/sdraw/makefile.mk
+++ b/helpcontent2/source/text/sdraw/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/00/00000001.xhp b/helpcontent2/source/text/shared/00/00000001.xhp
index 66fc69776f..f0840beb2e 100644
--- a/helpcontent2/source/text/shared/00/00000001.xhp
+++ b/helpcontent2/source/text/shared/00/00000001.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000001.xhp,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0000000001xml" indexer="exclude" status="PUBLISH">
+<topic id="textshared0000000001xml" indexer="exclude">
<title id="tit" xml-lang="en-US">Frequently-Used Buttons</title>
<filename>/text/shared/00/00000001.xhp</filename>
</topic>
@@ -45,10 +43,21 @@
<body>
<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="1" l10n="U" oldref="1">Frequently-Used Buttons</paragraph>
<section id="abbrechen">
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDCANCEL" id="bm_id4245124" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CANCEL" id="bm_id7074800" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDCANCEL" id="bm_id3147653" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_CANCEL" id="bm_id833765" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID0_CANCEL" id="bm_id7899105" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GROUPWIZARD_CANCEL" id="bm_id3149183" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDCANCEL" id="bm_id3149177" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDCANCEL" id="bm_id3154142" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_CANCEL" id="bm_id3145416" localize="false"/>
<paragraph role="heading" id="hd_id3147617" xml-lang="en-US" level="2" l10n="U" oldref="4">Cancel</paragraph>
<paragraph role="paragraph" id="par_id3155913" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid=".">Clicking <emph>Cancel</emph> closes a dialog without saving any changes made.</ahelp></paragraph>
</section>
<section id="finish">
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDFINISH" id="bm_id3211157" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CREATE" id="bm_id189519" localize="false"/>
<paragraph role="heading" id="hd_id2341685" xml-lang="en-US" level="2" l10n="NEW">Finish</paragraph>
<paragraph role="paragraph" id="par_id6909390" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Applies all changes and closes the wizard.</ahelp></paragraph>
</section>
@@ -58,7 +67,7 @@
</section>
<section id="drehfeld">
<paragraph role="heading" id="hd_id3152414" xml-lang="en-US" level="2" l10n="CHG" oldref="79">Spin button</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id1094088" xml-lang="en-US" l10n="NEW">In form controls, a spin button is a property of a numerical field, currency field, date field, or time field. If the property "Spin button" is enabled, the field shows a pair of symbols with arrows pointing to opposing directions, either vertically or horizontally.</paragraph>
</listitem>
@@ -76,15 +85,39 @@
<section id="kontextmenue">
<paragraph role="heading" id="hd_id3145129" xml-lang="en-US" level="2" l10n="U" oldref="42">Context Menu</paragraph>
<paragraph role="paragraph" id="par_id3156553" xml-lang="en-US" l10n="U" oldref="44"><variable id="context">To activate the context menu of an object, first click the object with the <switchinline select="sys"><caseinline select="MAC">
-</caseinline><defaultinline>left</defaultinline></switchinline> mouse button to select it, and then, <switchinline select="sys"><caseinline select="MAC">while holding down the Ctrl key or the Command and Option keys, click the mouse button again
-</caseinline><defaultinline>click the right mouse button</defaultinline></switchinline>. Some context menus can be called even if the object has not been selected. Context menus are found just about everywhere in $[officename].
-</variable></paragraph>
+</caseinline><defaultinline>left</defaultinline></switchinline> mouse button to select it, and then, <switchinline select="sys"><caseinline select="MAC">while holding down the Ctrl key or the Command and Option keys, click the mouse button again</caseinline><defaultinline> click the right mouse button</defaultinline></switchinline>. Some context menus can be called even if the object has not been selected. Context menus are found just about everywhere in $[officename].</variable></paragraph>
</section>
<section id="loeschen">
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_AUTOFORMAT:BTN_REMOVE" id="bm_id3153766" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_COLROWNAMERANGES:BTN_REMOVE" id="bm_id3153839" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_NAMES:BTN_REMOVE" id="bm_id3150089" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_DBNAMES:BTN_REMOVE" id="bm_id3146120" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_MD_GLOS_DELETE" id="bm_id3148722" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_REMOVE" id="bm_id3152577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_DELETE" id="bm_id3156382" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_DELETE" id="bm_id3148943" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_DELETE" id="bm_id3149762" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_DELETE" id="bm_id3148924" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE" id="bm_id3153717" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_DEL" id="bm_id3156007" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_DELETE" id="bm_id3143232" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_DELETE" id="bm_id3214514" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_DELETE" id="bm_id3145749" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_DELETE" id="bm_id3150443" localize="false"/>
<paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="2" l10n="U" oldref="24">Delete</paragraph>
<paragraph role="paragraph" id="par_id3153750" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid=".">Deletes the selected element or elements after confirmation.</ahelp></paragraph>
</section>
<section id="loeschen1">
+<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_REMOVE" id="bm_id3146916" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_REMOVE" id="bm_id3147296" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_BIB_BASE_PB_DELETE" id="bm_id6168401" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH" id="bm_id3154686" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE" id="bm_id3154821" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_REPLACE_PB_DELETE_REPLACE" id="bm_id7878353" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV" id="bm_id3154810" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS" id="bm_id3153257" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_DELABBREV" id="bm_id5413373" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_DELDOUBLECAPS" id="bm_id2580950" localize="false"/>
<paragraph role="heading" id="hd_id3147557" xml-lang="en-US" level="2" l10n="U" oldref="45">Delete</paragraph>
<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid=".">Deletes the selected element or elements without requiring confirmation.</ahelp></paragraph>
</section>
@@ -101,51 +134,95 @@
<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid=".">Closes the dialog.</ahelp></paragraph>
</section>
<section id="uebernehmen">
+<bookmark xml-lang="en-US" branch="hid/STARMATH_PUSHBUTTON_RID_SYMBOLDIALOG_2" id="bm_id3149053" localize="false"/>
<paragraph role="heading" id="hd_id3156113" xml-lang="en-US" level="2" l10n="U" oldref="16">Apply</paragraph>
<paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".">Applies the modified or selected values without closing the dialog.</ahelp></paragraph>
</section>
<section id="eingabesymbol">
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_PIVOT_LAYOUT:RB_OUTAREA" id="bm_id3155067" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_TABOP:RB_FORMULARANGE" id="bm_id3149785" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_TABOP:RB_ROWCELL" id="bm_id3149019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_TABOP:RB_COLCELL" id="bm_id3153712" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SOLVER:RB_FORMULACELL" id="bm_id3153364" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SOLVER:RB_VARCELL" id="bm_id3153363" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_COLROWNAMERANGES:RB_AREA" id="bm_id3149400" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_COLROWNAMERANGES:RB_DATA" id="bm_id3155962" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONSOLIDATE:RB_DATA_AREA" id="bm_id3145640" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONSOLIDATE:RB_DEST_AREA" id="bm_id3153713" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_AREAS:RB_PRINTAREA" id="bm_id3152596" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_AREAS:RB_REPEATROW" id="bm_id3146975" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_AREAS:RB_REPEATCOL" id="bm_id3154321" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND1_1" id="bm_id3155380" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND2_1" id="bm_id3150202" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_1" id="bm_id3150886" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND1_2" id="bm_id3150370" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND2_2" id="bm_id3150519" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_2" id="bm_id3155532" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_NAMES:RB_ASSIGN" id="bm_id3159155" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_DBNAMES:RB_DBAREA" id="bm_id3149262" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA" id="bm_id3153190" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_FORMULA:RB_REF" id="bm_id3154488" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF1" id="bm_id3146981" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF2" id="bm_id3146111" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF3" id="bm_id3146114" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_FAP_BTN_REF4" id="bm_id3156290" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_FILTER:RB_COPY_AREA" id="bm_id3150010" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SC:IMAGEBUTTON:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA" id="bm_id3146985" localize="false"/>
<paragraph role="heading" id="hd_id3153760" xml-lang="en-US" level="2" l10n="U" oldref="47">Shrink / Maximize</paragraph>
<paragraph role="paragraph" id="par_id3153087" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid=".">Click the<emph> Shrink </emph>icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the <emph>Maximize</emph> icon. Click it to restore the dialog to its original size.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3155062" xml-lang="en-US" l10n="U" oldref="49">The dialog is automatically minimized when you click into a sheet with the mouse. As soon as you release the mouse button, the dialog is restored and the reference range defined with the mouse is highlighted in the document by a blue frame.</paragraph>
<table id="tbl_id3148473">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3157808" xml-lang="en-US" l10n="E">
-<image id="img_id3148685" src="sc/res/refinp1.png" width="0.1327inch" height="0.1327inch"><alt id="alt_id3148685" xml-lang="en-US">Icon</alt>
+<image id="img_id3148685" src="sc/res/refinp1.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148685" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153321" xml-lang="en-US" l10n="U" oldref="50">Shrink</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153349" xml-lang="en-US" l10n="E">
-<image id="img_id3149784" src="sc/res/refinp2.png" width="0.1327inch" height="0.1327inch"><alt id="alt_id3149784" xml-lang="en-US">Icon</alt>
+<image id="img_id3149784" src="sc/res/refinp2.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149784" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="51">Maximize</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="vorschau">
+<bookmark xml-lang="en-US" branch="hid/HID_MEASURE_CTL_PREVIEW" id="bm_id3157970" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_PREVIEW" id="bm_id3153896" localize="false"/>
<paragraph role="heading" id="hd_id3156192" xml-lang="en-US" level="2" l10n="U" oldref="34">Preview Field</paragraph>
<paragraph role="paragraph" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid=".">Displays a preview of the current selection.</ahelp></paragraph>
</section>
<section id="weiterautopi">
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDNEXT" id="bm_id8281197" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDNEXT" id="bm_id3147576" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_NEXT" id="bm_id4154179" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DBWIZ_NEXT" id="bm_id1058076" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID0_NEXT" id="bm_id480666" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GROUPWIZARD_NEXT" id="bm_id3149095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDNEXT" id="bm_id3147576" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDNEXTORREADY" id="bm_id3154860" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_NEXT" id="bm_id3155135" localize="false"/>
<paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="2" l10n="U" oldref="70">Next</paragraph>
-<paragraph role="paragraph" id="par_id3152473" xml-lang="en-US" l10n="U" oldref="71"><ahelp hid=".">Click the<emph> Next </emph>button, and the Wizard uses the current dialog settings and proceeds to the next step. If you are on the last step, this button becomes <emph>Create</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3152473" xml-lang="en-US" l10n="U" oldref="71"><ahelp hid=".">Click the<emph> Next </emph>button, and the wizard uses the current dialog settings and proceeds to the next step. If you are on the last step, this button becomes <emph>Create</emph>.</ahelp></paragraph>
</section>
<section id="zurueck">
<bookmark xml-lang="en-US" branch="hid/OFFMGR_PUSHBUTTON_RID_OFADLG_OPTIONS_TREE_PB_BACK" id="bm_id3144422" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFADLG_OPTIONS_TREE_PB_BACK" id="bm_id4539933" localize="false"/><paragraph role="heading" id="hd_id3149670" xml-lang="en-US" level="2" l10n="U" oldref="13">Back<comment>in Tools - Options</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFADLG_OPTIONS_TREE_PB_BACK" id="bm_id4539933" localize="false"/>
+<paragraph role="heading" id="hd_id3149670" xml-lang="en-US" level="2" l10n="U" oldref="13">Back<comment>in Tools - Options</comment></paragraph>
<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="OFFMGR_PUSHBUTTON_RID_OFADLG_OPTIONS_TREE_PB_BACK">Resets modified values back to the $[officename] default values.</ahelp></paragraph>
</section>
<section id="zurueck2">
-<bookmark xml-lang="en-US" branch="hid/HID_TABDLG_RESET_BTN" id="bm_id3151054" localize="false"/><paragraph role="heading" id="hd_id3148755" xml-lang="en-US" level="2" l10n="U" oldref="59">Reset<comment>all tab dialogs</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_TABDLG_RESET_BTN" id="bm_id3151054" localize="false"/>
+<paragraph role="heading" id="hd_id3148755" xml-lang="en-US" level="2" l10n="U" oldref="59">Reset<comment>all tab dialogs</comment></paragraph>
<paragraph role="paragraph" id="par_id3149651" xml-lang="en-US" l10n="U" oldref="60"><ahelp hid="HID_TABDLG_RESET_BTN">Resets changes made to the current tab to those applicable when this dialog was opened. A confirmation query does not appear when you close the dialog.</ahelp></paragraph>
</section>
<section id="zuruecksetzen">
@@ -155,11 +232,21 @@
</section>
<section id="standard">
<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_STD_FONT_PB_STANDARD" id="bm_id481887" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_TABDLG_STANDARD_BTN" id="bm_id3157322" localize="false"/><paragraph role="heading" id="hd_id3145173" xml-lang="en-US" level="2" l10n="U" oldref="10">Standard<comment>e.g. in Format - Para Style</comment><comment>UFI: Name is Default on Tools-Options-Writer-Basic Fonts</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_TABDLG_STANDARD_BTN" id="bm_id3157322" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_DLG_COPY_BTN_SET_DEFAULT" id="bm_id3083280" localize="false"/>
+<paragraph role="heading" id="hd_id3145173" xml-lang="en-US" level="2" l10n="U" oldref="10">Standard<comment>e.g. in Format - Para Style</comment><comment>UFI: Name is Default on Tools-Options-Writer-Basic Fonts</comment></paragraph>
<paragraph role="paragraph" id="par_id3154153" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_TABDLG_STANDARD_BTN">Resets the values visible in the dialog back to the default installation values.</ahelp></paragraph>
<paragraph role="warning" id="par_id3154299" xml-lang="en-US" l10n="U" oldref="12">A confirmation does not appear before the defaults are reloaded.</paragraph>
</section>
<section id="zurueckautopi">
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDPREV" id="bm_id1064180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_BACK" id="bm_id3681447" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DBWIZ_PREVIOUS" id="bm_id5176244" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID0_PREV" id="bm_id1207617" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GROUPWIZARD_PREVIOUS" id="bm_id3154318" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDPREV" id="bm_id3145346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDPREV" id="bm_id3150984" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_PREVIOUS" id="bm_id3156155" localize="false"/>
<paragraph role="heading" id="hd_id3147502" xml-lang="en-US" level="2" l10n="U" oldref="72">Back</paragraph>
<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid="HID_TABDLG_STANDARD_BTN">View the selections in the dialog made in the previous step. The current settings remain unchanged.</ahelp> This button can only be activated from page two on.</paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/00/00000005.xhp b/helpcontent2/source/text/shared/00/00000005.xhp
index c6c75fe7d7..d56be6eafa 100755
--- a/helpcontent2/source/text/shared/00/00000005.xhp
+++ b/helpcontent2/source/text/shared/00/00000005.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000005.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -118,20 +118,17 @@
<paragraph xml-lang="en-US" id="hd_id3150439" role="heading" level="2" l10n="U" oldref="156">Direct and Style Formatting</paragraph>
<paragraph xml-lang="en-US" id="par_id3159254" role="paragraph" l10n="U" oldref="34">If you format a document without Styles, it is referred to as "direct" formatting. This means modifying text or other objects, such as frames or tables, by applying various attributes directly. The format applies only to the selected area and all changes must be made separately. Styles, on the other hand, are not applied to the text directly, but rather are defined in the Styles and Formatting window and then applied. One advantage is that when you change a Style, all parts of the document to which that Style is assigned are modified at the same time.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3147287" role="paragraph" l10n="CHG" oldref="35">You can remove direct formatting from your document by selecting the entire text with the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A and then choosing <emph>Format - Default Formatting</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147287" role="paragraph" l10n="CHG" oldref="35">You can remove direct formatting from your document by selecting the entire text with the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A and then choosing <emph>Format - Default Formatting</emph>.</paragraph>
</section>
<section id="andocken">
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id3155132"><bookmark_value>windows; docking definition</bookmark_value>
<bookmark_value>docking; definition</bookmark_value>
</bookmark>
<paragraph xml-lang="en-US" id="hd_id3155132" role="heading" level="2" l10n="U" oldref="6">Docking</paragraph>
<paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="CHG" oldref="7"><variable id="andock1">Some windows in $[officename], for example the Styles and Formatting window and the Navigator, are "dockable" windows. You can move these windows, re-size them or dock them to an edge. On each edge you can dock several windows on top of, or alongside each other; then, by moving the border lines, you can change the relative proportions of the windows.
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147233" role="paragraph" l10n="CHG" oldref="127"><variable id="andock2">To undock and re-dock, holding down the Ctrl key, double-click a vacant area in the window. In the Styles and Formatting window, you can also double-click a gray part of the window next to the icons, while you hold down the Ctrl key.
+ <paragraph xml-lang="en-US" id="par_id3147233" role="paragraph" l10n="CHG" oldref="127"><variable id="andock2">To undock and re-dock, holding down the Ctrl key, double-click a vacant area in the window. In the Styles and Formatting window, you can also double-click a gray part of the window next to the icons, while you hold down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key.
</variable></paragraph>
</section>
@@ -290,7 +287,6 @@
</section>
<section id="drehfeld">
- <paragraph xml-lang="en-US" id="par_idN1109D" role="heading" level="2" l10n="CHG">Spin Button</paragraph>
<embed href="text/shared/00/00000001.xhp#drehfeld"/>
</section>
diff --git a/helpcontent2/source/text/shared/00/00000021.xhp b/helpcontent2/source/text/shared/00/00000021.xhp
index a3c29d93ea..77d406e68e 100755
--- a/helpcontent2/source/text/shared/00/00000021.xhp
+++ b/helpcontent2/source/text/shared/00/00000021.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: 00000021.xhp,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.23.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +37,7 @@
<meta>
-<topic id="textshared0000000021xml" indexer="include">
+<topic id="textshared0000000021xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">XML File Formats</title>
<filename>/text/shared/00/00000021.xhp</filename>
</topic>
@@ -176,14 +176,6 @@
</tablerow>
<tablerow>
<tablecell>
-<paragraph role="tablecontent" id="par_id9824823" xml-lang="en-US" l10n="NEW">ODF Database Report</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id2716452" xml-lang="en-US" l10n="NEW">*.orp</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
<paragraph role="tablecontent" id="par_id9756157" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Extension</paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/00/00000401.xhp b/helpcontent2/source/text/shared/00/00000401.xhp
index 5118e54e8d..560fec4726 100644
--- a/helpcontent2/source/text/shared/00/00000401.xhp
+++ b/helpcontent2/source/text/shared/00/00000401.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000401.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.3 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0000000401xml" indexer="exclude" status="PUBLISH">
+<topic id="textshared0000000401xml" indexer="exclude">
<title id="tit" xml-lang="en-US">File Menu</title>
<filename>/text/shared/00/00000401.xhp</filename>
</topic>
@@ -54,25 +52,24 @@
<section id="neutextdoc">
<table id="tbl_id3149741">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150127" xml-lang="en-US" l10n="E">
-<image id="img_id3156053" src="res/sx03251.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156053" xml-lang="en-US">Icon</alt>
+<image id="img_id3156053" src="res/sx03251.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156053" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154232" xml-lang="en-US" l10n="U" oldref="199">New</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
-<paragraph role="paragraph" id="par_id3154894" xml-lang="en-US" l10n="U" oldref="179">Key <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
+<paragraph role="paragraph" id="par_id3154894" xml-lang="en-US" l10n="U" oldref="179">Key <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
</section>
<section id="neuvundd">
<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="U" oldref="82">Menu <emph>File - New</emph>
<emph>- Templates and Documents</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="U" oldref="187">Key Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
+<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="U" oldref="187">Key Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
</section>
<paragraph role="paragraph" id="par_id3149798" xml-lang="en-US" l10n="U" oldref="160"><variable id="etiketten">Choose <emph>File - New - Labels</emph>
</variable></paragraph>
@@ -99,22 +96,22 @@
<section id="oeffnen">
<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>File - Open</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3152944" xml-lang="en-US" l10n="U" oldref="83"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+O</paragraph>
+<paragraph role="paragraph" id="par_id3152944" xml-lang="en-US" l10n="U" oldref="83"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+O</paragraph>
<paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="U" oldref="8">On the <emph>Standard</emph> Bar, click</paragraph>
<section id="syoeffnen">
<table id="tbl_id3150117">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="E">
-<image id="img_id3149415" src="res/commandimagelist/sc_open.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149415" xml-lang="en-US">Icon</alt>
+<image id="img_id3149415" src="res/commandimagelist/sc_open.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149415" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156003" xml-lang="en-US" l10n="U" oldref="9">Open File</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="ascii">
@@ -135,7 +132,8 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="CHG" oldref="115"><variable id="autopilotbrief5">Choose <emph>File - Wizards - Letter - Footer</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154224" xml-lang="en-US" l10n="CHG" oldref="116"><variable id="autopilotbrief6">Choose <emph>File - Wizards - Letter - Name and Location</emph>
+<paragraph role="paragraph" id="par_id3154224" xml-lang="en-US" l10n="CHG" oldref="116"><variable id="autopilotbrief6">Choose <emph>File - Wizards - Letter - </emph>
+<emph>Name and Location</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="120"><variable id="autopilotfax">Choose <emph>File - Wizards - Fax</emph>
</variable></paragraph>
@@ -219,37 +217,38 @@
<section id="save">
<paragraph role="paragraph" id="par_id3156717" xml-lang="en-US" l10n="U" oldref="10">Choose <emph>File - Save</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3147533" xml-lang="en-US" l10n="U" oldref="84"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S</paragraph>
+<paragraph role="paragraph" id="par_id3147533" xml-lang="en-US" l10n="U" oldref="84"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S</paragraph>
<paragraph role="paragraph" id="par_id3148930" xml-lang="en-US" l10n="CHG" oldref="11">On Standard or Table Data Bar, click</paragraph>
<section id="sysave">
<table id="tbl_id3150120">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156712" xml-lang="en-US" l10n="E">
-<image id="img_id3155939" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155939" xml-lang="en-US">Icon</alt>
+<image id="img_id3155939" src="res/commandimagelist/sc_save.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155939" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149109" xml-lang="en-US" l10n="CHG" oldref="12">Save</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="sysaveas">
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN10F11" xml-lang="en-US" l10n="NEW">
-<image id="img_id8276619" src="res/commandimagelist/sc_saveas.png" width="0.222inch" height="0.222inch"><alt id="alt_id8276619" xml-lang="en-US">icon</alt>
+<image id="img_id8276619" src="res/commandimagelist/sc_saveas.png" width="0.566cm" height="0.566cm"><alt id="alt_id8276619" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN10F2E" xml-lang="en-US" l10n="NEW">Save As</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<paragraph role="paragraph" id="par_id3154964" xml-lang="en-US" l10n="U" oldref="78"><variable id="gifspeichern">Choose <emph>File - Save As</emph>, if GIF selected as file type, dialog opens automatically
</variable></paragraph>
@@ -303,7 +302,7 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3150662" xml-lang="en-US" l10n="U" oldref="63"><variable id="info3">Choose <emph>File - Properties - Description</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153792" xml-lang="en-US" l10n="U" oldref="64"><variable id="info4">Choose <emph>File - Properties - User Defined</emph> tab
+<paragraph role="paragraph" id="par_id3153792" xml-lang="en-US" l10n="CHG" oldref="64"><variable id="info4">Choose <emph>File - Properties - Custom Properties</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153701" xml-lang="en-US" l10n="U" oldref="65"><variable id="info5">Choose <emph>File - Properties - Statistics</emph> tab
</variable></paragraph>
@@ -319,7 +318,7 @@
</paragraph>
</section>
<section id="voradzuadmi">
-<paragraph role="paragraph" id="par_id3154386" xml-lang="en-US" l10n="U" oldref="177">Menu <emph>File - Templates - Address Book Source, </emph>then <emph>Administrate</emph> button</paragraph>
+<paragraph role="paragraph" id="par_id3154386" xml-lang="en-US" l10n="U" oldref="177">Menu <emph>File - Templates - Address Book Source, </emph>then <emph>Configure</emph> button</paragraph>
<paragraph role="paragraph" id="par_id3154323" xml-lang="en-US" l10n="CHG" oldref="189"><switchinline select="appl"><caseinline select="WRITER">Choose <emph>View</emph> - <emph>Data sources</emph>
</caseinline><caseinline select="CALC">Choose <emph>View</emph> - <emph>Data sources</emph>
</caseinline></switchinline></paragraph>
@@ -334,16 +333,17 @@
<section id="syansicht">
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11366" xml-lang="en-US" l10n="NEW">
-<image id="img_id2603534" src="res/commandimagelist/sc_printpreview.png" width="0.222inch" height="0.222inch"><alt id="alt_id2603534" xml-lang="en-US">icon</alt>
+<image id="img_id2603534" src="res/commandimagelist/sc_printpreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id2603534" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11384" xml-lang="en-US" l10n="NEW">Page Preview</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="drucker">
@@ -360,16 +360,17 @@
<section id="sysendmail">
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN113AB" xml-lang="en-US" l10n="NEW">
-<image id="img_id4044007" src="res/commandimagelist/sc_sendmail.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id4044007" xml-lang="en-US">icon</alt>
+<image id="img_id4044007" src="res/commandimagelist/sc_sendmail.png" width="0.566cm" height="0.566cm"><alt id="alt_id4044007" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN113C8" xml-lang="en-US" l10n="NEW">Document as E-mail</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3145269" xml-lang="en-US" l10n="U" oldref="222"><variable id="export">Choose <emph>File - Export</emph>
@@ -380,16 +381,17 @@
<section id="syexportpdf">
<table id="tbl_id3154992">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150521" xml-lang="en-US" l10n="E">
-<image id="img_id3147306" src="res/commandimagelist/sc_exportdirecttopdf.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147306" xml-lang="en-US">Icon</alt>
+<image id="img_id3147306" src="res/commandimagelist/sc_exportdirecttopdf.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147306" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155763" xml-lang="en-US" l10n="U" oldref="220">Export Directly as PDF</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="pdf">
@@ -401,45 +403,47 @@
<section id="drucken">
<paragraph role="paragraph" id="par_id3149951" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>File - Print</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3155259" xml-lang="en-US" l10n="U" oldref="85"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+P</paragraph>
+<paragraph role="paragraph" id="par_id3155259" xml-lang="en-US" l10n="U" oldref="85"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+P</paragraph>
<paragraph role="paragraph" id="par_id3153830" xml-lang="en-US" l10n="U" oldref="3">On Standard Bar, click</paragraph>
<section id="sydrucken">
<table id="tbl_id3152889">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155187" xml-lang="en-US" l10n="E">
-<image id="img_id3153318" src="res/commandimagelist/sc_print.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153318" xml-lang="en-US">Icon</alt>
+<image id="img_id3153318" src="res/commandimagelist/sc_print.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153318" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151268" xml-lang="en-US" l10n="U" oldref="4">Print File Directly</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<switch select="appl">
-<case select="WRITER"><paragraph role="paragraph" id="par_id3153581" xml-lang="en-US" l10n="U" oldref="5">On the <emph>Page View</emph>
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id3153581" xml-lang="en-US" l10n="U" oldref="5">On the <emph>Page View</emph>
<emph>Bar</emph> of a text document, click</paragraph>
<table id="tbl_id3150699">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153068" xml-lang="en-US" l10n="E">
-<image id="img_id3155362" src="res/commandimagelist/sc_printpagepreview.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155362" xml-lang="en-US">Icon</alt>
+<image id="img_id3155362" src="res/commandimagelist/sc_printpagepreview.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155362" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151239" xml-lang="en-US" l10n="U" oldref="6">Print Page Preview</paragraph>
</tablecell>
</tablerow>
</table>
+
</case>
-</switch></section>
+</switch>
+</section>
<section id="beenden">
<paragraph role="paragraph" id="par_id3155869" xml-lang="en-US" l10n="U" oldref="72">Choose <emph>File - Exit</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3152382" xml-lang="en-US" l10n="U" oldref="86"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Q</paragraph>
+<paragraph role="paragraph" id="par_id3152382" xml-lang="en-US" l10n="U" oldref="86"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Q</paragraph>
</section>
<paragraph role="paragraph" id="par_id3149328" xml-lang="en-US" l10n="U" oldref="75"><variable id="neuglobal">Choose <emph>File - New - Master Document</emph>
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000402.xhp b/helpcontent2/source/text/shared/00/00000402.xhp
index f2f1bf335c..96a06dd7c1 100644
--- a/helpcontent2/source/text/shared/00/00000402.xhp
+++ b/helpcontent2/source/text/shared/00/00000402.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000402.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -47,8 +47,7 @@
<section id="do">
<paragraph role="paragraph" id="par_id3085157" xml-lang="en-US" l10n="U" oldref="2">Choose <emph>Edit - Undo</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3145160" xml-lang="en-US" l10n="U" oldref="564"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z</paragraph>
+<paragraph role="paragraph" id="par_id3145160" xml-lang="en-US" l10n="U" oldref="564"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z</paragraph>
<paragraph role="paragraph" id="par_id3154094" xml-lang="en-US" l10n="CHG" oldref="3">On the <emph>Standard</emph> Bar or Table Data bar, click</paragraph>
<section id="syrueckgaengig">
<table id="tbl_id3145226">
@@ -91,8 +90,7 @@
<section id="cut">
<paragraph role="paragraph" id="par_id3149765" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Edit - Cut</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3144762" xml-lang="en-US" l10n="U" oldref="565"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+X</paragraph>
+<paragraph role="paragraph" id="par_id3144762" xml-lang="en-US" l10n="U" oldref="565"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+X</paragraph>
<paragraph role="paragraph" id="par_id3148744" xml-lang="en-US" l10n="U" oldref="10">On the <emph>Standard</emph> Bar, click</paragraph>
<section id="syausschneiden">
<table id="tbl_id3154218">
@@ -113,8 +111,7 @@
<section id="copy">
<paragraph role="paragraph" id="par_id3150742" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Edit - Copy</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3148923" xml-lang="en-US" l10n="U" oldref="566"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C</paragraph>
+<paragraph role="paragraph" id="par_id3148923" xml-lang="en-US" l10n="U" oldref="566"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C</paragraph>
<paragraph role="paragraph" id="par_id3159254" xml-lang="en-US" l10n="U" oldref="13">On the <emph>Standard</emph> Bar, click</paragraph>
<section id="sykopieren">
<table id="tbl_id3147299">
@@ -135,8 +132,7 @@
<section id="insert">
<paragraph role="paragraph" id="par_id3159153" xml-lang="en-US" l10n="U" oldref="15">Choose <emph>Edit - Paste</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="567"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V</paragraph>
+<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="567"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V</paragraph>
<paragraph role="paragraph" id="par_id3159083" xml-lang="en-US" l10n="U" oldref="16">On the <emph>Standard</emph> Bar, click</paragraph>
<section id="syeinfuegen">
<table id="tbl_id3147217">
@@ -159,8 +155,7 @@
<section id="alles">
<paragraph role="paragraph" id="par_id3148555" xml-lang="en-US" l10n="U" oldref="533">Choose <emph>Edit - Select All</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3152417" xml-lang="en-US" l10n="U" oldref="568"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A</paragraph>
+<paragraph role="paragraph" id="par_id3152417" xml-lang="en-US" l10n="U" oldref="568"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A</paragraph>
<section id="syallesau">
<table id="tbl_id3145271">
<tablerow>
@@ -206,8 +201,7 @@
<section id="suchen">
<paragraph role="paragraph" id="par_id3156297" xml-lang="en-US" l10n="U" oldref="49">Choose <emph>Edit - Find &amp; Replace</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3154503" xml-lang="en-US" l10n="U" oldref="569"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F</paragraph>
+<paragraph role="paragraph" id="par_id3154503" xml-lang="en-US" l10n="U" oldref="569"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F</paragraph>
<paragraph role="paragraph" id="par_id3155083" xml-lang="en-US" l10n="U" oldref="456">On Standard bar, click</paragraph>
<section id="sysuchenersetzen">
<table id="tbl_id3156320">
diff --git a/helpcontent2/source/text/shared/00/00000403.xhp b/helpcontent2/source/text/shared/00/00000403.xhp
index 9aba456396..497c8b5bda 100644
--- a/helpcontent2/source/text/shared/00/00000403.xhp
+++ b/helpcontent2/source/text/shared/00/00000403.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000403.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -83,8 +83,7 @@
<section id="ganzer">
<paragraph role="paragraph" id="par_id3159269" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>View - Full Screen</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="25">Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+J</paragraph>
+<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="25">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+J</paragraph>
<switch select="appl">
<case select="WRITER">
<section id="syfullscreen">
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index 91f1196cfa..1416163299 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000406.xhp,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.4.4 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0000000406xml" indexer="exclude" status="PUBLISH">
+<topic id="textshared0000000406xml" indexer="exclude">
<title id="tit" xml-lang="en-US">Tools Menu</title>
<filename>/text/shared/00/00000406.xhp</filename>
</topic>
@@ -49,38 +47,40 @@
<section id="sygallery">
<table id="tbl_id3147273">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="E">
-<image id="img_id3154894" src="res/commandimagelist/sc_gallery.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154894" xml-lang="en-US">Icon</alt>
+<image id="img_id3154894" src="res/commandimagelist/sc_gallery.png" width="0.1665in" height="0.1665in"><alt id="alt_id3154894" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153551" xml-lang="en-US" l10n="U" oldref="127">Gallery</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="130"><variable id="galleryregisterdateien">Choose <emph>Tools - Gallery</emph> or click the <emph>Gallery </emph>icon on the <emph>Standard</emph> Bar - <emph>New Theme</emph> button - <emph>Files</emph> tab
</variable></paragraph>
<section id="rechtschreibung">
-<paragraph role="paragraph" id="par_id3166411" xml-lang="en-US" l10n="CHG" oldref="2">Choose <emph>Tools - Spellcheck</emph>
+<paragraph role="paragraph" id="par_id3166411" xml-lang="en-US" l10n="CHG" oldref="2">Choose <emph>Tools - Spelling and Grammar</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="69">F7 key</paragraph>
<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="CHG" oldref="3">On <emph>Standard</emph> bar, click</paragraph>
<section id="syrechtschreibung">
<table id="tbl_id3150117">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="E">
-<image id="img_id3153665" src="res/commandimagelist/sc_spelling.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153665" xml-lang="en-US">Icon</alt>
+<image id="img_id3153665" src="res/commandimagelist/sc_spelling.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153665" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3157809" xml-lang="en-US" l10n="U" oldref="4">Spellcheck</paragraph>
+<tablecell>
+<paragraph role="paragraph" id="par_id3157809" xml-lang="en-US" l10n="U" oldref="4">Spelling and Grammar</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="CHG" oldref="164"><variable id="hangul">Choose <emph>Tools - Language - Hangul/Hanja Conversion</emph> (Asian language support must be enabled)
@@ -89,9 +89,9 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1071E" xml-lang="en-US" l10n="NEW"><variable id="chineseedit">Choose <emph>Tools - Language - Chinese Translation</emph> (Asian language support must be enabled) - <emph>Edit terms</emph> button
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="5"><variable id="rechtschreibungmenue">Choose <emph>Tools - Spellcheck</emph>
+<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="5"><variable id="rechtschreibungmenue">Choose <emph>Tools - Spelling and Grammar</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="CHG" oldref="7"><variable id="zoptionen">Choose <emph>Tools - Spellcheck</emph>, then click <emph>Options</emph>
+<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="CHG" oldref="7"><variable id="zoptionen">Choose <emph>Tools - Spelling and Grammar</emph>, then click <emph>Options</emph>
</variable></paragraph>
<section id="thesaurus">
<paragraph role="paragraph" id="par_id3151338" xml-lang="en-US" l10n="CHG" oldref="8">Choose <emph>Tools - Language - Thesaurus</emph>
@@ -104,7 +104,8 @@
</section>
<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="NEW"><variable id="mediaplayer">Choose <emph>Tools - Media Player</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="CHG" oldref="13"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, or press <item type="keycode">Alt+F11</item> (if not assigned by your system)
+<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="CHG" oldref="13"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, or press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+F11 (if not assigned by your system)
</variable></paragraph>
<section id="recordmacro">
<paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="155">Choose <emph>Tools - Macros - Record Macro</emph>
@@ -130,7 +131,7 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10919" xml-lang="en-US" l10n="NEW"><variable id="menuemove">Choose <emph>Tools - Customize - Menu</emph> tab, click <emph>Menu - Move</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="CHG" oldref="129"><variable id="tastatur">Choose <emph>Tools - Customize - Keyboard</emph> tab
+<paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="CHG" oldref="129"><variable id="tastatur">Choose <emph>Tools - Customize - Keyboard</emph> tab (a document must be opened)
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="CHG" oldref="19"><variable id="symbole">Choose <emph>Tools - Customize - Toolbars</emph> tab
</variable></paragraph>
@@ -139,7 +140,7 @@
<paragraph role="paragraph" id="par_id3157895" xml-lang="en-US" l10n="U" oldref="50"><variable id="autokorr">Choose <emph>Tools - AutoCorrect</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="51"><variable id="autokooptionen">Choose <emph>Tools - AutoCorrect</emph>
-<emph>- Options</emph> tab
+<emph>- Options</emph>tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id1978514" xml-lang="en-US" l10n="NEW"><variable id="autokosmarttags">Choose Tools - AutoCorrect- Smart Tags tab
</variable></paragraph>
@@ -198,16 +199,17 @@
<section id="farbdial">
<table id="tbl_id3152374">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153876" xml-lang="en-US" l10n="E">
-<image id="img_id3148386" src="svx/res/colordlg.png" width="0.1661inch" height="0.1661inch"><alt id="alt_id3148386" xml-lang="en-US">Icon</alt>
+<image id="img_id3148386" src="svx/res/colordlg.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148386" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151037" xml-lang="en-US" l10n="U" oldref="68">Select color on the <emph>Color</emph> tab page</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<paragraph role="paragraph" id="par_id3149403" xml-lang="en-US" l10n="U" oldref="72"><variable id="schriers">Choose <emph>Tools - Options - $[officename] - Fonts</emph>
@@ -230,7 +232,8 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="122"><variable id="etsofi2">Choose <emph>Tools - Options - Load/Save</emph> - <emph>Microsoft Office</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145667" xml-lang="en-US" l10n="U" oldref="49"><variable id="html">Choose <emph>Tools - Options - Load/Save</emph> - <emph>HTML Compatibility</emph>
+<paragraph role="paragraph" id="par_id3145667" xml-lang="en-US" l10n="U" oldref="49"><variable id="html">Choose <emph>Tools - Options - Load/Save</emph> - <emph>HTML </emph>
+<emph>Compatibility</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3146792" xml-lang="en-US" l10n="U" oldref="132"><variable id="asiatypo">Choose <emph>Tools - Options - Language Settings</emph>
</variable></paragraph>
@@ -282,7 +285,7 @@
</section>
<paragraph role="paragraph" id="par_id3155607" xml-lang="en-US" l10n="CHG" oldref="98"><variable id="drucken1">Choose <emph>Tools - Options - %PRODUCTNAME Writer/ %PRODUCTNAME Writer/Web </emph>- <emph>Print</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3988769" xml-lang="en-US" l10n="NEW"><variable id="drucken2">Choose Tools - Options - %PRODUCTNAME Calc - Print
+<paragraph role="paragraph" id="par_id3988769" xml-lang="en-US" l10n="NEW"><variable id="drucken2">Choose Tools - Options - %PRODUCTNAME Calc - Print
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145769" xml-lang="en-US" l10n="U" oldref="99"><variable id="registertabelle">Choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web - Table</emph>
</variable></paragraph>
@@ -304,7 +307,8 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3149527" xml-lang="en-US" l10n="U" oldref="83"><variable id="listekopieren">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists - Copy</emph> button
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154903" xml-lang="en-US" l10n="U" oldref="85"><variable id="exopaen">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Changes</emph>
+<paragraph role="paragraph" id="par_id3154903" xml-lang="en-US" l10n="U" oldref="85"><variable id="exopaen">Open a spreadsheet document, choose <emph>Tools - </emph>
+<emph>Options - %PRODUCTNAME Calc - Changes</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3152582" xml-lang="en-US" l10n="U" oldref="140"><variable id="etotall">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress</emph>
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00040501.xhp b/helpcontent2/source/text/shared/00/00040501.xhp
index 17709de810..1ab3dfc39d 100644
--- a/helpcontent2/source/text/shared/00/00040501.xhp
+++ b/helpcontent2/source/text/shared/00/00040501.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00040501.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -275,8 +275,7 @@
<section id="vorn">
<paragraph role="paragraph" id="par_id3148459" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>Format - Arrange - Bring to Front</emph> ($[officename] Writer, $[officename] Calc)</paragraph>
<paragraph role="paragraph" id="par_id3148425" xml-lang="en-US" l10n="U" oldref="10">Choose <emph>Modify - Arrange - Bring to Front</emph> ($[officename] Draw)</paragraph>
-<paragraph role="paragraph" id="par_id3153268" xml-lang="en-US" l10n="U" oldref="89">Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+plus sign ($[officename] Impress, $[officename] Draw)</paragraph>
+<paragraph role="paragraph" id="par_id3153268" xml-lang="en-US" l10n="U" oldref="89">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+plus sign ($[officename] Impress, $[officename] Draw)</paragraph>
<paragraph role="paragraph" id="par_id3154206" xml-lang="en-US" l10n="U" oldref="126">Open context menu - choose <emph>Arrange - Bring to Front</emph> ($[officename] Impress)</paragraph>
<section id="syganznachvorn">
<table id="tbl_id3150306">
@@ -297,8 +296,7 @@
<section id="nachvorn">
<paragraph role="paragraph" id="par_id3147092" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Format - Arrange - Bring Forward</emph> ($[officename] Writer, $[officename] Calc)</paragraph>
<paragraph role="paragraph" id="par_id3148396" xml-lang="en-US" l10n="U" oldref="14">Choose <emph>Modify - Arrange - Bring Forward</emph> ($[officename] Draw)</paragraph>
-<paragraph role="paragraph" id="par_id3149528" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+plus sign ($[officename] Impress, $[officename] Draw)</paragraph>
+<paragraph role="paragraph" id="par_id3149528" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+plus sign ($[officename] Impress, $[officename] Draw)</paragraph>
<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US" l10n="U" oldref="127">Open context menu - choose <emph>Arrange - Bring Forward</emph> ($[officename] Impress)</paragraph>
<table id="tbl_id3149337">
<tablerow>
@@ -317,8 +315,7 @@
<section id="nachhinten">
<paragraph role="paragraph" id="par_id3154815" xml-lang="en-US" l10n="U" oldref="15">Choose <emph>Format - Arrange - Send Backward</emph> ($[officename] Writer, $[officename] Calc)</paragraph>
<paragraph role="paragraph" id="par_id3150428" xml-lang="en-US" l10n="U" oldref="16">Choose <emph>Modify - Arrange - Send Backward</emph> ($[officename] Draw)</paragraph>
-<paragraph role="paragraph" id="par_id3156064" xml-lang="en-US" l10n="U" oldref="91"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+minus sign ($[officename] Impress, $[officename] Draw)</paragraph>
+<paragraph role="paragraph" id="par_id3156064" xml-lang="en-US" l10n="U" oldref="91"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+minus sign ($[officename] Impress, $[officename] Draw)</paragraph>
<paragraph role="paragraph" id="par_id3159107" xml-lang="en-US" l10n="U" oldref="128">Open context menu - choose <emph>Arrange - Send Backward</emph> ($[officename] Impress)</paragraph>
<table id="tbl_id3154131">
<tablerow>
@@ -337,8 +334,7 @@
<section id="ganzhinten">
<paragraph role="paragraph" id="par_id3149493" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Format - Arrange - Send to Back</emph> ($[officename] Writer, $[officename] Calc)</paragraph>
<paragraph role="paragraph" id="par_id3148595" xml-lang="en-US" l10n="U" oldref="18">Choose <emph>Modify - Arrange - Send to Back</emph> ($[officename] Draw)</paragraph>
-<paragraph role="paragraph" id="par_id3150690" xml-lang="en-US" l10n="U" oldref="92">Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+minus sign ($[officename] Impress, $[officename] Draw)</paragraph>
+<paragraph role="paragraph" id="par_id3150690" xml-lang="en-US" l10n="U" oldref="92">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+minus sign ($[officename] Impress, $[officename] Draw)</paragraph>
<paragraph role="paragraph" id="par_id3154486" xml-lang="en-US" l10n="U" oldref="129">Open context menu - choose <emph>Arrange - Send to Back</emph> ($[officename] Impress)</paragraph>
<section id="syganznachhinten">
<table id="tbl_id3156169">
diff --git a/helpcontent2/source/text/shared/00/makefile.mk b/helpcontent2/source/text/shared/00/makefile.mk
index fe983d0be1..a9c8e493ad 100644
--- a/helpcontent2/source/text/shared/00/makefile.mk
+++ b/helpcontent2/source/text/shared/00/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.9.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/01/01010100.xhp b/helpcontent2/source/text/shared/01/01010100.xhp
index 9ad8c70b56..ea9b5c99c3 100644
--- a/helpcontent2/source/text/shared/01/01010100.xhp
+++ b/helpcontent2/source/text/shared/01/01010100.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01010100.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -56,7 +56,7 @@
</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="126">Press Shift+Ctrl+N.</paragraph>
+<paragraph role="listitem" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="126">Press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N.</paragraph>
</listitem>
</list>
</section>
diff --git a/helpcontent2/source/text/shared/01/01020000.xhp b/helpcontent2/source/text/shared/01/01020000.xhp
index 02a1022902..ecaa6f6d49 100644
--- a/helpcontent2/source/text/shared/01/01020000.xhp
+++ b/helpcontent2/source/text/shared/01/01020000.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01020000.xhp,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -88,8 +88,7 @@
<embed href="text/shared/00/00000004.xhp#systandardverzeichnis2"/>
<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_STANDARD" id="bm_id3150355" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="19">Display area</paragraph>
<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_FILEDLG_STANDARD">Displays the files and directories in the directory that you are in.</ahelp> To open a file, select the file, and then click <emph>Open</emph>.</paragraph>
-<paragraph role="tip" id="par_id3159256" xml-lang="en-US" l10n="CHG" oldref="78">To open more than one document at the same time, each in an own window, hold <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you click the files, and then click <emph>Open</emph>.</paragraph>
+<paragraph role="tip" id="par_id3159256" xml-lang="en-US" l10n="CHG" oldref="78">To open more than one document at the same time, each in an own window, hold <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you click the files, and then click <emph>Open</emph>.</paragraph>
<list type="unordered">
<listitem>
<paragraph role="listitem" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="110">Click a column header to sort the files. Click again to reverse the sort order.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01050000.xhp b/helpcontent2/source/text/shared/01/01050000.xhp
index 639b8dbde5..c29b1ba121 100644
--- a/helpcontent2/source/text/shared/01/01050000.xhp
+++ b/helpcontent2/source/text/shared/01/01050000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01050000.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0101050000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0101050000xml" indexer="include">
<title id="tit" xml-lang="en-US">Close</title>
<filename>/text/shared/01/01050000.xhp</filename>
</topic>
@@ -49,16 +47,18 @@
<bookmark_value>backing window</bookmark_value>
</bookmark><comment>mw made "closing..." a two level entry</comment>
<bookmark xml-lang="en-US" branch="hid/SID_CLOSEDOC" id="bm_id5360279" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:CloseDoc" id="bm_id3150702" localize="false"/><paragraph role="heading" id="hd_id3154545" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01050000.xhp" name="Close">Close</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:CloseDoc" id="bm_id3150702" localize="false"/>
+<paragraph role="heading" id="hd_id3154545" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01050000.xhp" name="Close">Close</link></paragraph>
<paragraph role="paragraph" id="par_id3148731" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CloseDoc">Closes the current document without exiting the program.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#schliessen"/>
</section>
-<paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="CHG" oldref="8">When you close the last open document window, a window with some icons to start new documents stays open. You can click some other icons to browse to featured web sites using your default web browser.<comment>name of this window (StartCenter?) currently subject of discussion.</comment></paragraph>
<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="7">The <emph>Close </emph>command closes all of the open windows for the current document.</paragraph>
-<paragraph role="paragraph" id="par_id3148620" xml-lang="en-US" l10n="U" oldref="4">If you have made changes to the current document, you are prompted if you want to <link href="text/shared/01/01060000.xhp" name="save">save</link> your changes.</paragraph>
-<paragraph role="note" id="par_id3159399" xml-lang="en-US" l10n="U" oldref="5">If you open a document for printing, and do not make any changes, you are still prompted to save your changes when you close the document. This is because $[officename] keeps track of when a document is printed.</paragraph>
+<paragraph role="paragraph" id="par_id3148620" xml-lang="en-US" l10n="U" oldref="4">If you have made changes to the current document, you are prompted if you want to <link href="text/shared/01/01060000.xhp" name="save">save</link> your changes.</paragraph><comment>no longer the default
+
+id="par_id3159399" l10n="U" oldref="5"If you open a document for printing, and do not make any changes, you are still prompted to save your changes when you close the document. This is because $[officename] keeps track of when a document is printed.</comment>
+<paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="CHG" oldref="8">When you close the last open document window, you see the <link href="text/shared/guide/startcenter.xhp">Start Center</link>.</paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3153821" xml-lang="en-US" l10n="U" oldref="9"><link href="text/shared/02/10100000.xhp" name="Close the current window">Close the current window</link></paragraph>
<paragraph role="paragraph" id="par_id3154750" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/01/01170000.xhp" name="Exit $[officename]">Exit $[officename]</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01100100.xhp b/helpcontent2/source/text/shared/01/01100100.xhp
index 08877c2485..e3bd6b1985 100755
--- a/helpcontent2/source/text/shared/01/01100100.xhp
+++ b/helpcontent2/source/text/shared/01/01100100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01100100.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0101100100xml" indexer="include" status="PUBLISH">
+<topic id="textshared0101100100xml" indexer="include">
<title id="tit" xml-lang="en-US">Description</title>
<filename>/text/shared/01/01100100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-01T13:37:52">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="beschreibung">
@@ -49,7 +47,7 @@
<paragraph role="paragraph" id="par_id3154682" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_DOCINFODESC">Contains descriptive information about the document.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#info3"/>
+<embed href="text/shared/00/00000401.xhp#info3"/>
</section>
<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFODESC:ED_TITLE" id="bm_id3149798" localize="false"/>
<paragraph role="heading" id="hd_id3152372" xml-lang="en-US" level="2" l10n="U" oldref="3">Title</paragraph>
@@ -59,7 +57,7 @@
<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2:EDIT:TP_DOCINFODESC:ED_THEMA">Enter a subject for the document. You can use a subject to group documents with similar contents.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFODESC:ED_KEYWORDS" id="bm_id3145313" localize="false"/>
<paragraph role="heading" id="hd_id3156426" xml-lang="en-US" level="2" l10n="U" oldref="7">Keywords</paragraph>
-<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SFX2:EDIT:TP_DOCINFODESC:ED_KEYWORDS">Enter the words that you want to use to index the content of your document.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SFX2:EDIT:TP_DOCINFODESC:ED_KEYWORDS">Enter the words that you want to use to index the content of your document. Keywords must be separated by commas. A keyword can contain white space characters or semicolons.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SFX2:MULTILINEEDIT:TP_DOCINFODESC:ED_COMMENT" id="bm_id3147009" localize="false"/>
<paragraph role="heading" id="hd_id3148620" xml-lang="en-US" level="2" l10n="U" oldref="9">Comments</paragraph>
<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SFX2:MULTILINEEDIT:TP_DOCINFODESC:ED_COMMENT">Enter comments to help identify the document.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01100300.xhp b/helpcontent2/source/text/shared/01/01100300.xhp
index 8e1f590438..8a8994df9c 100755
--- a/helpcontent2/source/text/shared/01/01100300.xhp
+++ b/helpcontent2/source/text/shared/01/01100300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01100300.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,35 +30,34 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
<topic id="textshared0101100300xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">User</title>
+<title id="tit" xml-lang="en-US">Custom Properties</title>
<filename>/text/shared/01/01100300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
- <section id="benutzer">
- <bookmark branch="hid/HID_DOCINFOUSER" xml-lang="en-US" id="bm_id3154926"/><paragraph id="hd_id3155069" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/01/01100300.xhp" name="User">User</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3155934" xml-lang="en-US" oldref="9"><ahelp hid="HID_DOCINFOUSER" visibility="visible">Allows you to assign custom information fields to your document.</ahelp></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#info4"/>
+<section id="benutzer">
+<bookmark xml-lang="en-US" branch="hid/HID_DOCINFOUSER" id="bm_id3154926" localize="false"/>
+<paragraph role="heading" id="hd_id3155069" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/01100300.xhp" name="Custom Properties">Custom Properties</link></paragraph>
+<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DOCINFOUSER">Allows you to assign custom information fields to your document.</ahelp></paragraph>
</section>
- <bookmark branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO1" xml-lang="en-US" id="bm_id3154751"/><bookmark branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO2" xml-lang="en-US" id="bm_id3152425"/><bookmark branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO3" xml-lang="en-US" id="bm_id3148548"/><bookmark branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO4" xml-lang="en-US" id="bm_id3147399"/><paragraph role="heading" level="2" id="hd_id3151234" l10n="U" xml-lang="en-US" oldref="2">Info 1 to Info 4</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3152551" xml-lang="en-US" oldref="3"><ahelp visibility="visible" hid="SFX2:EDIT:TP_DOCINFOUSER:ED_INFO4">Enter your custom content. If you want, you can change the label for the content by clicking the <emph>Info Fields </emph>button.</ahelp></paragraph>
- <bookmark branch="hid/SFX2:PUSHBUTTON:TP_DOCINFOUSER:BTN_EDITLABEL" xml-lang="en-US" id="bm_id3145072"/><paragraph role="heading" level="2" id="hd_id3153528" l10n="U" xml-lang="en-US" oldref="4">Info Fields</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3157958" xml-lang="en-US" oldref="5"><ahelp hid="SFX2:PUSHBUTTON:TP_DOCINFOUSER:BTN_EDITLABEL" visibility="visible">Edit the labels for the custom content fields.</ahelp></paragraph>
- <bookmark branch="hid/HID_DOCINFO_EDT" xml-lang="en-US" id="bm_id3155355"/><paragraph role="heading" level="3" id="hd_id3155338" l10n="U" xml-lang="en-US" oldref="10">Edit Field Names</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3153311" xml-lang="en-US" oldref="11"><ahelp visibility="visible" hid="HID_DOCINFO_EDT">Allows you to modify the labels for the <emph>Info Fields</emph>.</ahelp></paragraph>
- <bookmark branch="hid/SFX2:EDIT:DLG_DOCINFO_EDT:ED_INFO1" xml-lang="en-US" id="bm_id3150443"/><bookmark branch="hid/SFX2:EDIT:DLG_DOCINFO_EDT:ED_INFO2" xml-lang="en-US" id="bm_id3156114"/><bookmark branch="hid/SFX2:EDIT:DLG_DOCINFO_EDT:ED_INFO3" xml-lang="en-US" id="bm_id3154749"/><bookmark branch="hid/SFX2:EDIT:DLG_DOCINFO_EDT:ED_INFO4" xml-lang="en-US" id="bm_id3152780"/><paragraph role="heading" level="3" id="hd_id3153031" l10n="U" xml-lang="en-US" oldref="6">Names</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3159166" xml-lang="en-US" oldref="7"><ahelp visibility="visible" hid="SFX2:EDIT:DLG_DOCINFO_EDT:ED_INFO4">Enter a name for the <emph>Info Field(s)</emph>.</ahelp></paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3153827" l10n="U" oldref="8">Click <emph>OK</emph> to apply your changes.</paragraph>
- </body>
+<section id="howtoget">
+<embed href="text/shared/00/00000401.xhp#info4"/>
+</section>
+<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO1" id="bm_id3154751" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO2" id="bm_id3152425" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO3" id="bm_id3148548" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SFX2:EDIT:TP_DOCINFOUSER:ED_INFO4" id="bm_id3147399" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_CTRL_CUSTOMPROPERTIES" id="bm_id0811200812001788" localize="false"/>
+<paragraph role="heading" id="hd_id3151234" xml-lang="en-US" level="2" l10n="CHG" oldref="2">Properties</paragraph>
+<paragraph role="paragraph" id="par_id3152551" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid="SFX2:EDIT:TP_DOCINFOUSER:ED_INFO4">Enter your custom contents. You can change the name, type, and contents of each row. You can add or remove rows. The items will be exported as metadata to other file formats.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD" id="bm_id0811200812054521" localize="false"/>
+<paragraph role="heading" id="hd_id0811200812071796" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
+<paragraph role="paragraph" id="par_id0811200812071785" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to add a new row to the Properties list.</ahelp></paragraph>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/01110100.xhp b/helpcontent2/source/text/shared/01/01110100.xhp
index 4a3fbf3f30..4dd423bc76 100644
--- a/helpcontent2/source/text/shared/01/01110100.xhp
+++ b/helpcontent2/source/text/shared/01/01110100.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01110100.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -75,7 +75,7 @@
<paragraph role="paragraph" id="par_id3154810" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2:LISTBOX:DLG_ORGANIZE:LB_RIGHT_TYP">Select <emph>Templates</emph> or <emph>Documents</emph> to change the contents that are displayed in the list above.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3149191" xml-lang="en-US" l10n="U" oldref="36">Template categories are represented by folder icons. To view the template files for a category, double-click a folder.</paragraph>
<paragraph role="paragraph" id="par_id3159166" xml-lang="en-US" l10n="C">To view the styles that are used in a file, double-click the file name, and then double-click the <emph>Styles</emph> icon.</paragraph>
-<paragraph role="paragraph" id="par_id3155504" xml-lang="en-US" l10n="U" oldref="35">To copy a style, hold down Ctrl and drag the style from one file to another file. To move a style, drag the style from one file to another file.</paragraph>
+<paragraph role="paragraph" id="par_id3155504" xml-lang="en-US" l10n="U" oldref="35">To copy a style, hold down <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>and drag the style from one file to another file. To move a style, drag the style from one file to another file.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SFX2:MENUBUTTON:DLG_ORGANIZE:BTN_EDIT" id="bm_id3153542" localize="false"/>
<paragraph role="heading" id="hd_id3149578" xml-lang="en-US" level="2" l10n="U" oldref="8">Commands</paragraph>
<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SFX2:MENUBUTTON:DLG_ORGANIZE:BTN_EDIT">Contains commands for managing and editing your templates and documents.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01110101.xhp b/helpcontent2/source/text/shared/01/01110101.xhp
index 5e0a3d15bd..37372115b8 100644
--- a/helpcontent2/source/text/shared/01/01110101.xhp
+++ b/helpcontent2/source/text/shared/01/01110101.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01110101.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -64,7 +64,7 @@
<paragraph role="heading" id="hd_id3145315" xml-lang="en-US" level="3" l10n="U" oldref="7">Table</paragraph>
<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVTOOLS_COMBOBOX_DLG_ADDRESSBOOKSOURCE_CB_TABLE">Select the data table for your address book.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_ADDRESSBOOKSOURCE_PB_ADMINISTATE_DATASOURCES" id="bm_id3154811" localize="false"/>
-<paragraph role="heading" id="hd_id3145119" xml-lang="en-US" level="3" l10n="U" oldref="9">Administrate</paragraph>
+<paragraph role="heading" id="hd_id3145119" xml-lang="en-US" level="3" l10n="U" oldref="9">Configure</paragraph>
<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_ADDRESSBOOKSOURCE_PB_ADMINISTATE_DATASOURCES">Add a new data source to the <emph>Address Book Source </emph>list.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155629" xml-lang="en-US" level="2" l10n="U" oldref="11">Field assignment</paragraph>
<paragraph role="paragraph" id="par_id3153320" xml-lang="en-US" l10n="U" oldref="12">Define the field assignments for your address book.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01130000.xhp b/helpcontent2/source/text/shared/01/01130000.xhp
index fa9da3a272..d5913556c9 100644
--- a/helpcontent2/source/text/shared/01/01130000.xhp
+++ b/helpcontent2/source/text/shared/01/01130000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01130000.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0101130000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0101130000xml" indexer="include">
<title id="tit" xml-lang="en-US">Print</title>
<filename>/text/shared/01/01130000.xhp</filename>
</topic>
@@ -60,13 +58,15 @@
<bookmark_value>spoolfiles with Xprinter</bookmark_value>
</bookmark><comment>MW deleted "selections;"</comment>
<bookmark xml-lang="en-US" branch="hid/SID_PRINTDOC" id="bm_id1076258" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Print" id="bm_id3147273" localize="false"/><paragraph role="heading" id="hd_id3154621" xml-lang="en-US" level="1" l10n="U" oldref="1">Print</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:Print" id="bm_id3147273" localize="false"/>
+<paragraph role="heading" id="hd_id3154621" xml-lang="en-US" level="1" l10n="U" oldref="1">Print</paragraph>
<paragraph role="paragraph" id="par_id3146946" xml-lang="en-US" l10n="U" oldref="2"><variable id="druckentext"><ahelp hid=".uno:Print">Prints the current document, selection, or the pages that you specify. You can also set the print options for the current document.</ahelp>
</variable> The printing options can vary according to the printer and the operating system that you use.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#drucken"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_SVT_PRNDLG_PRINTDLG_LB_NAMES" id="bm_id3147143" localize="false"/><paragraph role="heading" id="hd_id3153624" xml-lang="en-US" level="2" l10n="U" oldref="3">Printer</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_SVT_PRNDLG_PRINTDLG_LB_NAMES" id="bm_id3147143" localize="false"/>
+<paragraph role="heading" id="hd_id3153624" xml-lang="en-US" level="2" l10n="U" oldref="3">Printer</paragraph>
<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVTOOLS_LISTBOX_DLG_SVT_PRNDLG_PRINTDLG_LB_NAMES">Lists the default printer for the current document. The information for the printer is displayed below this box. If you select another printer, the information is updated.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145129" xml-lang="en-US" level="3" l10n="U" oldref="5">Name</paragraph>
<paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="U" oldref="6">Lists the installed printers on your operating system. To change the default printer, select a printer name from the list.</paragraph>
@@ -78,49 +78,75 @@
<paragraph role="paragraph" id="par_id3154317" xml-lang="en-US" l10n="U" oldref="12">Displays the port for the selected printer.</paragraph>
<paragraph role="heading" id="hd_id3148621" xml-lang="en-US" level="3" l10n="U" oldref="13">Comment</paragraph>
<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="14">Displays additional information for the printer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_PROPERTIES" id="bm_id3150693" localize="false"/><paragraph role="heading" id="hd_id3155942" xml-lang="en-US" level="3" l10n="U" oldref="15">Properties</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_PROPERTIES" id="bm_id3150693" localize="false"/>
+<paragraph role="heading" id="hd_id3155942" xml-lang="en-US" level="3" l10n="U" oldref="15">Properties</paragraph>
<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_PROPERTIES">Opens the printer properties dialog.</ahelp> The printer properties vary according to the printer that you select.<comment>UFI: fix for #i29457#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT" id="bm_id3156955" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="17">Print to File</paragraph>
-<paragraph role="paragraph" id="par_id3150772" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT">Prints to a file instead of to a printer. Select this box, and then choose a location to save the file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT" id="bm_id3156955" localize="false"/>
+<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="17">Print to File</paragraph>
+<paragraph role="paragraph" id="par_id3150772" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT">Prints to a file instead of to a printer. Select this box, and then choose a location to save the file.</ahelp></paragraph><comment>obviously, AVIS embedded help texts AEND are no longer possible inside SWITCHed passages.
+This is the reason for continuos failure of i83561</comment>
+<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL_SHEETS" id="bm_id5816827" localize="false"/>
+<paragraph role="paragraph" id="par_id0909200810043691" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enables all sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_SHEETS" id="bm_id6644489" localize="false"/>
+<paragraph role="paragraph" id="par_id0909200810043626" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enables the selected sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_CELLS" id="bm_id8608966" localize="false"/>
+<paragraph role="paragraph" id="par_id0909200810043615" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enables the selected cells to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd_ListBox_DLG_PRINTDIALOG_CB_CONTENT" id="bm_id939054" localize="false"/>
+<paragraph role="paragraph" id="par_id0909200810043658" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select whether you want to print Slides, Handouts, Notes, or Outline.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd_ListBox_DLG_PRINTDIALOG_CB_SLIDESPERPAGE" id="bm_id6802270" localize="false"/>
+<paragraph role="paragraph" id="par_id0909200810043717" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, select the number of slides to print per page of paper.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_HORIZONTAL" id="bm_id7987914" localize="false"/>
+<paragraph role="paragraph" id="par_id0909200810043777" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, enable to print in a horizontal order first.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_VERTICAL" id="bm_id939359" localize="false"/>
+<paragraph role="paragraph" id="par_id0909200810043750" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, enable to print in a vertical order first.</ahelp></paragraph>
<switch select="appl">
-<case select="CALC"><comment>changed Calc print dialog, i83561</comment><paragraph role="heading" id="hd_id439161" xml-lang="en-US" level="2" l10n="NEW">Print</paragraph>
+<case select="CALC"><comment>changed Calc print dialog, i83561</comment>
+<paragraph role="heading" id="hd_id439161" xml-lang="en-US" level="2" l10n="NEW">Print</paragraph>
<paragraph role="paragraph" id="par_id1228064" xml-lang="en-US" l10n="NEW">Choose the spreadsheet contents to be printed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL_SHEETS" id="bm_id5816827" localize="false"/><paragraph role="heading" id="hd_id3263954" xml-lang="en-US" level="3" l10n="NEW">All sheets</paragraph>
-<paragraph role="paragraph" id="par_id9550462" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enables all sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_SHEETS" id="bm_id6644489" localize="false"/><paragraph role="heading" id="hd_id6590166" xml-lang="en-US" level="3" l10n="NEW">Selected sheets</paragraph>
-<paragraph role="paragraph" id="par_id7059846" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enables the selected sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_CELLS" id="bm_id8608966" localize="false"/><paragraph role="heading" id="hd_id7471236" xml-lang="en-US" level="3" l10n="NEW">Selected cells</paragraph>
-<paragraph role="paragraph" id="par_id2208014" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enables the selected cells to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3263954" xml-lang="en-US" level="3" l10n="NEW">All sheets</paragraph>
+<paragraph role="paragraph" id="par_id9550462" xml-lang="en-US" l10n="NEW">Enables all sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</paragraph>
+<paragraph role="heading" id="hd_id6590166" xml-lang="en-US" level="3" l10n="NEW">Selected sheets</paragraph>
+<paragraph role="paragraph" id="par_id7059846" xml-lang="en-US" l10n="NEW">Enables the selected sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</paragraph>
+<paragraph role="heading" id="hd_id7471236" xml-lang="en-US" level="3" l10n="NEW">Selected cells</paragraph>
+<paragraph role="paragraph" id="par_id2208014" xml-lang="en-US" l10n="NEW">Enables the selected cells to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</paragraph>
</case>
-<case select="IMPRESS"><comment>inserted Impress section, i85723</comment><paragraph role="heading" id="hd_id9578844" xml-lang="en-US" level="2" l10n="NEW">Print content</paragraph>
+<case select="IMPRESS"><comment>inserted Impress section, i85723</comment>
+<paragraph role="heading" id="hd_id9578844" xml-lang="en-US" level="2" l10n="NEW">Print content</paragraph>
<paragraph role="paragraph" id="par_id864284" xml-lang="en-US" l10n="NEW">For Impress, you can select the content to be printed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ListBox_DLG_PRINTDIALOG_CB_CONTENT" id="bm_id939054" localize="false"/><paragraph role="heading" id="hd_id7683950" xml-lang="en-US" level="3" l10n="NEW">Content</paragraph>
-<paragraph role="paragraph" id="par_id7736442" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select whether you want to print Slides, Handouts, Notes, or Outline.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ListBox_DLG_PRINTDIALOG_CB_SLIDESPERPAGE" id="bm_id6802270" localize="false"/><paragraph role="heading" id="hd_id6184575" xml-lang="en-US" level="3" l10n="NEW">Slides per page</paragraph>
-<paragraph role="paragraph" id="par_id3150425" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For handouts, select the number of slides to print per page of paper.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_HORIZONTAL" id="bm_id7987914" localize="false"/><paragraph role="heading" id="hd_id226142" xml-lang="en-US" level="3" l10n="NEW">Horizontal</paragraph>
-<paragraph role="paragraph" id="par_id838648" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For handouts, enable to print in a horizontal order first.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_VERTICAL" id="bm_id939359" localize="false"/><paragraph role="heading" id="hd_id1110568" xml-lang="en-US" level="3" l10n="NEW">Vertical</paragraph>
-<paragraph role="paragraph" id="par_id3713797" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For handouts, enable to print in a vertical order first.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id7683950" xml-lang="en-US" level="3" l10n="NEW">Content</paragraph>
+<paragraph role="paragraph" id="par_id7736442" xml-lang="en-US" l10n="NEW">Select whether you want to print Slides, Handouts, Notes, or Outline.</paragraph>
+<paragraph role="heading" id="hd_id6184575" xml-lang="en-US" level="3" l10n="NEW">Slides per page</paragraph>
+<paragraph role="paragraph" id="par_id3150425" xml-lang="en-US" l10n="NEW">For handouts, select the number of slides to print per page of paper.</paragraph>
+<paragraph role="heading" id="hd_id226142" xml-lang="en-US" level="3" l10n="NEW">Horizontal</paragraph>
+<paragraph role="paragraph" id="par_id838648" xml-lang="en-US" l10n="NEW">For handouts, enable to print in a horizontal order first.</paragraph>
+<paragraph role="heading" id="hd_id1110568" xml-lang="en-US" level="3" l10n="NEW">Vertical</paragraph>
+<paragraph role="paragraph" id="par_id3713797" xml-lang="en-US" l10n="NEW">For handouts, enable to print in a vertical order first.</paragraph>
</case>
</switch>
<paragraph role="heading" id="hd_id3146774" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Print range</paragraph>
<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="CHG" oldref="23">Defines the print range for the current document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL" id="bm_id3149956" localize="false"/><paragraph role="heading" id="hd_id3155450" xml-lang="en-US" level="3" l10n="U" oldref="24">All</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL" id="bm_id3149956" localize="false"/>
+<paragraph role="heading" id="hd_id3155450" xml-lang="en-US" level="3" l10n="U" oldref="24">All</paragraph>
<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL">Prints the entire document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_PAGES" id="bm_id3148924" localize="false"/><paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="3" l10n="U" oldref="26">Pages</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_PAGES" id="bm_id3148924" localize="false"/>
+<paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="3" l10n="U" oldref="26">Pages</paragraph>
<paragraph role="paragraph" id="par_id3152944" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_PAGES">Prints only the pages that you specify in the <emph>Pages </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES" id="bm_id3155629" localize="false"/><paragraph role="paragraph" id="par_id3146848" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES">To print a range of pages, use the format 3-6. To print single pages, use the format 7;9;11. If you want, you can print a combination of page ranges and single pages, by using the format 3-6;8;10;12. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTION" id="bm_id3149902" localize="false"/><paragraph role="heading" id="hd_id3159344" xml-lang="en-US" level="3" l10n="U" oldref="29">Selection</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES" id="bm_id3155629" localize="false"/>
+<paragraph role="paragraph" id="par_id3146848" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES">To print a range of pages, use the format 3-6. To print single pages, use the format 7;9;11. If you want, you can print a combination of page ranges and single pages, by using the format 3-6;8;10;12. </ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTION" id="bm_id3149902" localize="false"/>
+<paragraph role="heading" id="hd_id3159344" xml-lang="en-US" level="3" l10n="U" oldref="29">Selection</paragraph>
<paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTION">Prints only the selected area(s) or object(s) in the current document.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148563" xml-lang="en-US" level="2" l10n="U" oldref="31">Copies</paragraph>
<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="32">Specify the number of copies that you want to print and the sorting options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_NUMERICFIELD_DLG_SVT_PRNDLG_PRINTDLG_NUM_COPIES" id="bm_id3154347" localize="false"/><paragraph role="heading" id="hd_id3154923" xml-lang="en-US" level="3" l10n="CHG" oldref="33">Number of copies</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_NUMERICFIELD_DLG_SVT_PRNDLG_PRINTDLG_NUM_COPIES" id="bm_id3154347" localize="false"/>
+<paragraph role="heading" id="hd_id3154923" xml-lang="en-US" level="3" l10n="CHG" oldref="33">Number of copies</paragraph>
<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVTOOLS_NUMERICFIELD_DLG_SVT_PRNDLG_PRINTDLG_NUM_COPIES">Enter the number of copies that you want to print.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_COLLATE" id="bm_id3148663" localize="false"/><paragraph role="heading" id="hd_id3154390" xml-lang="en-US" level="3" l10n="CHG" oldref="35">Collate</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_COLLATE" id="bm_id3148663" localize="false"/>
+<paragraph role="heading" id="hd_id3154390" xml-lang="en-US" level="3" l10n="CHG" oldref="35">Collate</paragraph>
<paragraph role="paragraph" id="par_id3150865" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_COLLATE">Preserves the page order of the original document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_OPTIONS" id="bm_id3146909" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools_PushButton_DLG_SVT_PRNDLG_PRNSETUPDLG_BTN_OPTIONS" id="bm_id7177037" localize="false"/><paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="38">Options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools_PushButton_DLG_SVT_PRNDLG_PRNSETUPDLG_BTN_OPTIONS" id="bm_id7177037" localize="false"/>
+<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="38">Options</paragraph>
<paragraph role="paragraph" id="par_id3159086" xml-lang="en-US" l10n="CHG" oldref="39"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_OPTIONS" visibility="hidden">Changes the printer settings for the current document.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3156080" xml-lang="en-US" l10n="CHG" oldref="41"><switchinline select="appl"><caseinline select="WRITER">To set the default <item type="productname">%PRODUCTNAME</item> printer options for text documents, choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.
</caseinline></switchinline></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01160200.xhp b/helpcontent2/source/text/shared/01/01160200.xhp
index 5dba7f1d8f..a6cb2f44b9 100644
--- a/helpcontent2/source/text/shared/01/01160200.xhp
+++ b/helpcontent2/source/text/shared/01/01160200.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01160200.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0101160200xml" indexer="include" status="PUBLISH">
+<topic id="textshared0101160200xml" indexer="include">
<title id="tit" xml-lang="en-US">Document as E-mail</title>
<filename>/text/shared/01/01160200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-04-06T12:02:52">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="sendemail">
@@ -53,7 +49,8 @@
</variable></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#dokument"/>
+<embed href="text/shared/00/00000401.xhp#dokument"/>
</section>
+<paragraph role="note" id="par_id0807200809553672" xml-lang="en-US" l10n="NEW">If the document is in HTML format, any embedded or linked images will not be sent with the e-mail.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/02070000.xhp b/helpcontent2/source/text/shared/01/02070000.xhp
index a7de0beb35..a26bcab3bd 100644
--- a/helpcontent2/source/text/shared/01/02070000.xhp
+++ b/helpcontent2/source/text/shared/01/02070000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02070000.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0102070000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0102070000xml" indexer="include">
<title id="tit" xml-lang="en-US">Paste Special</title>
<filename>/text/shared/01/02070000.xhp</filename>
</topic>
@@ -48,41 +46,50 @@
<bookmark xml-lang="en-US" branch="hid/.uno:PasteClipboard" id="bm_id3149987" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_PASTESPECIAL" id="bm_id3567618" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:PasteSpecial" id="bm_id3154100" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FID_PASTE_CONTENTS" id="bm_id3076570" localize="false"/><paragraph role="heading" id="hd_id3147477" xml-lang="en-US" level="1" l10n="U" oldref="1">Paste Special</paragraph>
+<bookmark xml-lang="en-US" branch="hid/FID_PASTE_CONTENTS" id="bm_id3076570" localize="false"/>
+<paragraph role="heading" id="hd_id3147477" xml-lang="en-US" level="1" l10n="U" oldref="1">Paste Special</paragraph>
<paragraph role="paragraph" id="par_id3147143" xml-lang="en-US" l10n="U" oldref="2"><variable id="inhalteeinfuegentext"><ahelp hid=".uno:PasteSpecial">Inserts the contents of the clipboard into the current file in a format that you can specify.</ahelp>
</variable></paragraph>
<switch select="appl">
-<case select="WRITER"><section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#inhalte"/>
+<case select="WRITER">
+<section id="howtoget">
+<embed href="text/shared/00/00000402.xhp#inhalte"/>
</section>
</case>
</switch>
<switch select="appl">
-<case select="CALC"><section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#inhalte"/>
+<case select="CALC">
+<section id="Section1">
+<embed href="text/shared/00/00000402.xhp#inhalte"/>
</section>
</case>
</switch>
<switch select="appl">
-<case select="IMPRESS"><section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#inhalte"/>
+<case select="IMPRESS">
+<section id="Section2">
+<embed href="text/shared/00/00000402.xhp#inhalte"/>
</section>
</case>
</switch>
<switch select="appl">
-<case select="DRAW"><section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#inhalte"/>
+<case select="DRAW">
+<section id="Section3">
+<embed href="text/shared/00/00000402.xhp#inhalte"/>
</section>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/HID_PASTE_DLG" id="bm_id3156410" localize="false"/><paragraph role="heading" id="hd_id3147576" xml-lang="en-US" level="3" l10n="U" oldref="5">Source</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PASTE_DLG" id="bm_id3156410" localize="false"/>
+<paragraph role="heading" id="hd_id3147576" xml-lang="en-US" level="3" l10n="U" oldref="5">Source</paragraph>
<paragraph role="paragraph" id="par_id3149388" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_PASTE_DLG">Displays the source of the clipboard contents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SO3:LISTBOX:MD_PASTE_OBJECT:LB_INSERT_LIST" id="bm_id3154750" localize="false"/><paragraph role="heading" id="hd_id3153684" xml-lang="en-US" level="3" l10n="U" oldref="7">Selection</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SO3:LISTBOX:MD_PASTE_OBJECT:LB_INSERT_LIST" id="bm_id3154750" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx_ListBox_MD_PASTE_OBJECT_LB_INSERT_LIST" id="bm_id080420080314218" localize="false"/>
+<paragraph role="heading" id="hd_id3153684" xml-lang="en-US" level="3" l10n="U" oldref="7">Selection</paragraph>
<paragraph role="paragraph" id="par_id3149812" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SO3:LISTBOX:MD_PASTE_OBJECT:LB_INSERT_LIST">Select a format for the clipboard contents that you want to paste.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="68"><switchinline select="appl"><caseinline select="WRITER">When you paste HTML data into a text document, you can choose "HTML format" or "HTML format without comments". The second choice is the default; it pastes all HTML data, but no comments.
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/FID_INS_CELL_CONTENTS" id="bm_id7770068" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertContents" id="bm_id3156152" localize="false"/><paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="2" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="CALC">Paste Special
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertContents" id="bm_id3156152" localize="false"/>
+<paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="2" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="CALC">Paste Special
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="16"><switchinline select="appl"><caseinline select="CALC">This dialog appears in Calc if the clipboard contains spreadsheet cells.
</caseinline></switchinline></paragraph>
@@ -90,35 +97,43 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3152909" xml-lang="en-US" l10n="U" oldref="40"><switchinline select="appl"><caseinline select="CALC">Select a format for the clipboard contents that you want to paste.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSALL" id="bm_id3148991" localize="false"/><paragraph role="heading" id="hd_id3145120" xml-lang="en-US" level="3" l10n="U" oldref="41"><switchinline select="appl"><caseinline select="CALC">Paste all
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSALL" id="bm_id3148991" localize="false"/>
+<paragraph role="heading" id="hd_id3145120" xml-lang="en-US" level="3" l10n="U" oldref="41"><switchinline select="appl"><caseinline select="CALC">Paste all
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3146848" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSALL">Pastes all cell contents, notes, formats, and objects into the current document.</ahelp>
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSSTRINGS" id="bm_id3149796" localize="false"/><paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="3" l10n="CHG" oldref="43"><switchinline select="appl"><caseinline select="CALC">Text
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSSTRINGS" id="bm_id3149796" localize="false"/>
+<paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="3" l10n="CHG" oldref="43"><switchinline select="appl"><caseinline select="CALC">Text
</caseinline></switchinline><comment>i50436</comment></paragraph>
<paragraph role="paragraph" id="par_id3149244" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSSTRINGS"><switchinline select="appl"><caseinline select="CALC">Inserts cells containing text.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNUMBERS" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3148947" xml-lang="en-US" level="3" l10n="U" oldref="45"><switchinline select="appl"><caseinline select="CALC">Numbers
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNUMBERS" id="bm_id3147303" localize="false"/>
+<paragraph role="heading" id="hd_id3148947" xml-lang="en-US" level="3" l10n="U" oldref="45"><switchinline select="appl"><caseinline select="CALC">Numbers
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3152360" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNUMBERS"><switchinline select="appl"><caseinline select="CALC">Inserts cells containing numbers.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSDATETIME" id="bm_id3154936" localize="false"/><paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="3" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="CALC">Date &amp; Time
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSDATETIME" id="bm_id3154936" localize="false"/>
+<paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="3" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="CALC">Date &amp; Time
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3154226" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSDATETIME"><switchinline select="appl"><caseinline select="CALC">Inserts cells containing date and time values.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSFORMULAS" id="bm_id3151210" localize="false"/><paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="CALC">Formulas
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSFORMULAS" id="bm_id3151210" localize="false"/>
+<paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="CALC">Formulas
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3145744" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSFORMULAS">Inserts cells containing formulae.</ahelp>
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNOTES" id="bm_id3159149" localize="false"/><paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Notes
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNOTES" id="bm_id3159149" localize="false"/>
+<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Notes
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNOTES"><switchinline select="appl"><caseinline select="CALC">Inserts notes that are attached to cells. If you want to add the notes to the existing cell content, select the "Add" operation.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSATTRS" id="bm_id3145171" localize="false"/><paragraph role="heading" id="hd_id3152935" xml-lang="en-US" level="3" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="CALC">Formats
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSATTRS" id="bm_id3145171" localize="false"/>
+<paragraph role="heading" id="hd_id3152935" xml-lang="en-US" level="3" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="CALC">Formats
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="54"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSATTRS"><switchinline select="appl"><caseinline select="CALC">Inserts cell format attributes.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_INSCONT_BTN_INSOBJECTS" id="bm_id3145202" localize="false"/><paragraph role="heading" id="hd_id3156282" xml-lang="en-US" level="3" l10n="U" oldref="65"><switchinline select="appl"><caseinline select="CALC">Objects
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_INSCONT_BTN_INSOBJECTS" id="bm_id3145202" localize="false"/>
+<paragraph role="heading" id="hd_id3156282" xml-lang="en-US" level="3" l10n="U" oldref="65"><switchinline select="appl"><caseinline select="CALC">Objects
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3149810" xml-lang="en-US" l10n="U" oldref="66"><ahelp hid="SC_CHECKBOX_RID_SCDLG_INSCONT_BTN_INSOBJECTS"><switchinline select="appl"><caseinline select="CALC">Inserts objects contained within the selected cell range. These can be OLE objects, chart objects, or drawing objects.
</caseinline></switchinline></ahelp></paragraph>
@@ -126,23 +141,28 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3151351" xml-lang="en-US" l10n="U" oldref="38"><switchinline select="appl"><caseinline select="CALC">Select the operation to apply when you paste cells into your sheet.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_NOOP" id="bm_id3153213" localize="false"/><paragraph role="heading" id="hd_id3153952" xml-lang="en-US" level="3" l10n="U" oldref="20"><switchinline select="appl"><caseinline select="CALC">None
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_NOOP" id="bm_id3153213" localize="false"/>
+<paragraph role="heading" id="hd_id3153952" xml-lang="en-US" level="3" l10n="U" oldref="20"><switchinline select="appl"><caseinline select="CALC">None
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147348" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_NOOP"><switchinline select="appl"><caseinline select="CALC">Does not apply an operation when you insert the cell range from the clipboard. The contents of the clipboard will replace existing cell contents.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_ADD" id="bm_id3149064" localize="false"/><paragraph role="heading" id="hd_id3154988" xml-lang="en-US" level="3" l10n="U" oldref="22"><switchinline select="appl"><caseinline select="CALC">Add
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_ADD" id="bm_id3149064" localize="false"/>
+<paragraph role="heading" id="hd_id3154988" xml-lang="en-US" level="3" l10n="U" oldref="22"><switchinline select="appl"><caseinline select="CALC">Add
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3159196" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_ADD"><switchinline select="appl"><caseinline select="CALC">Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains notes, adds the notes to the target cells.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_SUB" id="bm_id3152576" localize="false"/><paragraph role="heading" id="hd_id3145263" xml-lang="en-US" level="3" l10n="U" oldref="24"><switchinline select="appl"><caseinline select="CALC">Subtract
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_SUB" id="bm_id3152576" localize="false"/>
+<paragraph role="heading" id="hd_id3145263" xml-lang="en-US" level="3" l10n="U" oldref="24"><switchinline select="appl"><caseinline select="CALC">Subtract
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3154149" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_SUB"><switchinline select="appl"><caseinline select="CALC">Subtracts the values in the clipboard cells from the values in the target cells.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_MUL" id="bm_id3149667" localize="false"/><paragraph role="heading" id="hd_id3155312" xml-lang="en-US" level="3" l10n="U" oldref="26"><switchinline select="appl"><caseinline select="CALC">Multiply
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_MUL" id="bm_id3149667" localize="false"/>
+<paragraph role="heading" id="hd_id3155312" xml-lang="en-US" level="3" l10n="U" oldref="26"><switchinline select="appl"><caseinline select="CALC">Multiply
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3155307" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_MUL"><switchinline select="appl"><caseinline select="CALC">Multiplies the values in the clipboard cells with the values in the target cells.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_DIV" id="bm_id3153140" localize="false"/><paragraph role="heading" id="hd_id3154320" xml-lang="en-US" level="3" l10n="U" oldref="28"><switchinline select="appl"><caseinline select="CALC">Divide
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_DIV" id="bm_id3153140" localize="false"/>
+<paragraph role="heading" id="hd_id3154320" xml-lang="en-US" level="3" l10n="U" oldref="28"><switchinline select="appl"><caseinline select="CALC">Divide
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3155417" xml-lang="en-US" l10n="CHG" oldref="29"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_DIV"><switchinline select="appl"><caseinline select="CALC">Divides the values in the target cells by the values in the clipboard cells.
</caseinline></switchinline></ahelp><comment>UFI: fixes #i14796#</comment></paragraph>
@@ -150,19 +170,23 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="56"><switchinline select="appl"><caseinline select="CALC">Sets the paste options for the clipboard contents.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_SKIP_EMPTY" id="bm_id3149485" localize="false"/><paragraph role="heading" id="hd_id3151052" xml-lang="en-US" level="3" l10n="U" oldref="30"><switchinline select="appl"><caseinline select="CALC">Skip empty cells
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_SKIP_EMPTY" id="bm_id3149485" localize="false"/>
+<paragraph role="heading" id="hd_id3151052" xml-lang="en-US" level="3" l10n="U" oldref="30"><switchinline select="appl"><caseinline select="CALC">Skip empty cells
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3148775" xml-lang="en-US" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_SKIP_EMPTY">Empty cells from the clipboard do not replace target cells. If you use this option in conjunction with the <emph>Multiply</emph> or the <emph>Divide</emph> operation, the operation is not applied to the target cell of an empty cell in the clipboard.</ahelp>
</caseinline></switchinline></paragraph>
<switch select="appl">
-<case select="CALC"><paragraph role="note" id="par_id3155084" xml-lang="en-US" l10n="U" oldref="32">If you select a mathematical operation and clear the<emph> Skip empty cells </emph>box, empty cells in the clipboard are treated as zeroes. For example, if you apply the <emph>Multiply</emph> operation, the target cells are filled with zeroes.</paragraph>
+<case select="CALC">
+<paragraph role="note" id="par_id3155084" xml-lang="en-US" l10n="U" oldref="32">If you select a mathematical operation and clear the<emph> Skip empty cells </emph>box, empty cells in the clipboard are treated as zeroes. For example, if you apply the <emph>Multiply</emph> operation, the target cells are filled with zeroes.</paragraph>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_TRANSPOSE" id="bm_id3145649" localize="false"/><paragraph role="heading" id="hd_id3147173" xml-lang="en-US" level="3" l10n="U" oldref="33"><switchinline select="appl"><caseinline select="CALC">Transpose
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_TRANSPOSE" id="bm_id3145649" localize="false"/>
+<paragraph role="heading" id="hd_id3147173" xml-lang="en-US" level="3" l10n="U" oldref="33"><switchinline select="appl"><caseinline select="CALC">Transpose
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147223" xml-lang="en-US" l10n="CHG" oldref="34"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_TRANSPOSE">The rows of the range in the clipboard are pasted to become columns of the output range. The columns of the range in the clipboard are pasted to become rows.</ahelp>
</caseinline></switchinline><comment>i59261</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_LINK" id="bm_id3154270" localize="false"/><paragraph role="heading" id="hd_id3152971" xml-lang="en-US" level="3" l10n="U" oldref="35"><switchinline select="appl"><caseinline select="CALC">Link
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_LINK" id="bm_id3154270" localize="false"/>
+<paragraph role="heading" id="hd_id3152971" xml-lang="en-US" level="3" l10n="U" oldref="35"><switchinline select="appl"><caseinline select="CALC">Link
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3146969" xml-lang="en-US" l10n="U" oldref="36"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_LINK">Inserts the cell range as a link, so that changes made to the cells in the source file are updated in the target file. To ensure that changes made to empty cells in the source file are updated in the target file, ensure that the <emph>Insert All</emph> option is also selected. </ahelp>
</caseinline></switchinline></paragraph>
@@ -172,15 +196,18 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3145169" xml-lang="en-US" l10n="U" oldref="58"><switchinline select="appl"><caseinline select="CALC">Set the shift options for the target cells when the clipboard content is inserted.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_NONE" id="bm_id3145208" localize="false"/><paragraph role="heading" id="hd_id3155518" xml-lang="en-US" level="3" l10n="U" oldref="59"><switchinline select="appl"><caseinline select="CALC">Don't shift
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_NONE" id="bm_id3145208" localize="false"/>
+<paragraph role="heading" id="hd_id3155518" xml-lang="en-US" level="3" l10n="U" oldref="59"><switchinline select="appl"><caseinline select="CALC">Don't shift
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3154158" xml-lang="en-US" l10n="U" oldref="60"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_NONE"><switchinline select="appl"><caseinline select="CALC">Inserted cells replace the target cells.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_DOWN" id="bm_id3149020" localize="false"/><paragraph role="heading" id="hd_id3148483" xml-lang="en-US" level="3" l10n="U" oldref="61"><switchinline select="appl"><caseinline select="CALC">Down
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_DOWN" id="bm_id3149020" localize="false"/>
+<paragraph role="heading" id="hd_id3148483" xml-lang="en-US" level="3" l10n="U" oldref="61"><switchinline select="appl"><caseinline select="CALC">Down
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3152962" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_DOWN"><switchinline select="appl"><caseinline select="CALC">Target cells are shifted downward when you insert cells from the clipboard.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_RIGHT" id="bm_id3150043" localize="false"/><paragraph role="heading" id="hd_id3145621" xml-lang="en-US" level="3" l10n="U" oldref="63"><switchinline select="appl"><caseinline select="CALC">Right
+<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_RIGHT" id="bm_id3150043" localize="false"/>
+<paragraph role="heading" id="hd_id3145621" xml-lang="en-US" level="3" l10n="U" oldref="63"><switchinline select="appl"><caseinline select="CALC">Right
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3159264" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_RIGHT"><switchinline select="appl"><caseinline select="CALC">Target cells are shifted to the right when you insert cells from the clipboard.
</caseinline></switchinline></ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/02100000.xhp b/helpcontent2/source/text/shared/01/02100000.xhp
index 5e6f3fc4b5..5f612cf3dd 100644
--- a/helpcontent2/source/text/shared/01/02100000.xhp
+++ b/helpcontent2/source/text/shared/01/02100000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02100000.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.3 $
*
* This file is part of OpenOffice.org.
*
@@ -33,53 +32,61 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0102100000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0102100000xml" indexer="include">
<title id="tit" xml-lang="en-US">Find &amp; Replace</title>
<filename>/text/shared/01/02100000.xhp</filename>
</topic>
</meta>
<body>
-<section id="suchenersetzen"><comment>mw distributed the 7 index entries among "finding" guides in Writer (5 entries copied) and Calc (5 entries copied)</comment>
+<section id="suchenersetzen">le<comment>mw distributed the 7 index entries among "finding" guides in Writer (5 entries copied) and Calc (5 entries copied)</comment>
<bookmark xml-lang="en-US" branch="hid/SID_SEARCH_ITEM" id="bm_id9184950" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SearchProperties" id="bm_id3160463" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_SEARCH_DLG" id="bm_id7754440" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:SearchDialog" id="bm_id3149031" localize="false"/><paragraph role="heading" id="hd_id3154044" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="02100000"><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace">Find &amp; Replace</link>
+<bookmark xml-lang="en-US" branch="hid/.uno:SearchDialog" id="bm_id3149031" localize="false"/>
+<paragraph role="heading" id="hd_id3154044" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="02100000"><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace">Find &amp; Replace</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3149893" xml-lang="en-US" l10n="U" oldref="2"><variable id="suchenersetzentext"><ahelp hid=".uno:SearchDialog">Searches for or replaces text or formats in the current document.</ahelp>
</variable></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#suchen"/>
+<embed href="text/shared/00/00000402.xhp#suchen"/>
</section>
<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_SEARCH" id="bm_id3147572" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ComboBox_RID_SVXDLG_SEARCH_ED_SEARCH" id="bm_id2687459" localize="false"/><paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="2" l10n="U" oldref="3">Search For</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_ComboBox_RID_SVXDLG_SEARCH_ED_SEARCH" id="bm_id2687459" localize="false"/>
+<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="2" l10n="U" oldref="3">Search For</paragraph>
<paragraph role="paragraph" id="par_id3155805" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_SEARCH">Enter the text that you want to search for, or select a previous search from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS" id="bm_id3154317" localize="false"/><paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="189"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS">Search options are listed in the <emph>Options </emph>area of the dialog</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS" id="bm_id3154317" localize="false"/>
+<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="189"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS">Search options are listed in the <emph>Options </emph>area of the dialog</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:COMBOBOX:RID_SVXDLG_SEARCH:ED_REPLACE" id="bm_id3148621" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_REPLACE" id="bm_id3149096" localize="false"/><paragraph role="heading" id="hd_id3152551" xml-lang="en-US" level="2" l10n="U" oldref="5">Replace With</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_REPLACE" id="bm_id3149096" localize="false"/>
+<paragraph role="heading" id="hd_id3152551" xml-lang="en-US" level="2" l10n="U" oldref="5">Replace With</paragraph>
<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_REPLACE">Enter the replacement text, or select a recent replacement text or style from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS" id="bm_id3150355" localize="false"/><paragraph role="paragraph" id="par_id3150506" xml-lang="en-US" l10n="U" oldref="190"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS">Replacement options are listed in the <emph>Options </emph>area of the dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS" id="bm_id3150355" localize="false"/>
+<paragraph role="paragraph" id="par_id3150506" xml-lang="en-US" l10n="U" oldref="190"><ahelp hid="SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_REPLACE_FORMATS">Replacement options are listed in the <emph>Options </emph>area of the dialog.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="8">Options</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_CELLS" id="bm_id3155179" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_WHOLE_WORDS" id="bm_id7736442" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Entire Cells
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_WHOLE_WORDS" id="bm_id7736442" localize="false"/>
+<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Entire Cells
</caseinline><defaultinline>Whole words only</defaultinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3149579" xml-lang="en-US" l10n="CHG" oldref="11"><variable id="ganze"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_CELLS">Searches for whole words or cells that are identical to the search text.</ahelp>
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_BACKWARDS" id="bm_id3152910" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_BACKWARDS" id="bm_id7027802" localize="false"/><paragraph role="heading" id="hd_id3156192" xml-lang="en-US" level="3" l10n="U" oldref="14">Backwards</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_BACKWARDS" id="bm_id7027802" localize="false"/>
+<paragraph role="heading" id="hd_id3156192" xml-lang="en-US" level="3" l10n="U" oldref="14">Backwards</paragraph>
<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_BACKWARDS">Search starts at the current cursor position and goes backwards to the beginning of the file.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_REGEXP" id="bm_id3153542" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_REGEXP" id="bm_id5147862" localize="false"/><paragraph role="heading" id="hd_id3144439" xml-lang="en-US" level="3" l10n="U" oldref="16"><switchinline select="appl"><caseinline select="DRAW">
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_REGEXP" id="bm_id5147862" localize="false"/>
+<paragraph role="heading" id="hd_id3144439" xml-lang="en-US" level="3" l10n="U" oldref="16"><switchinline select="appl"><caseinline select="DRAW">
</caseinline><caseinline select="IMPRESS">
</caseinline><defaultinline>Regular expressions</defaultinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3155342" xml-lang="en-US" l10n="CHG" oldref="156"><switchinline select="appl"><caseinline select="DRAW">
</caseinline><caseinline select="IMPRESS">
</caseinline><defaultinline>Allows you to use wildcards in your search.</defaultinline></switchinline></paragraph><comment>i72448
-Ext help text not found within switches. Solution: Keep switched text for normal display, add hidden help text as "fall through".</comment><paragraph role="paragraph" id="par_id3727225" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Allows you to use wildcards in your search.</ahelp></paragraph>
+Ext help text not found within switches. Solution: Keep switched text for normal display, add hidden help text as "fall through".</comment>
+<paragraph role="paragraph" id="par_id3727225" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Allows you to use wildcards in your search.</ahelp></paragraph>
<switch select="appl">
<case select="DRAW">
</case>
@@ -88,17 +95,21 @@ Ext help text not found within switches. Solution: Keep switched text for normal
<default><embed href="text/shared/01/02100001.xhp#02100001"/>
</default>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_MATCH_CASE" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3" l10n="U" oldref="45">Match case</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_MATCH_CASE" id="bm_id3147303" localize="false"/>
+<paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="3" l10n="U" oldref="45">Match case</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154760"><bookmark_value>case sensitivity;searching</bookmark_value>
-</bookmark><comment>mw made "case sensitive.." a two level entry</comment><paragraph role="paragraph" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="46"><variable id="exakt"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_MATCH_CASE">Distinguishes between uppercase and lowercase characters.</ahelp>
+</bookmark><comment>mw made "case sensitive.." a two level entry</comment>
+<paragraph role="paragraph" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="46"><variable id="exakt"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_MATCH_CASE">Distinguishes between uppercase and lowercase characters.</ahelp>
</variable></paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3147264"><bookmark_value>finding; selections</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_SELECTIONS" id="bm_id3152771" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_SELECTIONS" id="bm_id7007354" localize="false"/><paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="47">Current selection only</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_SELECTIONS" id="bm_id7007354" localize="false"/>
+<paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="47">Current selection only</paragraph>
<paragraph role="paragraph" id="par_id3150866" xml-lang="en-US" l10n="CHG" oldref="48"><ahelp hid=".">Searches only the selected text or cells.</ahelp></paragraph><comment>had to copy extended help to outside of switch construct - see issue 72448</comment>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_BTN_LAYOUTS" id="bm_id1775566" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_LAYOUTS" id="bm_id6146427" localize="false"/><paragraph role="paragraph" id="par_id8876918" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the Search for list. To specify a replacement style, select a style from the Replace with list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_LAYOUTS" id="bm_id6146427" localize="false"/>
+<paragraph role="paragraph" id="par_id8876918" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the Search for list. To specify a replacement style, select a style from the Replace with list.</ahelp></paragraph>
<switch select="appl">
<case select="DRAW">
</case>
@@ -106,7 +117,8 @@ Ext help text not found within switches. Solution: Keep switched text for normal
</case>
<default>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_BTN_LAYOUTS" id="bm_id1775566" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_LAYOUTS" id="bm_id6146427" localize="false"/><paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="3" l10n="CHG" oldref="49">Search for Styles / Including Styles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_LAYOUTS" id="bm_id6146427" localize="false"/>
+<paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="3" l10n="CHG" oldref="49">Search for Styles / Including Styles</paragraph>
<paragraph role="paragraph" id="par_id3155103" xml-lang="en-US" l10n="CHG" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_SEARCH:BTN_LAYOUTS">Searches for text formatted with the style that you specify. Select this checkbox, and then select a style from the <emph>Search for </emph>list. To specify a replacement style, select a style from the <emph>Replace with</emph> list.</ahelp></paragraph>
<paragraph role="note" id="par_idN109CC" xml-lang="en-US" l10n="NEW">After you select the attributes that you want to search for, the <emph>Search for Styles</emph> box in the <emph>Options </emph>area of the %PRODUCTNAME Writer <emph>Find &amp; Replace </emph>dialog changes to <emph>Including Styles</emph>.</paragraph>
<paragraph role="note" id="par_idN109DF" xml-lang="en-US" l10n="NEW">If you want to search for text in which attributes were set by using direct formatting and styles, select the <emph>Including Styles</emph> box.</paragraph>
@@ -114,25 +126,35 @@ Ext help text not found within switches. Solution: Keep switched text for normal
</default>
</switch>
<embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_MATCH_FULL_HALF_WIDTH" id="bm_id3149807" localize="false"/><paragraph role="heading" id="hd_id3149167" xml-lang="en-US" level="3" l10n="U" oldref="204"><variable id="halbnormaltitel">Match character width (only if Asian languages are enabled)
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_MATCH_FULL_HALF_WIDTH" id="bm_id3149807" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCHFORM_CB_HALFFULLFORMS" id="bm_id3153655" localize="false"/>
+<paragraph role="heading" id="hd_id3149167" xml-lang="en-US" level="3" l10n="U" oldref="204"><variable id="halbnormaltitel">Match character width (only if Asian languages are enabled)
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145744" xml-lang="en-US" l10n="U" oldref="208"><variable id="halbnormaltext"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_MATCH_FULL_HALF_WIDTH">Distinguishes between half-width and full-width character forms.</ahelp>
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_SOUNDS_LIKE" id="bm_id3156422" localize="false"/><paragraph role="heading" id="hd_id3153178" xml-lang="en-US" level="3" l10n="U" oldref="205"><variable id="aehnlichtitel">Sounds like (Japanese) (only if Asian languages are enabled)
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_SOUNDS_LIKE" id="bm_id3156422" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCHFORM_CB_SOUNDSLIKECJK" id="bm_id3148750" localize="false"/>
+<paragraph role="heading" id="hd_id3153178" xml-lang="en-US" level="3" l10n="U" oldref="205"><variable id="aehnlichtitel">Sounds like (Japanese) (only if Asian languages are enabled)
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145421" xml-lang="en-US" l10n="U" oldref="206"><variable id="aehnlichtext"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_JAP_SOUNDS_LIKE">Lets you specify the search options for similar notation used in Japanese text. Select this checkbox, and then click the <emph>...</emph> button to specify the search options. </ahelp>
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS" id="bm_id3150650" localize="false"/><paragraph role="paragraph" id="par_id3149765" xml-lang="en-US" l10n="U" oldref="209"><variable id="aehnlichbutton"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS" visibility="hidden">Sets the search options for similar notation used in Japanese text.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS" id="bm_id3150650" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCHFORM_PB_SOUNDSLIKESETTINGS" id="bm_id3155506" localize="false"/>
+<paragraph role="paragraph" id="par_id3149765" xml-lang="en-US" l10n="U" oldref="209"><variable id="aehnlichbutton"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_JAP_OPTIONS" visibility="hidden">Sets the search options for similar notation used in Japanese text.</ahelp>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="U" oldref="212"><link href="text/shared/optionen/01150200.xhp" name="Searching in Japanese">Searching in Japanese</link></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL" id="bm_id3150439" localize="false"/><paragraph role="heading" id="hd_id3154299" xml-lang="en-US" level="2" l10n="U" oldref="66">Find All</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL" id="bm_id3150439" localize="false"/>
+<paragraph role="heading" id="hd_id3154299" xml-lang="en-US" level="2" l10n="U" oldref="66">Find All</paragraph>
<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="CHG" oldref="67"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL">Finds and selects all instances of the text or the format that you are searching for in the document (only in Writer and Calc documents).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH" id="bm_id3153954" localize="false"/><paragraph role="heading" id="hd_id3163821" xml-lang="en-US" level="2" l10n="U" oldref="68">Find</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH" id="bm_id3153954" localize="false"/>
+<paragraph role="heading" id="hd_id3163821" xml-lang="en-US" level="2" l10n="U" oldref="68">Find</paragraph>
<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="69"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH">Finds and selects the next occurrence of the text or format that you searching for in the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SEARCH_BTN_REPLACE_ALL" id="bm_id1346781" localize="false"/><paragraph role="heading" id="hd_id3153742" xml-lang="en-US" level="2" l10n="U" oldref="70">Replace All</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SEARCH_BTN_REPLACE_ALL" id="bm_id1346781" localize="false"/>
+<paragraph role="heading" id="hd_id3153742" xml-lang="en-US" level="2" l10n="U" oldref="70">Replace All</paragraph>
<paragraph role="paragraph" id="par_id3145660" xml-lang="en-US" l10n="CHG" oldref="71"><ahelp hid=".">Replaces all of the occurrences of the text or format that you want to replace.</ahelp><switchinline select="appl"><caseinline select="IMPRESS">Repeat this command until all replacements on your slide have been made.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SEARCH_BTN_REPLACE" id="bm_id2296212" localize="false"/><paragraph role="heading" id="hd_id3149065" xml-lang="en-US" level="2" l10n="U" oldref="72">Replace</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SEARCH_BTN_REPLACE" id="bm_id2296212" localize="false"/>
+<paragraph role="heading" id="hd_id3149065" xml-lang="en-US" level="2" l10n="U" oldref="72">Replace</paragraph>
<paragraph role="paragraph" id="par_id3151170" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_REPLACE">Replaces the selected text or format that you searched for, and then searches for the next occurrence.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="2" l10n="U" oldref="192"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/02100200.xhp" name="Attribute">Attribute</link>
</caseinline></switchinline></paragraph>
@@ -143,32 +165,38 @@ Ext help text not found within switches. Solution: Keep switched text for normal
<paragraph role="heading" id="hd_id3155854" xml-lang="en-US" level="2" l10n="U" oldref="193"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/02100300.xhp" name="Format">Format</link>
</caseinline></switchinline></paragraph>
<switch select="appl">
-<case select="WRITER"><paragraph role="paragraph" id="par_id8641315" xml-lang="en-US" l10n="NEW">Finds specific text formatting features, such as font types, font effects, and text flow characteristics.</paragraph>
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id8641315" xml-lang="en-US" l10n="NEW">Finds specific text formatting features, such as font types, font effects, and text flow characteristics.</paragraph>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_NOFORMAT" id="bm_id3153138" localize="false"/><paragraph role="heading" id="hd_id3154188" xml-lang="en-US" level="2" l10n="U" oldref="135"><switchinline select="appl"><caseinline select="WRITER">No Format
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_NOFORMAT" id="bm_id3153138" localize="false"/>
+<paragraph role="heading" id="hd_id3154188" xml-lang="en-US" level="2" l10n="U" oldref="135"><switchinline select="appl"><caseinline select="WRITER">No Format
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3159155" xml-lang="en-US" l10n="CHG" oldref="136"><switchinline select="appl"><caseinline select="WRITER">Click in the <emph>Search for </emph>or the <emph>Replace with </emph>box, and then click this button to remove the search criteria based on formats.
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id1334269" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click in the Search for or the Replace with box, and then click this button to remove the search criteria based on formats.</ahelp></paragraph>
<switch select="appl">
-<case select="WRITER"><paragraph role="note" id="par_id3150337" xml-lang="en-US" l10n="U" oldref="137">The search criteria for formatting attributes are displayed under the <emph>Search for </emph>or the <emph>Replace with </emph>box.</paragraph>
+<case select="WRITER">
+<paragraph role="note" id="par_id3150337" xml-lang="en-US" l10n="U" oldref="137">The search criteria for formatting attributes are displayed under the <emph>Search for </emph>or the <emph>Replace with </emph>box.</paragraph>
</case>
</switch>
-<bookmark xml-lang="en-US" branch="hid/svx_MoreButton_RID_SVXDLG_SEARCH_BTN_MORE" id="bm_id7809076" localize="false"/><paragraph role="heading" id="hd_id3153157" xml-lang="en-US" level="2" l10n="CHG" oldref="138">More Options / Less Options</paragraph>
-<paragraph role="paragraph" id="par_id3150113" xml-lang="en-US" l10n="CHG" oldref="139"><ahelp hid="SVX:MOREBUTTON:RID_SVXDLG_SEARCH:BTN_MORE">Shows more or less search options. Click this button again to hide the extended search options.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_MoreButton_RID_SVXDLG_SEARCH_BTN_MORE" id="bm_id7809076" localize="false"/><comment>More Options / Less Options / Fewer Options - name subject to change</comment>
+<paragraph role="paragraph" id="par_id3150113" xml-lang="en-US" l10n="CHG" oldref="139"><ahelp hid="." visibility="hidden">Shows more or fewer search options. Click this button again to hide the extended search options.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="3" l10n="U" oldref="140"><switchinline select="appl"><caseinline select="CALC">Search in
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_FORMULAS" id="bm_id3153876" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXDLG_SEARCH_LB_CALC_SEARCHIN" id="bm_id6838282" localize="false"/><paragraph role="heading" id="hd_id3146925" xml-lang="en-US" level="4" l10n="U" oldref="142"><switchinline select="appl"><caseinline select="CALC">Formulas
+<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXDLG_SEARCH_LB_CALC_SEARCHIN" id="bm_id6838282" localize="false"/>
+<paragraph role="heading" id="hd_id3146925" xml-lang="en-US" level="4" l10n="U" oldref="142"><switchinline select="appl"><caseinline select="CALC">Formulas
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id6719870" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in formulas and in fixed (not calculated) values. For example, you could look for formulas that contain 'SUM'.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_VALUES" id="bm_id3154015" localize="false"/><paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="4" l10n="U" oldref="144"><switchinline select="appl"><caseinline select="CALC">Values
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_VALUES" id="bm_id3154015" localize="false"/>
+<paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="4" l10n="U" oldref="144"><switchinline select="appl"><caseinline select="CALC">Values
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3146969" xml-lang="en-US" l10n="CHG" oldref="145"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in values and in the results of formulas.
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id6064943" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in values and in the results of formulas.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_NOTES" id="bm_id3148496" localize="false"/><paragraph role="heading" id="hd_id3145650" xml-lang="en-US" level="4" l10n="U" oldref="146"><switchinline select="appl"><caseinline select="CALC">Notes
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_NOTES" id="bm_id3148496" localize="false"/>
+<paragraph role="heading" id="hd_id3145650" xml-lang="en-US" level="4" l10n="U" oldref="146"><switchinline select="appl"><caseinline select="CALC">Notes
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3153947" xml-lang="en-US" l10n="CHG" oldref="147"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in the notes that are attached to the cells.
</caseinline></switchinline></paragraph>
@@ -178,11 +206,13 @@ Ext help text not found within switches. Solution: Keep switched text for normal
<paragraph role="paragraph" id="par_id3156332" xml-lang="en-US" l10n="U" oldref="207"><switchinline select="appl"><caseinline select="CALC">Determines the order for searching the cells.
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_ROWS" id="bm_id3156362" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_ROWS" id="bm_id4603106" localize="false"/><paragraph role="heading" id="hd_id3155064" xml-lang="en-US" level="4" l10n="U" oldref="150"><switchinline select="appl"><caseinline select="CALC">By Rows
+<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_ROWS" id="bm_id4603106" localize="false"/>
+<paragraph role="heading" id="hd_id3155064" xml-lang="en-US" level="4" l10n="U" oldref="150"><switchinline select="appl"><caseinline select="CALC">By Rows
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id743430" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches from left to right across the rows.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_COLUMNS" id="bm_id3155445" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_COLUMNS" id="bm_id3145542" localize="false"/><paragraph role="heading" id="hd_id3156277" xml-lang="en-US" level="4" l10n="U" oldref="152"><switchinline select="appl"><caseinline select="CALC">By Columns
+<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_COLUMNS" id="bm_id3145542" localize="false"/>
+<paragraph role="heading" id="hd_id3156277" xml-lang="en-US" level="4" l10n="U" oldref="152"><switchinline select="appl"><caseinline select="CALC">By Columns
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3145207" xml-lang="en-US" l10n="CHG" oldref="153"><switchinline select="appl"><caseinline select="CALC">Searches from top to bottom through the columns.
</caseinline></switchinline></paragraph>
@@ -194,13 +224,14 @@ Ext help text not found within switches. Solution: Keep switched text for normal
<bookmark_value>sheets; searching all</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXDLG_SEARCH:CB_ALLTABLES" id="bm_id3151358" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_ALL_SHEETS" id="bm_id4897915" localize="false"/><paragraph role="heading" id="hd_id3152960" xml-lang="en-US" level="3" l10n="U" oldref="196"><switchinline select="appl"><caseinline select="CALC">Search in all sheets
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_ALL_SHEETS" id="bm_id4897915" localize="false"/>
+<paragraph role="heading" id="hd_id3152960" xml-lang="en-US" level="3" l10n="U" oldref="196"><switchinline select="appl"><caseinline select="CALC">Search in all sheets
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3145619" xml-lang="en-US" l10n="CHG" oldref="197"><switchinline select="appl"><caseinline select="CALC">Searches through all of the sheets in the current spreadsheet file.
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id4089175" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Searches through all of the sheets in the current spreadsheet file.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#schliessen"/>
-<paragraph role="tip" id="par_id3151101" xml-lang="en-US" l10n="U" oldref="188">After you close the <emph>Find &amp; Replace</emph> dialog, you can still search using the last search criteria that you entered, by pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="tip" id="par_id3151101" xml-lang="en-US" l10n="U" oldref="188">After you close the <emph>Find &amp; Replace</emph> dialog, you can still search using the last search criteria that you entered, by pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F.</paragraph>
<section id="relatedtopics">
<embed href="text/scalc/guide/finding.xhp#finding"/>
diff --git a/helpcontent2/source/text/shared/01/02100100.xhp b/helpcontent2/source/text/shared/01/02100100.xhp
index 60157ccf1b..1ebcb43de9 100755
--- a/helpcontent2/source/text/shared/01/02100100.xhp
+++ b/helpcontent2/source/text/shared/01/02100100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02100100.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0102100100xml" indexer="include" status="PUBLISH">
+<topic id="textshared0102100100xml" indexer="include">
<title id="tit" xml-lang="en-US">Similarity Search</title>
<filename>/text/shared/01/02100100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-05-03T14:49:58">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="aehnlichkeit">
@@ -48,12 +46,14 @@
<bookmark_value>finding; similarity search</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_SIMILARITY" id="bm_id3148410" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_APPROX" id="bm_id3154814" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_APPROXSETTINGS" id="bm_id3154817" localize="false"/>
<paragraph role="heading" id="hd_id3156045" xml-lang="en-US" level="1" l10n="U" oldref="52"><link href="text/shared/01/02100100.xhp" name="Similarity Search">Similarity Search</link></paragraph>
<paragraph role="paragraph" id="par_id3146856" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SVX_CHECKBOX_RID_SVXDLG_SEARCH_CB_SIMILARITY">Find terms that are similar to the <emph>Search for </emph>text. Select this checkbox, and then click the <emph>...</emph> button to define the similarity options.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3149551" xml-lang="en-US" l10n="CHG" oldref="66">For example, a similarity search can find words that differ from the <emph>Search for </emph>text by two characters.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000402.xhp#suchenaehnlichkeit"/>
+<embed href="text/shared/00/00000402.xhp#suchenaehnlichkeit"/>
</section>
<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCH_PB_SIMILARITY" id="bm_id3155351" localize="false"/>
<paragraph role="heading" id="hd_id3154621" xml-lang="en-US" level="2" l10n="U" oldref="54">...</paragraph>
diff --git a/helpcontent2/source/text/shared/01/02230401.xhp b/helpcontent2/source/text/shared/01/02230401.xhp
index a43804f393..8f82e240ec 100644
--- a/helpcontent2/source/text/shared/01/02230401.xhp
+++ b/helpcontent2/source/text/shared/01/02230401.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02230401.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -111,7 +111,7 @@
</switch>
<bookmark xml-lang="en-US" branch="hid/HID_REDLINING_VIEW_DG_VIEW" id="bm_id3151384" localize="false"/>
<paragraph role="heading" id="hd_id3153146" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection field</paragraph>
-<paragraph role="paragraph" id="par_id3161459" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_REDLINING_VIEW_DG_VIEW">Lists the changes that were recorded in the document. When you select an entry in the list, the change is highlighted in the document. To sort the list, click a column heading. </ahelp> Hold down Ctrl while you click to select multiple entries in the list.</paragraph>
+<paragraph role="paragraph" id="par_id3161459" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_REDLINING_VIEW_DG_VIEW">Lists the changes that were recorded in the document. When you select an entry in the list, the change is highlighted in the document. To sort the list, click a column heading. </ahelp> Hold down <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>while you click to select multiple entries in the list.</paragraph>
<paragraph role="tip" id="par_id3152812" xml-lang="en-US" l10n="U" oldref="6">To edit the comment for an entry in the list, right-click the entry, and then choose<emph> Edit - Comment</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="U" oldref="7">After you accept or reject a change, the entries of the list are re-ordered according to "Accepted" or "Rejected" status.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/03010000.xhp b/helpcontent2/source/text/shared/01/03010000.xhp
index bd0577ae45..8630186bc6 100644
--- a/helpcontent2/source/text/shared/01/03010000.xhp
+++ b/helpcontent2/source/text/shared/01/03010000.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: 03010000.xhp,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +37,7 @@
<meta>
-<topic id="textshared0103010000xml" indexer="include">
+<topic id="textshared0103010000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Zoom &amp; View Layout</title>
<filename>/text/shared/01/03010000.xhp</filename>
</topic>
diff --git a/helpcontent2/source/text/shared/01/03110000.xhp b/helpcontent2/source/text/shared/01/03110000.xhp
index aa110fab3e..2bfff092f2 100644
--- a/helpcontent2/source/text/shared/01/03110000.xhp
+++ b/helpcontent2/source/text/shared/01/03110000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 03110000.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -60,9 +60,8 @@
<embed href="text/shared/00/00000403.xhp#ganzer"/>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_FULLSCREENTOOLBOX" id="bm_id3154673" localize="false"/>
-<paragraph role="paragraph" id="par_id3152594" xml-lang="en-US" l10n="CHG" oldref="29"><ahelp hid="HID_FULLSCREENTOOLBOX">In Writer and Calc, you can also use the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+J to switch between the normal and full screen mode.</ahelp></paragraph>
-<paragraph role="note" id="par_id3154318" xml-lang="en-US" l10n="U" oldref="28">You can still use shortcut keys in <emph>Full Screen</emph> mode, even though the menus are unavailable. <switchinline select="sys"><caseinline select="WIN">To open the<emph> View</emph> menu, press Alt+V.
+<paragraph role="paragraph" id="par_id3152594" xml-lang="en-US" l10n="CHG" oldref="29"><ahelp hid="HID_FULLSCREENTOOLBOX">In Writer and Calc, you can also use the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+J to switch between the normal and full screen mode.</ahelp></paragraph>
+<paragraph role="note" id="par_id3154318" xml-lang="en-US" l10n="U" oldref="28">You can still use shortcut keys in <emph>Full Screen</emph> mode, even though the menus are unavailable. <switchinline select="sys"><caseinline select="WIN">To open the <emph>View</emph> menu, press Alt+V.
</caseinline></switchinline></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/03990000.xhp b/helpcontent2/source/text/shared/01/03990000.xhp
index e7d8efa39a..43790c567d 100755
--- a/helpcontent2/source/text/shared/01/03990000.xhp
+++ b/helpcontent2/source/text/shared/01/03990000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 03990000.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,67 +32,26 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0103990000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0103990000xml" indexer="include">
<title id="tit" xml-lang="en-US">Toolbars</title>
<filename>/text/shared/01/03990000.xhp</filename>
</topic>
</meta>
<body>
-<section id="symbolleisten">
<bookmark xml-lang="en-US" branch="hid/SID_AVAILABLE_TOOLBARS" id="bm_id3563981" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AvailableToolbars" id="bm_id1033356" localize="false"/><paragraph role="heading" id="hd_id3160463" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/03990000.xhp" name="Toolbars">Toolbars</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:AvailableToolbars" id="bm_id1033356" localize="false"/>
+<paragraph role="heading" id="hd_id3160463" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/03990000.xhp" name="Toolbars">Toolbars</link></paragraph>
<paragraph role="paragraph" id="par_id3149748" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Opens a submenu to show and hide toolbars.</ahelp> A toolbar contains icons and options that let you quickly access $[officename] commands.</paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000403.xhp#symbolleisten"/>
-</section>
-<sort order="asc"><section id="Section1">
-<embed href="text/shared/01/03020000.xhp#funktionsleiste"/>
-</section>
-<section id="Section2">
-<embed href="text/shared/01/03050000.xhp#werkzeugleiste"/>
-</section>
-<section id="Section3">
-<embed href="text/shared/01/04110000.xhp#hyperlink"/>
-</section>
-<section id="Section4">
-<switch select="appl">
-<case select="DRAW"><embed href="text/sdraw/main0213.xhp#optionsleiste"/>
-</case>
-</switch></section>
-<section id="Section5">
-<switch select="appl">
-<case select="IMPRESS"><embed href="text/simpress/main0213.xhp#optionsleiste"/>
-</case>
-</switch></section>
-<section id="Section6">
-<switch select="appl">
-<case select="IMPRESS"><embed href="text/simpress/01/03070000.xhp#praesentation"/>
-</case>
-</switch></section>
-<section id="Section8">
-<switch select="appl">
-<case select="DRAW"><embed href="text/shared/01/03170000.xhp#farbleiste"/>
-</case>
-</switch></section>
-<section id="Section9">
-<switch select="appl">
-<case select="IMPRESS"><embed href="text/shared/01/03170000.xhp#farbleiste"/>
-</case>
-</switch></section>
-<section id="Section7">
-<switch select="appl">
-<case select="CALC"><embed href="text/scalc/01/03090000.xhp#rechenleiste"/>
-</case>
-</switch></section>
-</sort>
-<paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="2" l10n="CHG" oldref="3"><link href="text/shared/guide/edit_symbolbar.xhp" name="Customize Toolbar">Customize Toolbar</link></paragraph>
+<paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="2" l10n="CHG" oldref="3"><link href="text/shared/guide/edit_symbolbar.xhp" name="Customize">Customize</link></paragraph>
<paragraph role="paragraph" id="par_id2789086" xml-lang="en-US" l10n="NEW">Opens a dialog where you can add, edit, and remove icons.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.cmd:RestoreVisibility" id="bm_id9156773" localize="false"/><paragraph role="heading" id="hd_id371715" xml-lang="en-US" level="2" l10n="NEW">Reset</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.cmd:RestoreVisibility" id="bm_id9156773" localize="false"/>
+<paragraph role="heading" id="hd_id371715" xml-lang="en-US" level="2" l10n="NEW">Reset</paragraph>
<paragraph role="paragraph" id="par_id1886654" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose <emph>View - Toolbars - Reset</emph> to reset the toolbars to their default context sensitive behavior. Now some toolbars will be shown automatically, dependent on the context.</ahelp><comment>UFI: #i63811</comment></paragraph>
+<section id="relatedtopics">
+<embed href="text/shared/guide/floating_toolbar.xhp#floating_toolbar"/>
+</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/04050000.xhp b/helpcontent2/source/text/shared/01/04050000.xhp
index 52bb35a8ad..d4129c08fd 100644
--- a/helpcontent2/source/text/shared/01/04050000.xhp
+++ b/helpcontent2/source/text/shared/01/04050000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04050000.xhp,v $
- *
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -63,7 +61,8 @@
<switch select="appl">
<case select="WRITER"><comment>Writer</comment>
<paragraph role="heading" id="hd_id9851680" xml-lang="en-US" level="2" l10n="NEW">Inserting notes</paragraph>
-<paragraph role="paragraph" id="par_id1830500" xml-lang="en-US" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Note</item> or the Ctrl+Alt+N key combination inserts a note anchor at the current cursor position. A note box is shown at the page margin, where you can enter the text of your note. A line connects anchor and note box.</paragraph>
+<paragraph role="paragraph" id="par_id1830500" xml-lang="en-US" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Note</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+N key combination inserts a note anchor at the current cursor position. A note box is shown at the page margin, where you can enter the text of your note. A line connects anchor and note box.</paragraph>
<paragraph role="paragraph" id="par_id1831" xml-lang="en-US" l10n="NEW">The author name and the date and time of creating this note is shown at the bottom of the note box.</paragraph>
<paragraph role="paragraph" id="par_id6718649" xml-lang="en-US" l10n="NEW">The notes by different authors get different colors. Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the note author.</paragraph>
<paragraph role="heading" id="hd_id2929166" xml-lang="en-US" level="2" l10n="NEW">Editing notes</paragraph>
@@ -75,9 +74,13 @@
<paragraph role="paragraph" id="par_id0522200809383485" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all notes by this author in the current document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_DELETE_ALL_NOTES" id="bm_id0429200810593994" localize="false"/>
<paragraph role="paragraph" id="par_id0522200809383428" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all notes in the current document.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1857051" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose a command to delete the current note, or all notes from the same author as the current note, or all notes in the document.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id1857051" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Choose a command to delete the current note, or all notes from the same author as the current note, or all notes in the document.</ahelp></paragraph><comment>View - Notes command</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:ShowAnnotations" id="bm_id0804200803411260" localize="false"/>
+<paragraph role="paragraph" id="par_id0804200803435883" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use <item type="menuitem">View - Notes</item> to show or hide all notes.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3445539" xml-lang="en-US" level="2" l10n="NEW">Navigating from note to note</paragraph>
-<paragraph role="paragraph" id="par_id4271370" xml-lang="en-US" l10n="NEW">When the cursor is inside a note, you can press Ctrl+Alt+Page Down to jump to the next note, or press Ctrl+Alt+Page Up to jump to the previous note.</paragraph>
+<paragraph role="paragraph" id="par_id4271370" xml-lang="en-US" l10n="NEW">When the cursor is inside a note, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Down to jump to the next note, or press <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Up to jump to the previous note.</paragraph>
<paragraph role="paragraph" id="par_id2116153" xml-lang="en-US" l10n="NEW">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous note anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one note anchor to the next note anchor.</paragraph>
<paragraph role="tip" id="par_id5381328" xml-lang="en-US" l10n="NEW">You can also open the Navigator to see a list of all notes. Right-click a note name in the Navigator to edit or delete the note.</paragraph>
<paragraph role="heading" id="hd_id5664235" xml-lang="en-US" level="2" l10n="NEW">Printing notes</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05020100.xhp b/helpcontent2/source/text/shared/01/05020100.xhp
index 3014fb7b15..fd05be04a3 100644
--- a/helpcontent2/source/text/shared/01/05020100.xhp
+++ b/helpcontent2/source/text/shared/01/05020100.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05020100.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -112,7 +112,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_LANG_NOCJK" id="bm_id3149204" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_LANG" id="bm_id3154068" localize="false"/>
<paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="2" l10n="U" oldref="38">Language</paragraph>
-<paragraph role="paragraph" id="par_id3157961" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_LANG">Sets the language that the spellchecker uses for the selected text of the text that you type. Available language modules have a check mark in front of them.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3157961" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_NAME_LB_CTL_LANG">Sets the language that the spellchecker uses for the selected text or the text that you type. Available language modules have a check mark in front of them.</ahelp></paragraph>
<switch select="appl">
<case select="CALC">
<paragraph role="note" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="59">You can only change the language setting for cells (choose <emph>Format - Cells – Numbers</emph>).</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05020301.xhp b/helpcontent2/source/text/shared/01/05020301.xhp
index 08fcdfb36c..567c64a43b 100644
--- a/helpcontent2/source/text/shared/01/05020301.xhp
+++ b/helpcontent2/source/text/shared/01/05020301.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05020301.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0105020301xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105020301xml" indexer="include">
<title id="tit" xml-lang="en-US">Number Format Codes</title>
<filename>/text/shared/01/05020301.xhp</filename>
</topic>
@@ -52,10 +50,11 @@
<bookmark_value>Euro; currency formats</bookmark_value>
<bookmark_value>date formats</bookmark_value>
<bookmark_value>times, formats</bookmark_value>
-</bookmark><comment>mw made "time formats" a two level entry and deleted 2x "formats;"</comment><paragraph role="heading" id="hd_id3153514" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="zahlenformatcodes"><link href="text/shared/01/05020301.xhp" name="Number Format Codes">Number Format Codes</link>
+</bookmark><comment>mw made "time formats" a two level entry and deleted 2x "formats;"</comment>
+<paragraph role="heading" id="hd_id3153514" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="zahlenformatcodes"><link href="text/shared/01/05020301.xhp" name="Number Format Codes">Number Format Codes</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3150467" xml-lang="en-US" l10n="U" oldref="88">Number format codes can consist of up to three sections separated by a semicolon (;).</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3150146" xml-lang="en-US" l10n="U" oldref="108">In a number format code with two sections, the first section applies to positive values and zero, and the second section applies to negative values.</paragraph>
</listitem>
@@ -63,7 +62,7 @@
<paragraph role="listitem" id="par_id3158442" xml-lang="en-US" l10n="CHG" oldref="109">In a number format code with three sections, the first section applies to positive values, the second section to negative values, and the third section to the value zero.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3155069" xml-lang="en-US" l10n="U" oldref="110">You can also assign conditions to the three sections, so that the format is only applied if a condition is met.</paragraph>
</listitem>
@@ -74,109 +73,112 @@
<paragraph role="paragraph" id="par_id3148440" xml-lang="en-US" l10n="U" oldref="4">If a number contains more digits to the right of the decimal delimiter than there are placeholders in the format, the number is rounded accordingly. If a number contains more digits to the left of the decimal delimiter than there are placeholders in the format, the entire number is displayed. Use the following list as a guide for using placeholders when you create a number format code:</paragraph>
<table id="tbl_id3149760">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150902" xml-lang="en-US" l10n="U" oldref="86">Placeholders</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3157896" xml-lang="en-US" l10n="U" oldref="87">Explanation</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="5">#</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="6">Does not display extra zeros.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="7">0 (Zero)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="8">Displays extra zeros if the number has less places than zeros in the format.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="par_idN1087E" xml-lang="en-US" level="3" l10n="NEW">Examples</paragraph>
<table id="tbl_id3153577">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="9">Number Format</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="10">Format Code</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="11">3456.78 as 3456.8</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="12">####.#</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154142" xml-lang="en-US" l10n="U" oldref="13">9.9 as 9.900</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3159256" xml-lang="en-US" l10n="U" oldref="14">#.000</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147077" xml-lang="en-US" l10n="U" oldref="15">13 as 13.0 and 1234.567 as 1234.57</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="16">#.0#</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="17">5.75 as 5 3/4 and 6.3 as 6 3/10</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="18"># ???/???</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156152" xml-lang="en-US" l10n="U" oldref="19">.5 as 0.5</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="20">0.##</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3149276" xml-lang="en-US" level="3" l10n="U" oldref="230">Thousands Separator</paragraph>
<paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="U" oldref="21">Depending on your language setting, you can use a comma or a period as a thousands separator. You can also use the separator to reduce the size of the number that is displayed by a multiple of 1000.</paragraph>
<table id="tbl_id3150244">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154905" xml-lang="en-US" l10n="U" oldref="22">Number Format</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150822" xml-lang="en-US" l10n="U" oldref="23">Format Code</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="24">15000 as 15,000</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3151223" xml-lang="en-US" l10n="U" oldref="25">#,###</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154935" xml-lang="en-US" l10n="U" oldref="26">16000 as 16</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3153961" xml-lang="en-US" l10n="U" oldref="27">#,</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3154836" xml-lang="en-US" level="2" l10n="U" oldref="79">Including Text in Number Format Codes</paragraph>
<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="231">Text and Numbers</paragraph>
<paragraph role="paragraph" id="par_id3154224" xml-lang="en-US" l10n="U" oldref="80">To include text in a number format that is applied to a cell containing numbers, place a double quotation mark (") in front of and behind the text, or a backslash (\) before a single character. For example, enter <emph>#.# "meters"</emph> to display "3.5 meters" or <emph>#.# \m</emph> to display "3.5 m".</paragraph>
@@ -188,38 +190,39 @@
<paragraph role="paragraph" id="par_id3156423" xml-lang="en-US" l10n="U" oldref="28">To set the color of a section of a number format code, insert one of the following color names in square brackets [ ]:</paragraph>
<table id="tbl_id3157321">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154630" xml-lang="en-US" l10n="U" oldref="29">CYAN</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3148676" xml-lang="en-US" l10n="U" oldref="30">GREEN</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="31">BLACK</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="32">BLUE</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3158407" xml-lang="en-US" l10n="U" oldref="33">MAGENTA</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="34">RED</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3147502" xml-lang="en-US" l10n="U" oldref="35">WHITE</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3153368" xml-lang="en-US" l10n="U" oldref="36">YELLOW</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3147435" xml-lang="en-US" level="2" l10n="U" oldref="111">Conditions</paragraph>
<paragraph role="heading" id="hd_id3148575" xml-lang="en-US" level="3" l10n="U" oldref="235">Conditional Brackets</paragraph>
<paragraph role="paragraph" id="par_id3155312" xml-lang="en-US" l10n="U" oldref="112">You can define a number format so that it only applies when the condition that you specify is met. Conditions are enclosed by square brackets [ ].</paragraph>
@@ -245,353 +248,593 @@
<paragraph role="warning" id="par_id610980" xml-lang="en-US" l10n="NEW">Not all format codes give meaningful results for all languages.</paragraph>
<table id="tbl_id3147426">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3152376" xml-lang="en-US" l10n="U" oldref="39">Format</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3159130" xml-lang="en-US" l10n="U" oldref="40">Format Code</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147380" xml-lang="en-US" l10n="U" oldref="41">Month as 3.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3146928" xml-lang="en-US" l10n="U" oldref="42">M</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145594" xml-lang="en-US" l10n="U" oldref="43">Month as 03.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3153052" xml-lang="en-US" l10n="U" oldref="44">MM</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145728" xml-lang="en-US" l10n="U" oldref="45">Month as Jan-Dec</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3151073" xml-lang="en-US" l10n="U" oldref="46">MMM</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149909" xml-lang="en-US" l10n="U" oldref="47">Month as January-December</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155318" xml-lang="en-US" l10n="U" oldref="48">MMMM</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151218" xml-lang="en-US" l10n="U" oldref="116">First letter of Name of Month</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3150420" xml-lang="en-US" l10n="U" oldref="117">MMMMM</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154501" xml-lang="en-US" l10n="U" oldref="49">Day as 2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3156181" xml-lang="en-US" l10n="U" oldref="50">D</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146969" xml-lang="en-US" l10n="U" oldref="51">Day as 02</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3156358" xml-lang="en-US" l10n="U" oldref="52">DD</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148495" xml-lang="en-US" l10n="U" oldref="53">Day as Sun-Sat</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3161665" xml-lang="en-US" l10n="U" oldref="54">NN or DDD</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154272" xml-lang="en-US" l10n="U" oldref="118">Day as Sunday to Saturday</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3145164" xml-lang="en-US" l10n="U" oldref="119">NNN or DDDD</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146791" xml-lang="en-US" l10n="U" oldref="55">Day followed by comma, as in "Sunday,"</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3146081" xml-lang="en-US" l10n="U" oldref="56">NNNN</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156275" xml-lang="en-US" l10n="U" oldref="57">Year as 00-99</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3143236" xml-lang="en-US" l10n="U" oldref="58">YY</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148408" xml-lang="en-US" l10n="U" oldref="59">Year as 1900-2078</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3151358" xml-lang="en-US" l10n="U" oldref="60">YYYY</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153355" xml-lang="en-US" l10n="U" oldref="96">Calendar week</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3150744" xml-lang="en-US" l10n="U" oldref="97">WW</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154302" xml-lang="en-US" l10n="U" oldref="103">Quarterly as Q1 to Q4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3159266" xml-lang="en-US" l10n="U" oldref="104">Q (K in swedish locales, T in french and spanish locales)</paragraph>
+<tablecell>
+<paragraph role="code" id="par_id3159266" xml-lang="en-US" l10n="CHG" oldref="104">Q</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147583" xml-lang="en-US" l10n="U" oldref="105">Quarterly as 1st quarter to 4th quarter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3146918" xml-lang="en-US" l10n="U" oldref="106">QQ</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147534" xml-lang="en-US" l10n="U" oldref="120">Era on the Japanese Gengou calendar, single character (possible values are: M, T, S, H)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3151249" xml-lang="en-US" l10n="U" oldref="121">G</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3163806" xml-lang="en-US" l10n="U" oldref="122">Era, abbreviation</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155962" xml-lang="en-US" l10n="U" oldref="123">GG</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151187" xml-lang="en-US" l10n="U" oldref="124">Era, full name</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149568" xml-lang="en-US" l10n="U" oldref="125">GGG</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147344" xml-lang="en-US" l10n="U" oldref="126">Number of the year within an era, without a leading zero for single-digit years</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3147255" xml-lang="en-US" l10n="U" oldref="127">E</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148487" xml-lang="en-US" l10n="U" oldref="128">Number of the year within an era, with a leading zero for single-digit years</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3150298" xml-lang="en-US" l10n="U" oldref="129">EE or R</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152861" xml-lang="en-US" l10n="U" oldref="138">Era, full name and year</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149926" xml-lang="en-US" l10n="U" oldref="139">RR or GGGEE</paragraph>
</tablecell>
</tablerow>
+</table>
+
+<paragraph role="paragraph" id="par_id1002200811423518" xml-lang="en-US" l10n="NEW">The above listed formatting codes work with your language version of %PRODUCTNAME. However, when you need to switch the locale of %PRODUCTNAME to another locale, you will need to know the formatting codes used in that other locale. </paragraph>
+<paragraph role="paragraph" id="par_id1002200811423556" xml-lang="en-US" l10n="NEW">For example, if your software is set to an English locale, and you want to format a year with four digits, you enter YYYY as a formatting code. When you switch to a German locale, you must use JJJJ instead. The following table lists only the localized differences.</paragraph>
+<table id="tbl_id1002200811465915">
+<tablerow>
+<tablecell>
+<paragraph role="tablehead" id="par_id1002200811563044" xml-lang="en-US" l10n="NEW">Locale</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id1002200811563137" xml-lang="en-US" l10n="NEW">Year</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id1002200811563164" xml-lang="en-US" l10n="NEW">Month</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id1002200811563128" xml-lang="en-US" l10n="NEW">Day</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id1002200811563135" xml-lang="en-US" l10n="NEW">Hour</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id1002200811563289" xml-lang="en-US" l10n="NEW">Day Of Week</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_id100220081156322" xml-lang="en-US" l10n="NEW">Era</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563233" xml-lang="en-US" l10n="NEW">English - en</paragraph>
+<paragraph role="tablecontent" id="par_id1002200811563243" xml-lang="en-US" l10n="NEW">and all not listed locales</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563352" xml-lang="en-US" l10n="NEW">Y</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563396" xml-lang="en-US" l10n="NEW">M</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563385" xml-lang="en-US" l10n="NEW">D</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563472" xml-lang="en-US" l10n="NEW">H</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563430" xml-lang="en-US" l10n="NEW">A</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563488" xml-lang="en-US" l10n="NEW">G</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563484" xml-lang="en-US" l10n="NEW">German - de</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563518" xml-lang="en-US" l10n="NEW">J</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563735" xml-lang="en-US" l10n="NEW">T</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563823" xml-lang="en-US" l10n="NEW">Netherlands - nl</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563852" xml-lang="en-US" l10n="NEW">J</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563827" xml-lang="en-US" l10n="NEW">U</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563916" xml-lang="en-US" l10n="NEW">French - fr</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563970" xml-lang="en-US" l10n="NEW">A</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811563980" xml-lang="en-US" l10n="NEW">J</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564065" xml-lang="en-US" l10n="NEW">O</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id100220081156407" xml-lang="en-US" l10n="NEW">Italian - it</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id100220081156403" xml-lang="en-US" l10n="NEW">A</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564042" xml-lang="en-US" l10n="NEW">G</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id100220081156412" xml-lang="en-US" l10n="NEW">O</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564119" xml-lang="en-US" l10n="NEW">X</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564197" xml-lang="en-US" l10n="NEW">Portuguese - pt</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564272" xml-lang="en-US" l10n="NEW">A</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id100220081156423" xml-lang="en-US" l10n="NEW">O</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564218" xml-lang="en-US" l10n="NEW">Spanish - es</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564390" xml-lang="en-US" l10n="NEW">A</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564319" xml-lang="en-US" l10n="NEW">O</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id100220081156433" xml-lang="en-US" l10n="NEW">Danish - da</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id100220081156444" xml-lang="en-US" l10n="NEW">T</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564448" xml-lang="en-US" l10n="NEW">Norwegian - no, nb, nn</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564549" xml-lang="en-US" l10n="NEW">T</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564565" xml-lang="en-US" l10n="NEW">Swedish - sv</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564556" xml-lang="en-US" l10n="NEW">T</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
+</tablecell>
+</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152776" xml-lang="en-US" l10n="U" oldref="214">Arabic Islamic format</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564637" xml-lang="en-US" l10n="NEW">Finnish - fi</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564627" xml-lang="en-US" l10n="NEW">V</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564643" xml-lang="en-US" l10n="NEW">K</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564763" xml-lang="en-US" l10n="NEW">P</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="code" id="par_id3159103" xml-lang="en-US" l10n="U" oldref="215">AAA or AAAA</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1002200811564715" xml-lang="en-US" l10n="NEW">T</paragraph>
+</tablecell>
+<tablecell>
+</tablecell>
+<tablecell>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3149929" xml-lang="en-US" level="3" l10n="U" oldref="227">Entering Dates</paragraph>
<paragraph role="paragraph" id="par_id3148397" xml-lang="en-US" l10n="U" oldref="228">To enter a date in a cell, use the Gregorian calendar format. For example, in an English locale, enter 1/2/2002 for Jan 2, 2002.</paragraph>
<paragraph role="paragraph" id="par_id3153274" xml-lang="en-US" l10n="U" oldref="137">All date formats are dependent on the locale that is set in <emph>Tools - Options - Language settings - Languages</emph>. For example, if your locale is set to 'Japanese', then the Gengou calendar is used. The default date format in <item type="productname">%PRODUCTNAME</item> uses the Gregorian Calendar.</paragraph>
<paragraph role="paragraph" id="par_id3153795" xml-lang="en-US" l10n="U" oldref="216">To specify a calendar format that is independent of the locale, add a modifier in front of the date format. For example, to display a date using the Jewish calendar format in a non-Hebrew locale, enter: [~jewish]DD/MM/YYYY.</paragraph>
<table id="tbl_id3145133">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3145764" xml-lang="en-US" l10n="U" oldref="217">Modifier</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3152967" xml-lang="en-US" l10n="U" oldref="218">Calendar</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3148390" xml-lang="en-US" l10n="U" oldref="219">[~buddhist]</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153781" xml-lang="en-US" l10n="U" oldref="220">Thai Buddhist Calendar</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3157969" xml-lang="en-US" l10n="U" oldref="133">[~gengou]</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154656" xml-lang="en-US" l10n="U" oldref="134">Japanese Gengou Calendar</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3150086" xml-lang="en-US" l10n="U" oldref="131">[~gregorian]</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146070" xml-lang="en-US" l10n="U" oldref="132">Gregorian Calendar</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3146808" xml-lang="en-US" l10n="U" oldref="221">[~hanja] or [~hanja_yoil]</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149207" xml-lang="en-US" l10n="U" oldref="136">Korean Calendar</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3150304" xml-lang="en-US" l10n="U" oldref="222">[~hijri]</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149238" xml-lang="en-US" l10n="U" oldref="223">Arabic Islamic Calendar, currently supported for the following locales: ar_EG, ar_LB, ar_SA, and ar_TN</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154903" xml-lang="en-US" l10n="U" oldref="224">[~jewish]</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151288" xml-lang="en-US" l10n="U" oldref="225">Jewish Calendar</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3166442" xml-lang="en-US" l10n="U" oldref="135">[~ROC]</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145587" xml-lang="en-US" l10n="U" oldref="226">Republic Of China Calendar</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3152419" xml-lang="en-US" l10n="U" oldref="140"><switchinline select="appl"><caseinline select="CALC">If you perform a calculation that involves one or more cells using a date format, the result is formatted according to the following mappings:
</caseinline></switchinline></paragraph>
<switch select="appl">
-<case select="CALC"><table id="tbl_id3150490">
+<case select="CALC">
+<table id="tbl_id3150490">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154194" xml-lang="en-US" l10n="U" oldref="141">Initial Format</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149787" xml-lang="en-US" l10n="U" oldref="142">Result Format</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152993" xml-lang="en-US" l10n="U" oldref="143">Date + Date</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150292" xml-lang="en-US" l10n="U" oldref="144">Number (Days)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150460" xml-lang="en-US" l10n="U" oldref="145">Date + Number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154371" xml-lang="en-US" l10n="U" oldref="146">Date</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145082" xml-lang="en-US" l10n="U" oldref="147">Date + Time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156290" xml-lang="en-US" l10n="U" oldref="148">Date&amp;Time</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152456" xml-lang="en-US" l10n="U" oldref="149">Date + Date&amp;Time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156169" xml-lang="en-US" l10n="U" oldref="150">Number</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154527" xml-lang="en-US" l10n="U" oldref="151">Time + Time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159625" xml-lang="en-US" l10n="U" oldref="152">Time</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146802" xml-lang="en-US" l10n="U" oldref="153">Time + Number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146770" xml-lang="en-US" l10n="U" oldref="154">Time</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155500" xml-lang="en-US" l10n="U" oldref="155">Time + Date&amp;Time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155128" xml-lang="en-US" l10n="U" oldref="156">Date&amp;Time</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152904" xml-lang="en-US" l10n="U" oldref="157">Date&amp;Time + Date&amp;Time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159143" xml-lang="en-US" l10n="U" oldref="158">Time</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148909" xml-lang="en-US" l10n="U" oldref="159">Date&amp;Time + Number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154806" xml-lang="en-US" l10n="U" oldref="160">Date&amp;Time</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151269" xml-lang="en-US" l10n="U" oldref="161">Number + Number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154951" xml-lang="en-US" l10n="U" oldref="162">Number</paragraph>
</tablecell>
</tablerow>
</table>
+
</case>
</switch>
<paragraph role="paragraph" id="par_id3149174" xml-lang="en-US" l10n="U" oldref="163"><switchinline select="appl"><caseinline select="CALC">The Date&amp;Time format displays the date and time that an entry was made to a cell with this format.
@@ -605,62 +848,63 @@
<paragraph role="paragraph" id="par_id3150108" xml-lang="en-US" l10n="U" oldref="62">To display hours, minutes and seconds use the following number format codes.</paragraph>
<table id="tbl_id3154830">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149158" xml-lang="en-US" l10n="U" oldref="63">Format</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154341" xml-lang="en-US" l10n="U" oldref="64">Format Code</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154557" xml-lang="en-US" l10n="U" oldref="65">Hours as 0-23</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3156348" xml-lang="en-US" l10n="U" oldref="66">h</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3143218" xml-lang="en-US" l10n="U" oldref="67">Hours as 00-23</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155266" xml-lang="en-US" l10n="U" oldref="68">hh</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150139" xml-lang="en-US" l10n="U" oldref="69">Minutes as 0-59</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149588" xml-lang="en-US" l10n="U" oldref="70">m</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150531" xml-lang="en-US" l10n="U" oldref="71">Minutes as 00-59</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3147409" xml-lang="en-US" l10n="U" oldref="72">mm</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154854" xml-lang="en-US" l10n="U" oldref="73">Seconds as 0-59</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3156173" xml-lang="en-US" l10n="U" oldref="74">s</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149506" xml-lang="en-US" l10n="U" oldref="75">Seconds as 00-59</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3157981" xml-lang="en-US" l10n="U" oldref="76">ss</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="note" id="par_id3156039" xml-lang="en-US" l10n="U" oldref="77">To display seconds as fractions, add the decimal delimiter to your number format code. For example, enter <emph>hh:mm:ss.00</emph> to display the time as "01:02:03.45".<comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment></paragraph>
<paragraph role="paragraph" id="par_id3148649" xml-lang="en-US" l10n="U" oldref="102">If a time is entered in the form 02:03.45 or 01:02:03.45 or 25:01:02, the following formats are assigned if no other time format has been specified: MM:SS.00 or [HH]:MM:SS.00 or [HH]:MM:SS<comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment></paragraph>
<paragraph role="heading" id="hd_id3158404" xml-lang="en-US" level="2" l10n="U" oldref="169">Displaying Numbers Using Native Characters</paragraph>
@@ -672,200 +916,201 @@
<paragraph role="heading" id="par_id3153111" xml-lang="en-US" level="3" l10n="CHG" oldref="174">[NatNum1] Transliterations</paragraph>
<table id="tbl_id1136841">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146895" xml-lang="en-US" l10n="U" oldref="175">Chinese: Chinese lower case characters; CAL: 1/7/7 [DBNum1]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152536" xml-lang="en-US" l10n="U" oldref="176">Japanese: short Kanji characters [DBNum1]; CAL: 1/4/4 [DBNum1]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146125" xml-lang="en-US" l10n="U" oldref="177">Korean: Korean lower case characters [DBNum1]; CAL: 1/7/7 [DBNum1]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149945" xml-lang="en-US" l10n="U" oldref="178">Thai: Thai characters</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153264" xml-lang="en-US" l10n="U" oldref="179">Arabic: Indic characters</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148973" xml-lang="en-US" l10n="U" oldref="180">Indic: Indic characters</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN112A3" xml-lang="en-US" l10n="NEW">Hebrew: Hebrew letters<comment>UFI: api-features "Hebrew numbering"</comment></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147520" xml-lang="en-US" l10n="U" oldref="181">[NatNum2] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155383" xml-lang="en-US" l10n="U" oldref="182">Chinese: Chinese upper case characters; CAL: 2/8/8 [DBNum2]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153931" xml-lang="en-US" l10n="U" oldref="183">Japanese: traditional Kanji characters; CAL: 2/5/5 [DBNum2]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155097" xml-lang="en-US" l10n="U" oldref="184">Korean: Korean upper case characters [DBNum2]; CAL: 2/8/8 [DBNum2]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152976" xml-lang="en-US" l10n="U" oldref="185">[NatNum3] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154353" xml-lang="en-US" l10n="U" oldref="186">Chinese: fullwidth Arabic digits; CAL: 3/3/3 [DBNum3]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154669" xml-lang="en-US" l10n="U" oldref="187">Japanese: fullwidth Arabic digits; CAL: 3/3/3 [DBNum3]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150472" xml-lang="en-US" l10n="U" oldref="188">Korean: fullwidth Arabic digits [DBNum3]; CAL: 3/3/3 [DBNum3]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3157811" xml-lang="en-US" l10n="U" oldref="189">[NatNum4] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154592" xml-lang="en-US" l10n="U" oldref="190">Chinese: lower case text [DBNum1]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150350" xml-lang="en-US" l10n="U" oldref="191">Japanese: modern long Kanji text [DBNum2]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150930" xml-lang="en-US" l10n="U" oldref="192">Korean: formal lower case text</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153546" xml-lang="en-US" l10n="U" oldref="193">[NatNum5] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155612" xml-lang="en-US" l10n="U" oldref="194">Chinese: Chinese upper case text [DBNum2]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155909" xml-lang="en-US" l10n="U" oldref="195">Japanese: traditional long Kanji text [DBNum3]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151304" xml-lang="en-US" l10n="U" oldref="196">Korean: formal upper case text</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155075" xml-lang="en-US" l10n="U" oldref="197">[NatNum6] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150214" xml-lang="en-US" l10n="U" oldref="198">Chinese: fullwidth text [DBNum3]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154114" xml-lang="en-US" l10n="U" oldref="199">Japanese: fullwidth text</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155344" xml-lang="en-US" l10n="U" oldref="200">Korean: fullwidth text</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155538" xml-lang="en-US" l10n="U" oldref="201">[NatNum7] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145123" xml-lang="en-US" l10n="U" oldref="202">Japanese: modern short Kanji text</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149424" xml-lang="en-US" l10n="U" oldref="203">Korean: informal lower case text</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153688" xml-lang="en-US" l10n="U" oldref="204">[NatNum8] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156122" xml-lang="en-US" l10n="U" oldref="205">Japanese: traditional short Kanji text [DBNum4]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145602" xml-lang="en-US" l10n="U" oldref="206">Korean: informal upper case text</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159228" xml-lang="en-US" l10n="U" oldref="207">[NatNum9] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154644" xml-lang="en-US" l10n="U" oldref="208">Korean: Hangul characters</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155396" xml-lang="en-US" l10n="U" oldref="209">[NatNum10] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150878" xml-lang="en-US" l10n="U" oldref="210">Korean: formal Hangul text [DBNum4]; CAL: 9/11/11 [DBNum4]</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149384" xml-lang="en-US" l10n="U" oldref="211">[NatNum11] Transliteration in</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154213" xml-lang="en-US" l10n="U" oldref="212">Korean: informal Hangul text</paragraph>
</tablecell>
</tablerow>
</table>
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05030300.xhp b/helpcontent2/source/text/shared/01/05030300.xhp
index 38830cb2bd..f7a10320e8 100755
--- a/helpcontent2/source/text/shared/01/05030300.xhp
+++ b/helpcontent2/source/text/shared/01/05030300.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05030300.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0105030300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105030300xml" indexer="include">
<title id="tit" xml-lang="en-US">Tabs</title>
<filename>/text/shared/01/05030300.xhp</filename>
</topic>
@@ -48,48 +46,62 @@
<bookmark_value>fill characters with tabulators</bookmark_value>
<bookmark_value>tab stops;settings</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_TABULATOR" id="bm_id3153311" localize="false"/><paragraph role="heading" id="hd_id3156027" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030300.xhp" name="Tabs">Tabs</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_TABULATOR" id="bm_id3153311" localize="false"/>
+<paragraph role="heading" id="hd_id3156027" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030300.xhp" name="Tabs">Tabs</link></paragraph>
<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_TABULATOR">Set the position of a tab stop in a paragraph.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="40">If you want, you can also use the ruler to set the tab positions.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#tabulator"/>
+<embed href="text/shared/00/00040500.xhp#tabulator"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SVX:METRICBOX:RID_SVXPAGE_TABULATOR:ED_TABPOS" id="bm_id3155390" localize="false"/><paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="2" l10n="U" oldref="3">Position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:METRICBOX:RID_SVXPAGE_TABULATOR:ED_TABPOS" id="bm_id3155390" localize="false"/>
+<paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="2" l10n="U" oldref="3">Position</paragraph>
<paragraph role="paragraph" id="par_id3153331" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SVX:METRICBOX:RID_SVXPAGE_TABULATOR:ED_TABPOS">Select a tab stop type, enter a new measurement, and then click <emph>New</emph>. If you want, you can also specify the measurement units to use for the tab (cm for centimeter, or " for inches). Existing tabs to the left of the first tab that you set are removed.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155180" xml-lang="en-US" level="2" l10n="U" oldref="9">Type</paragraph>
<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="10">Select the type of tab stop that you want to modify.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT" id="bm_id3153321" localize="false"/><paragraph role="heading" id="hd_id3157910" xml-lang="en-US" level="3" l10n="U" oldref="11">Left</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT" id="bm_id3153321" localize="false"/>
+<paragraph role="heading" id="hd_id3157910" xml-lang="en-US" level="3" l10n="U" oldref="11">Left</paragraph>
<paragraph role="paragraph" id="par_id3146847" xml-lang="en-US" l10n="U" oldref="41">The name of this tab stop is <emph>Left/Top</emph> if Asian language support is enabled.</paragraph>
<paragraph role="paragraph" id="par_id3153698" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT">Aligns the left edge of the text to the tab stop and extends the text to the right.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT" id="bm_id3159269" localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="13">Right</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT" id="bm_id3159269" localize="false"/>
+<paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="13">Right</paragraph>
<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="42">This name of this tab stop is <emph>Right/Bottom</emph> if Asian language support is enabled.</paragraph>
<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT">Aligns the right edge of the text to the tab stop and extends the text to the left of the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER" id="bm_id3152474" localize="false"/><paragraph role="heading" id="hd_id3153628" xml-lang="en-US" level="3" l10n="U" oldref="15">Center</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER" id="bm_id3152474" localize="false"/>
+<paragraph role="heading" id="hd_id3153628" xml-lang="en-US" level="3" l10n="U" oldref="15">Center</paragraph>
<paragraph role="paragraph" id="par_id3154347" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER">Aligns the center of the text to the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL" id="bm_id3149295" localize="false"/><paragraph role="heading" id="hd_id3148552" xml-lang="en-US" level="3" l10n="U" oldref="17">Decimal</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL" id="bm_id3149295" localize="false"/>
+<paragraph role="heading" id="hd_id3148552" xml-lang="en-US" level="3" l10n="U" oldref="17">Decimal</paragraph>
<paragraph role="paragraph" id="par_id3144422" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL">Aligns the decimal point of a number to the center of the tab stop and text to the left of the tab.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3154388" xml-lang="en-US" l10n="U" oldref="19"><switchinline select="sys"><caseinline select="WIN">The character that is used as a decimal separator depends on the regional setting of your operating system.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR" id="bm_id3150791" localize="false"/><paragraph role="heading" id="hd_id3153380" xml-lang="en-US" level="3" l10n="U" oldref="20">Character</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR" id="bm_id3150791" localize="false"/>
+<paragraph role="heading" id="hd_id3153380" xml-lang="en-US" level="3" l10n="U" oldref="20">Character</paragraph>
<paragraph role="paragraph" id="par_id3153778" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVX:EDIT:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR">Enter a character that you want the decimal tab to use as a decimal separator.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3159151" xml-lang="en-US" level="2" l10n="U" oldref="22">Fill Character</paragraph>
<paragraph role="paragraph" id="par_id3154153" xml-lang="en-US" l10n="U" oldref="23">Specify the characters to use as leader to the left of the tab stop.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO" id="bm_id3151178" localize="false"/><paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="3" l10n="U" oldref="24">None</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO" id="bm_id3151178" localize="false"/>
+<paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="3" l10n="U" oldref="24">None</paragraph>
<paragraph role="paragraph" id="par_id3143231" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO">Inserts no fill characters, or removes existing fill characters to the left of the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS" id="bm_id3150742" localize="false"/><paragraph role="heading" id="hd_id3152933" xml-lang="en-US" level="3" l10n="U" oldref="26">.......</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS" id="bm_id3150742" localize="false"/>
+<paragraph role="heading" id="hd_id3152933" xml-lang="en-US" level="3" l10n="U" oldref="26">.......</paragraph>
<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS">Fills the empty space to the left of the tab stop with dots.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE" id="bm_id3156424" localize="false"/><paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="3" l10n="U" oldref="28">------</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE" id="bm_id3156424" localize="false"/>
+<paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="3" l10n="U" oldref="28">------</paragraph>
<paragraph role="paragraph" id="par_id3156212" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE">Fills the empty space to the left of the tab stop with dashes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE" id="bm_id3150767" localize="false"/><paragraph role="heading" id="hd_id3157960" xml-lang="en-US" level="3" l10n="U" oldref="30">______</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE" id="bm_id3150767" localize="false"/>
+<paragraph role="heading" id="hd_id3157960" xml-lang="en-US" level="3" l10n="U" oldref="30">______</paragraph>
<paragraph role="paragraph" id="par_id3151043" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE">Draws a line to fill the empty space to the left of the tab stop.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER" id="bm_id3153057" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER" id="bm_id3151116" localize="false"/><paragraph role="heading" id="hd_id3153770" xml-lang="en-US" level="3" l10n="U" oldref="32">Character</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER" id="bm_id3151116" localize="false"/>
+<paragraph role="heading" id="hd_id3153770" xml-lang="en-US" level="3" l10n="U" oldref="32">Character</paragraph>
<paragraph role="paragraph" id="par_id3150441" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER">Allows you to specify a character to fill the empty space to the left of the tab stop.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_NEW" id="bm_id3156105" localize="false"/><paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="2" l10n="U" oldref="36">New</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_NEW" id="bm_id3156105" localize="false"/>
+<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="2" l10n="U" oldref="36">New</paragraph>
<paragraph role="paragraph" id="par_id3163717" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_NEW">Adds the tab stop that you defined to the current paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_DELALL" id="bm_id3153573" localize="false"/><paragraph role="heading" id="hd_id3153945" xml-lang="en-US" level="2" l10n="U" oldref="38">Clear All</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_DELALL" id="bm_id3153573" localize="false"/>
+<paragraph role="heading" id="hd_id3153945" xml-lang="en-US" level="2" l10n="U" oldref="38">Clear All</paragraph>
<paragraph role="paragraph" id="par_id3145660" xml-lang="en-US" l10n="CHG" oldref="39"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_DELALL">Removes all of the tab stops that you defined under <emph>Position</emph>. Sets <emph>Left</emph> tab stops at regular intervals as the default tab stops.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_TABULATOR:BTN_DEL" id="bm_id3156007" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen1"/>
+<embed href="text/shared/00/00000001.xhp#loeschen1"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05030700.xhp b/helpcontent2/source/text/shared/01/05030700.xhp
index 4f0b8030b8..dc6de00788 100755
--- a/helpcontent2/source/text/shared/01/05030700.xhp
+++ b/helpcontent2/source/text/shared/01/05030700.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05030700.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105030700xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105030700xml" indexer="include">
<title id="tit" xml-lang="en-US">Alignment</title>
<filename>/text/shared/01/05030700.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-16T14:54:11">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="ausrichtung">
@@ -59,7 +55,7 @@
<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_PARAGRAPH_ALIGN">Sets the alignment of the paragraph relative to the margins of page.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#absatzausrichtung"/>
+<embed href="text/shared/00/00040500.xhp#absatzausrichtung"/>
</section>
<paragraph role="heading" id="hd_id3143268" xml-lang="en-US" level="2" l10n="U" oldref="3">Alignment</paragraph>
<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="CHG" oldref="4">Set the alignment options for the current paragraph.</paragraph>
@@ -110,8 +106,11 @@
<section id="textflow">
<paragraph role="heading" id="hd_id3144434" xml-lang="en-US" level="2" l10n="U" oldref="23">Properties</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_TEXTDIRECTION" id="bm_id3151044" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FORMAT_TABLE_LB_TEXTDIRECTION" id="bm_id3149791" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_TEXTDIRECTION" id="bm_id3149797" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_COLUMN_LB_TEXTDIRECTION" id="bm_id3148971" localize="false"/>
<paragraph role="heading" id="hd_id3154631" xml-lang="en-US" level="3" l10n="U" oldref="25">Text direction</paragraph>
-<paragraph role="paragraph" id="par_id3157960" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_TEXTDIRECTION">Specify the text direction for a paragraph that uses complex text layout (CTL).</ahelp> This feature is only available if complex text layout support is enabled.</paragraph>
+<paragraph role="paragraph" id="par_id3157960" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_TEXTDIRECTION">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</ahelp></paragraph>
</section>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
</body>
diff --git a/helpcontent2/source/text/shared/01/05040200.xhp b/helpcontent2/source/text/shared/01/05040200.xhp
index 71686f81bd..7f1ef53547 100755
--- a/helpcontent2/source/text/shared/01/05040200.xhp
+++ b/helpcontent2/source/text/shared/01/05040200.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: 05040200.xhp,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.19.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +37,7 @@
<meta>
-<topic id="textshared0105040200xml" indexer="include">
+<topic id="textshared0105040200xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Page</title>
<filename>/text/shared/01/05040200.xhp</filename>
</topic>
diff --git a/helpcontent2/source/text/shared/01/05040300.xhp b/helpcontent2/source/text/shared/01/05040300.xhp
index 4fe1efadcf..293ffc9379 100644
--- a/helpcontent2/source/text/shared/01/05040300.xhp
+++ b/helpcontent2/source/text/shared/01/05040300.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05040300.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -59,7 +59,7 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3153827" xml-lang="en-US" l10n="U" oldref="31">If you want to extend a header into the page margins, insert a frame into the header.</paragraph>
<switch select="appl">
-<case select="WRITER"><paragraph role="tip" id="par_id3154046" xml-lang="en-US" l10n="CHG" oldref="29">To quickly move the text cursor from the document text to the header or footer, press Ctrl+Page Up or Ctrl+Page Down. Press the same key again to move the text cursor back into the document text.</paragraph>
+<case select="WRITER"><paragraph role="tip" id="par_id3154046" xml-lang="en-US" l10n="CHG" oldref="29">To quickly move the text cursor from the document text to the header or footer, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up or Page Down. Press the same key again to move the text cursor back into the document text.</paragraph>
</case>
</switch>
<paragraph role="heading" id="hd_id3152360" xml-lang="en-US" level="2" l10n="U" oldref="4">Header</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05040400.xhp b/helpcontent2/source/text/shared/01/05040400.xhp
index 02e3273b46..ffc76d66af 100644
--- a/helpcontent2/source/text/shared/01/05040400.xhp
+++ b/helpcontent2/source/text/shared/01/05040400.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05040400.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -59,7 +59,7 @@
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="30">If you want to extend a footer into the page margins, insert a frame into the footer.</paragraph>
<switch select="appl">
-<case select="WRITER"><paragraph role="tip" id="par_id3150976" xml-lang="en-US" l10n="CHG" oldref="28">To quickly move the text cursor from the document text to the header or footer, press Ctrl+Page Up or Ctrl+Page Down. Press the same key again to move the text cursor back into the document text.</paragraph>
+<case select="WRITER"><paragraph role="tip" id="par_id3150976" xml-lang="en-US" l10n="CHG" oldref="28">To quickly move the text cursor from the document text to the header or footer, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up or Page Down. Press the same key again to move the text cursor back into the document text.</paragraph>
</case>
</switch>
<paragraph role="heading" id="hd_id3150504" xml-lang="en-US" level="2" l10n="U" oldref="3">Footer</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05070000.xhp b/helpcontent2/source/text/shared/01/05070000.xhp
index 725f6e7cd0..06a1493731 100644
--- a/helpcontent2/source/text/shared/01/05070000.xhp
+++ b/helpcontent2/source/text/shared/01/05070000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05070000.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0105070000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105070000xml" indexer="include">
<title id="tit" xml-lang="en-US">Aligning (Objects)</title>
<filename>/text/shared/01/05070000.xhp</filename>
</topic>
@@ -48,12 +46,13 @@
<bookmark_value>positioning; objects</bookmark_value>
<bookmark_value>ordering; objects</bookmark_value>
</bookmark>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignFrameMenu" id="bm_id0801200803290113" localize="false"/>
<paragraph role="heading" id="hd_id3149987" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05070000.xhp" name="Aligning (Objects)">Alignment (Objects)</link></paragraph>
-<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="2">Aligns selected objects with respect to one another.</paragraph>
+<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Aligns selected objects with respect to one another.</ahelp></paragraph>
</section>
<paragraph role="note" id="par_id3150144" xml-lang="en-US" l10n="U" oldref="4">If one of the selected objects is anchored as a character, some of the alignment options do not work.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#ausrichtung"/>
+<embed href="text/shared/00/00040501.xhp#ausrichtung"/>
</section>
<paragraph role="note" id="par_id8872646" xml-lang="en-US" l10n="NEW">Not all types of objects can be selected together. Not all modules (Writer, Calc, Impress, Draw) support all types of alignment.</paragraph>
<embed href="text/shared/01/05070100.xhp#links"/>
diff --git a/helpcontent2/source/text/shared/01/05070100.xhp b/helpcontent2/source/text/shared/01/05070100.xhp
index 86bb235c62..ff703c3add 100644
--- a/helpcontent2/source/text/shared/01/05070100.xhp
+++ b/helpcontent2/source/text/shared/01/05070100.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05070100.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105070100xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105070100xml" indexer="include">
<title id="tit" xml-lang="en-US">Align Left</title>
<filename>/text/shared/01/05070100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-31T16:25:16">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="links">
@@ -50,11 +46,12 @@
<bookmark xml-lang="en-US" branch="hid/.uno:ObjectAlignLeft" id="bm_id3147294" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_ALIGNLEFT" id="bm_id4286842" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AlignLeft" id="bm_id3155619" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_ALIGN_HORZ_LEFT" id="bm_id0801200803221452" localize="false"/>
<paragraph role="heading" id="hd_id3147069" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05070100.xhp" name="Align Left">Align Left</link></paragraph>
<paragraph role="paragraph" id="par_id3160463" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AlignLeft">Aligns the left edges of the selected objects. If only one object is selected in Draw or Impress, the left edge of the object is aligned to the left page margin.</ahelp></paragraph><comment>UFI: this help id .uno:alignleft is also called from Calc, where it has a different function</comment>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#links"/>
+<embed href="text/shared/00/00040501.xhp#links"/>
</section>
<paragraph role="paragraph" id="par_id3150146" xml-lang="en-US" l10n="U" oldref="4">Objects are aligned to the left edge of the leftmost object in the selection.</paragraph>
<paragraph role="note" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="3"><variable id="mehrfachselektion">To align the individual objects in a group, <switchinline select="appl"><caseinline select="CALC">choose <emph>Format - Group - Edit Group</emph>
diff --git a/helpcontent2/source/text/shared/01/05070200.xhp b/helpcontent2/source/text/shared/01/05070200.xhp
index e559a7501f..705964ad62 100644
--- a/helpcontent2/source/text/shared/01/05070200.xhp
+++ b/helpcontent2/source/text/shared/01/05070200.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05070200.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,27 +32,25 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105070200xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105070200xml" indexer="include">
<title id="tit" xml-lang="en-US">Center Horizontal</title>
<filename>/text/shared/01/05070200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-23T15:16:20">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="zentriert">
<bookmark xml-lang="en-US" branch="hid/SID_OBJECT_ALIGN_CENTER" id="bm_id5496441" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AlignCenter" id="bm_id3160463" localize="false"/><comment>removed two lines HorizontalCenter</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignCenter" id="bm_id3160463" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_ALIGN_HORZ_CENTER" id="bm_id0801200803230778" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignHorizontalCenter" id="bm_id0801200803230775" localize="false"/>
<paragraph role="heading" id="hd_id3150278" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05070200.xhp" name="Center Horizontal">Center Horizontal</link></paragraph>
<paragraph role="paragraph" id="par_id3145138" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AlignHorizontalCenter">Horizontally centers the selected objects. If only one object is selected in Draw or Impress, the center of the object is aligned to the horizontal center of the page.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#azentriert"/>
+<embed href="text/shared/00/00040501.xhp#azentriert"/>
</section>
<paragraph role="paragraph" id="par_id3144336" xml-lang="en-US" l10n="U" oldref="3">The vertical position of the selected objects is not affected by this command.<embedvar href="text/shared/01/05070100.xhp#mehrfachselektion"/>
</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05070300.xhp b/helpcontent2/source/text/shared/01/05070300.xhp
index 5a72698df2..1b2b4e3f9d 100644
--- a/helpcontent2/source/text/shared/01/05070300.xhp
+++ b/helpcontent2/source/text/shared/01/05070300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05070300.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,31 +30,27 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105070300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105070300xml" indexer="include">
<title id="tit" xml-lang="en-US">Align Right</title>
<filename>/text/shared/01/05070300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-14T10:15:37">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="rechts">
-<bookmark xml-lang="en-US" branch="hid/SID_OBJECT_ALIGN_RIGHT" id="bm_id8583142" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_OBJECT_ALIGN_RIGHT" id="bm_id8583142" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ObjectAlignRight" id="bm_id3150756" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_ALIGN_HORZ_RIGHT" id="bm_id0801200803235699" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignRight" id="bm_id0801200803235673" localize="false"/>
<paragraph role="heading" id="hd_id3153383" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05070300.xhp" name="Align Right">Align Right</link></paragraph>
-<paragraph role="paragraph" id="par_id3151264" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:AlignRight">Aligns the right edges of the selected objects. <switchinline select="appl"><caseinline select="WRITER">
-</caseinline><caseinline select="CALC">
-</caseinline><caseinline select="MATH">
-</caseinline><defaultinline>If only one object is selected, the right edge of the object is aligned to the right page margin.</defaultinline></switchinline></ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151264" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:AlignRight">Aligns the right edges of the selected objects. If only one object is selected in Impress or Draw, the right edge of the object is aligned to the right page margin.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#rechts"/>
+<embed href="text/shared/00/00040501.xhp#rechts"/>
</section>
<paragraph role="paragraph" id="par_id3144336" xml-lang="en-US" l10n="U" oldref="3">Objects are aligned to the right edge of the rightmost object in the selection.</paragraph>
<embed href="text/shared/01/05070100.xhp#mehrfachselektion"/>
diff --git a/helpcontent2/source/text/shared/01/05070400.xhp b/helpcontent2/source/text/shared/01/05070400.xhp
index 4b1b0771eb..d95e717a2b 100644
--- a/helpcontent2/source/text/shared/01/05070400.xhp
+++ b/helpcontent2/source/text/shared/01/05070400.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05070400.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,28 +30,27 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105070400xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105070400xml" indexer="include">
<title id="tit" xml-lang="en-US">Align Top</title>
<filename>/text/shared/01/05070400.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-17T16:38:48">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="oben">
<bookmark xml-lang="en-US" branch="hid/SID_OBJECT_ALIGN_UP" id="bm_id7303719" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AlignUp" id="bm_id3155271" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_ALIGN_VERT_TOP" id="bm_id0801200803203572" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignTop" id="bm_id0801200803203641" localize="false"/>
<paragraph role="heading" id="hd_id3160463" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05070400.xhp" name="Align Top">Align Top</link></paragraph>
-<paragraph role="paragraph" id="par_id3154613" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:AlignTop">Horizontally aligns the top edges of the selected objects. If only one object is selected in Draw or Impress, the top edge of the object is aligned to the upper page margin.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154613" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:AlignTop">Vertically aligns the top edges of the selected objects. If only one object is selected in Draw or Impress, the top edge of the object is aligned to the upper page margin.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#oben"/>
+<embed href="text/shared/00/00040501.xhp#oben"/>
</section>
<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="3">Objects are aligned to the top edge of the topmost object in the selection. <embedvar href="text/shared/01/05070100.xhp#mehrfachselektion"/>
</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05070500.xhp b/helpcontent2/source/text/shared/01/05070500.xhp
index 79c45baeaa..1df4ae8113 100644
--- a/helpcontent2/source/text/shared/01/05070500.xhp
+++ b/helpcontent2/source/text/shared/01/05070500.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05070500.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105070500xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105070500xml" indexer="include">
<title id="tit" xml-lang="en-US">Align Vertical Center</title>
<filename>/text/shared/01/05070500.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-17T16:21:19">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="mitte">
@@ -52,7 +50,7 @@
<paragraph role="paragraph" id="par_id3160463" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:AlignVerticalCenter">Vertically centers the selected objects. If only one object is selected in Draw or Impress, the center of the object is aligned to the vertical center of the page.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#mitte"/>
+<embed href="text/shared/00/00040501.xhp#mitte"/>
</section>
<embed href="text/shared/01/05070100.xhp#mehrfachselektion"/>
</body>
diff --git a/helpcontent2/source/text/shared/01/05070600.xhp b/helpcontent2/source/text/shared/01/05070600.xhp
index 2b34d85a9f..3db52f6ce6 100644
--- a/helpcontent2/source/text/shared/01/05070600.xhp
+++ b/helpcontent2/source/text/shared/01/05070600.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05070600.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,29 +32,27 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105070600xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105070600xml" indexer="include">
<title id="tit" xml-lang="en-US">Align Bottom</title>
<filename>/text/shared/01/05070600.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-23T15:11:08">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="unten">
<bookmark xml-lang="en-US" branch="hid/SID_OBJECT_ALIGN_DOWN" id="bm_id6953148" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AlignDown" id="bm_id3159079" localize="false"/><comment>UFI: removed two lines with AlignBottom</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignDown" id="bm_id3159079" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_ALIGN_VERT_BOTTOM" id="bm_id0801200803174823" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignBottom" id="bm_id0801200803174999" localize="false"/>
<paragraph role="heading" id="hd_id3153383" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05070600.xhp" name="Align Bottom">Align Bottom</link></paragraph>
-<paragraph role="paragraph" id="par_id3154613" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Horizontally aligns the bottom edges of the selected objects. If only one object is selected in Draw or Impress, the bottom edge of the object is aligned to the lower page margin.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154613" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Vertically aligns the bottom edges of the selected objects. If only one object is selected in Draw or Impress, the bottom edge of the object is aligned to the lower page margin.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#unten"/>
+<embed href="text/shared/00/00040501.xhp#unten"/>
</section>
-<paragraph role="paragraph" id="par_id3151330" xml-lang="en-US" l10n="U" oldref="4">Objects are aligned to the top edge of the topmost object in the selection. <embedvar href="text/shared/01/05070100.xhp#mehrfachselektion"/>
+<paragraph role="paragraph" id="par_id3151330" xml-lang="en-US" l10n="U" oldref="4">Objects are aligned to the bottom edge of the bottom most object in the selection. <embedvar href="text/shared/01/05070100.xhp#mehrfachselektion"/>
</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05100100.xhp b/helpcontent2/source/text/shared/01/05100100.xhp
new file mode 100644
index 0000000000..24f10ba262
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/05100100.xhp
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05100100.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0105100100xhp" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Merge</title>
+<filename>/text/shared/01/05100100.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="verbinden">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_MERGE_CELLS" id="bm_id1766491" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:MergeCells" id="bm_id3149051" localize="false"/>
+<paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100100.xhp" name="Merge">Merge</link></paragraph>
+<paragraph role="paragraph" id="par_id3147406" xml-lang="en-US" l10n="U" oldref="2"><variable id="verbindentext"><ahelp hid=".">Combines the contents of the selected table cells into a single cell.</ahelp>
+</variable><comment>moved from swriter/01/05100100.xhp, see i86644</comment></paragraph>
+</section>
+<section id="howtoget">
+<switch select="appl">
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id3154351" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>Table - Merge Cells</emph>
+</paragraph>
+</case>
+</switch>
+<paragraph role="paragraph" id="par_id3154370" xml-lang="en-US" l10n="U" oldref="80">On the <emph>Table</emph> Bar, click</paragraph>
+<section id="syzellenverbinden">
+<table id="tbl_id3154636">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153996" xml-lang="en-US" l10n="E">
+<image id="img_id3154002" src="res/commandimagelist/sc_mergecells.png" width="0.423cm" height="0.423cm"><alt id="alt_id3154002" xml-lang="en-US">icon</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3150662" xml-lang="en-US" l10n="U" oldref="81">Merge Cells</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+<paragraph role="warning" id="par_id3153718" xml-lang="en-US" l10n="U" oldref="3">Merging cells can lead to calculation errors in formulas in the table.</paragraph>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05100200.xhp b/helpcontent2/source/text/shared/01/05100200.xhp
new file mode 100644
index 0000000000..0461b8cef1
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/05100200.xhp
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05100200.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0105100200xhp" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Split Cells</title>
+<filename>/text/shared/01/05100200.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="zellenteilen">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_SPLIT_CELLS" id="bm_id3525727" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SplitCell" id="bm_id3147403" localize="false"/>
+<paragraph role="heading" id="hd_id3154654" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100200.xhp" name="Split Cells">Split Cells</link></paragraph>
+<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="2"><variable id="teilentext"><ahelp hid=".uno:SplitCell">Splits the cell or group of cells horizontally or vertically into the number of cells that you enter.</ahelp>
+</variable></paragraph>
+</section>
+<section id="howtoget">
+<switch select="appl">
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id3154024" xml-lang="en-US" l10n="U" oldref="82">Choose <emph>Table - Split Cells</emph>
+</paragraph>
+</case>
+</switch>
+<paragraph role="paragraph" id="par_id3154042" xml-lang="en-US" l10n="U" oldref="83">On the <emph>Table</emph> Bar, click</paragraph>
+<section id="syzellenteilen">
+<table id="tbl_id3149972">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3147270" xml-lang="en-US" l10n="E">
+<image id="img_id3147275" src="res/commandimagelist/sc_splitcell.png" width="0.423cm" height="0.423cm"><alt id="alt_id3147275" xml-lang="en-US">Icon</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3150616" xml-lang="en-US" l10n="U" oldref="84">Split Cells</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_DLG_SPLIT_ED_COUNT" id="bm_id3154507" localize="false"/>
+<paragraph role="heading" id="hd_id3154558" xml-lang="en-US" level="2" l10n="U" oldref="3">Split cell into</paragraph>
+<paragraph role="paragraph" id="par_id3150021" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:NUMERICFIELD:DLG_SPLIT:ED_COUNT">Enter the number of rows or columns that you want to split the selected cell(s) into.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3145249" xml-lang="en-US" level="2" l10n="U" oldref="5">Direction</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_HORZ" id="bm_id3149028" localize="false"/>
+<paragraph role="heading" id="hd_id3150568" xml-lang="en-US" level="3" l10n="U" oldref="7">Horizontally</paragraph>
+<paragraph role="paragraph" id="par_id3153927" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:IMAGERADIOBUTTON:DLG_SPLIT:RB_HORZ">Splits the selected cell(s) into the number of rows that you specify in the <emph>Split cell into </emph>box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_SPLIT_CB_PROP" id="bm_id3151185" localize="false"/>
+<paragraph role="heading" id="hd_id3147566" xml-lang="en-US" level="3" l10n="U" oldref="11">Into equal proportions</paragraph>
+<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW_CHECKBOX_DLG_SPLIT_CB_PROP">Splits cells into rows of equal height.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_VERT" id="bm_id3151168" localize="false"/>
+<paragraph role="heading" id="hd_id3150765" xml-lang="en-US" level="3" l10n="U" oldref="9">Vertically</paragraph>
+<paragraph role="paragraph" id="par_id3145410" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:IMAGERADIOBUTTON:DLG_SPLIT:RB_VERT">Splits the selected cell(s) into the number of columns that you specify in the <emph>Split cell into </emph>box.</ahelp></paragraph>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05100500.xhp b/helpcontent2/source/text/shared/01/05100500.xhp
new file mode 100644
index 0000000000..346c369bf8
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/05100500.xhp
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05100500.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0105100500xml" indexer="include">
+<title id="tit" xml-lang="en-US">Top</title>
+<filename>/text/shared/01/05100500.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="oben">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_VERT_NONE" id="bm_id5466554" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:CellVertTop" id="bm_id3149048" localize="false"/>
+<paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100500.xhp" name="Top">Top</link></paragraph>
+<paragraph role="paragraph" id="par_id3151390" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CellVertTop">Aligns the contents of the cell to the top edge of the cell.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id3145671" xml-lang="en-US" l10n="U" oldref="120"><variable id="zelleoben">In the context menu of a cell, choose <emph>Cell - Top</emph>
+</variable></paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05100600.xhp b/helpcontent2/source/text/shared/01/05100600.xhp
new file mode 100644
index 0000000000..b9a090e6e3
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/05100600.xhp
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05100600.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0105100600xml" indexer="include">
+<title id="tit" xml-lang="en-US">Middle</title>
+<filename>/text/shared/01/05100600.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="mitte">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_VERT_CENTER" id="bm_id4218858" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:CellVertCenter" id="bm_id3154766" localize="false"/>
+<paragraph role="heading" id="hd_id3149874" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100600.xhp" name="Middle">Middle</link></paragraph>
+<paragraph role="paragraph" id="par_id3149048" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CellVertCenter">Centers the contents of the cell horizontally in the cell.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id3149525" xml-lang="en-US" l10n="U" oldref="121"><variable id="zellemitte">In the context menu of a cell, choose <emph>Cell - Center</emph>
+</variable></paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05100700.xhp b/helpcontent2/source/text/shared/01/05100700.xhp
new file mode 100644
index 0000000000..7fa2e119f5
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/05100700.xhp
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05100700.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0105100700xml" indexer="include">
+<title id="tit" xml-lang="en-US">Bottom</title>
+<filename>/text/shared/01/05100700.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="unten">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_VERT_BOTTOM" id="bm_id3581992" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:CellVertBottom" id="bm_id3151244" localize="false"/>
+<paragraph role="heading" id="hd_id3150249" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100700.xhp" name="Bottom">Bottom</link></paragraph>
+<paragraph role="paragraph" id="par_id3154764" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CellVertBottom">Aligns the contents of the cell to the bottom edge of the cell.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id3149201" xml-lang="en-US" l10n="U" oldref="122"><variable id="zelleunten">In the context menu of a cell, choose <emph>Cell - Bottom</emph>
+</variable></paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05110000.xhp b/helpcontent2/source/text/shared/01/05110000.xhp
index fbf6b9214a..e58be3c355 100755
--- a/helpcontent2/source/text/shared/01/05110000.xhp
+++ b/helpcontent2/source/text/shared/01/05110000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05110000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -61,7 +61,6 @@
<embed href="text/shared/01/05110300.xhp#unter"/>
<embed href="text/shared/01/05110400.xhp#durch"/>
<embed href="text/shared/01/05110500.xhp#schatten"/>
-<embed href="text/shared/01/05110600.xhp#kontur"/>
<embed href="text/shared/01/05110700.xhp#hoch"/>
<embed href="text/shared/01/05110800.xhp#tief"/>
</body>
diff --git a/helpcontent2/source/text/shared/01/05110600.xhp b/helpcontent2/source/text/shared/01/05110600.xhp
index 8b41d3d792..e69de29bb2 100644
--- a/helpcontent2/source/text/shared/01/05110600.xhp
+++ b/helpcontent2/source/text/shared/01/05110600.xhp
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05110600.xhp,v $
- * $Revision: 1.9 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************-->
-
-
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textshared0105110600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Contour</title>
-<filename>/text/shared/01/05110600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-06T12:36:04">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="kontur">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153383"><bookmark_value>text; contours</bookmark_value>
-<bookmark_value>contours of text</bookmark_value>
-<bookmark_value>characters; contours</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_CONTOUR" id="bm_id7049784" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:OutlineFont" id="bm_id3153272" localize="false"/>
-<paragraph role="heading" id="hd_id3153383" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05110600.xhp" name="Contour">Contour</link></paragraph>
-<paragraph role="paragraph" id="par_id3154788" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:OutlineFont">Outlines the selected text, or if the cursor is in word, the entire word.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040502.xhp#stilkontur"/>
-</section>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05110600m.xhp b/helpcontent2/source/text/shared/01/05110600m.xhp
new file mode 100644
index 0000000000..5846a241ac
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/05110600m.xhp
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05110600m.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0105110600mxhp" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Space Rows Equally</title>
+<filename>/text/shared/01/05110600m.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="gleichverteilen">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_BALANCE_ROWS" id="bm_id2550261" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DistributeRows" id="bm_id3151240" localize="false"/>
+<paragraph role="heading" id="hd_id3149871" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05110600m.xhp" name="Space Equally">Space Rows Equally</link></paragraph>
+<paragraph role="paragraph" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="2"><variable id="verteilentext"><ahelp hid=".uno:DistributeRows">Adjusts the height of the selected rows to match the height of the tallest row in the selection.</ahelp>
+</variable></paragraph>
+</section>
+<section id="howtoget">
+<switch select="appl">
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id3153569" xml-lang="en-US" l10n="U" oldref="92">Choose <emph>Table - Autofit - Distribute Rows Equally</emph>
+</paragraph>
+</case>
+</switch>
+<paragraph role="paragraph" id="par_id3153755" xml-lang="en-US" l10n="U" oldref="93">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
+<section id="syverteilenzeile">
+<table id="tbl_id3154064">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3145297" xml-lang="en-US" l10n="E">
+<image id="img_id3155994" src="res/commandimagelist/sc_distributerows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3155994" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153206" xml-lang="en-US" l10n="U" oldref="94">Distribute Rows Equally</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05120600.xhp b/helpcontent2/source/text/shared/01/05120600.xhp
new file mode 100644
index 0000000000..a7d0233c12
--- /dev/null
+++ b/helpcontent2/source/text/shared/01/05120600.xhp
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05120600.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0105120600xhp" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Space Columns Equally</title>
+<filename>/text/shared/01/05120600.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="gleichverteilen">
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_BALANCE_CELLS" id="bm_id2213069" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DistributeColumns" id="bm_id3149055" localize="false"/>
+<paragraph role="heading" id="hd_id3153811" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05120600.xhp" name="Space Equally">Space Columns Equally</link></paragraph>
+<paragraph role="paragraph" id="par_id3151389" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="verteilentext"><ahelp hid=".uno:DistributeColumns">Adjusts the width of the selected columns to match the width of the widest column in the selection.</ahelp> The total width of the table cannot exceed the width of the page.
+</variable></paragraph>
+</section>
+<section id="howtoget">
+<switch select="appl">
+<case select="WRITER">
+<paragraph role="paragraph" id="par_id3159219" xml-lang="en-US" l10n="U" oldref="107">Choose <emph>Table - Autofit - Distribute Columns Equally</emph>
+</paragraph>
+</case>
+</switch>
+<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="108">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
+<section id="syverteilentext">
+<table id="tbl_id3148462">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3145179" xml-lang="en-US" l10n="E">
+<image id="img_id3145186" src="res/commandimagelist/sc_distributecolumns.png" width="0.423cm" height="0.423cm"><alt id="alt_id3145186" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3151364" xml-lang="en-US" l10n="U" oldref="109">Space Columns Equally</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05200200.xhp b/helpcontent2/source/text/shared/01/05200200.xhp
index 3f799c9f86..48ff35bc75 100755
--- a/helpcontent2/source/text/shared/01/05200200.xhp
+++ b/helpcontent2/source/text/shared/01/05200200.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05200200.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105200200xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105200200xml" indexer="include">
<title id="tit" xml-lang="en-US">Line Styles</title>
<filename>/text/shared/01/05200200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-26T08:33:29">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="linienstile">
@@ -49,7 +47,7 @@
<paragraph role="paragraph" id="par_id3150146" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_LINE_DEF">Edit or create dashed or dotted line styles.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040502.xhp#linienstile"/>
+<embed href="text/shared/00/00040502.xhp#linienstile"/>
</section>
<paragraph role="heading" id="hd_id3147617" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_LINE_DEF_LB_LINESTYLES" id="bm_id3147212" localize="false"/>
@@ -82,7 +80,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_MODIFY" id="bm_id3147011" localize="false"/>
<paragraph role="heading" id="hd_id3155893" xml-lang="en-US" level="2" l10n="U" oldref="21">Modify</paragraph>
<paragraph role="paragraph" id="par_id3157863" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_MODIFY">Updates the selected line style using the current settings. To change the name of the selected line style, enter a new name when prompted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_DELETE" id="bm_id3150443" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<bookmark xml-lang="en-US" branch="hid/SVX_IMAGEBUTTON_RID_SVXPAGE_LINE_DEF_BTN_LOAD" id="bm_id3149812" localize="false"/>
<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="23">Load line style table</paragraph>
<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_IMAGEBUTTON_RID_SVXPAGE_LINE_DEF_BTN_LOAD">Imports a list of line styles.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/05200300.xhp b/helpcontent2/source/text/shared/01/05200300.xhp
index b2607e8f64..8255f66301 100755
--- a/helpcontent2/source/text/shared/01/05200300.xhp
+++ b/helpcontent2/source/text/shared/01/05200300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05200300.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105200300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105200300xml" indexer="include">
<title id="tit" xml-lang="en-US">Arrow Styles</title>
<filename>/text/shared/01/05200300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-29T14:19:37">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="linienenden">
@@ -51,7 +47,7 @@
<paragraph role="paragraph" id="par_id3149031" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_LINE_ENDDEF">Edit or create arrow styles.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040502.xhp#linienenden"/>
+<embed href="text/shared/00/00040502.xhp#linienenden"/>
</section>
<paragraph role="heading" id="hd_id3153551" xml-lang="en-US" level="2" l10n="U" oldref="5">Organize arrow styles</paragraph>
<paragraph role="paragraph" id="par_id3154398" xml-lang="en-US" l10n="U" oldref="6">Lets you organize the current list of arrow styles.</paragraph>
@@ -67,7 +63,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY" id="bm_id3159158" localize="false"/>
<paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="13">Modify</paragraph>
<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY">Changes the name of the selected arrow style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE" id="bm_id3153717" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD" id="bm_id3148992" localize="false"/>
<paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="2" l10n="U" oldref="15">Load Arrow Styles</paragraph>
<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD">Imports a list of arrow styles.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/05210300.xhp b/helpcontent2/source/text/shared/01/05210300.xhp
index d9d816178c..4db7de5d5f 100755
--- a/helpcontent2/source/text/shared/01/05210300.xhp
+++ b/helpcontent2/source/text/shared/01/05210300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05210300.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105210300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105210300xml" indexer="include">
<title id="tit" xml-lang="en-US">Gradients</title>
<filename>/text/shared/01/05210300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-26T12:02:58">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="farbverlaeufe">
@@ -49,7 +47,7 @@
<paragraph role="paragraph" id="par_id3154812" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_AREA_GRADIENT">Set the properties of a gradient, or save and load gradient lists.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040502.xhp#verlauf"/>
+<embed href="text/shared/00/00040502.xhp#verlauf"/>
</section>
<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES" id="bm_id3153089" localize="false"/>
<paragraph role="heading" id="hd_id3148983" xml-lang="en-US" level="3" l10n="U" oldref="3">Type</paragraph>
@@ -85,7 +83,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_MODIFY" id="bm_id3153543" localize="false"/>
<paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="3" l10n="U" oldref="19">Modify</paragraph>
<paragraph role="paragraph" id="par_id3147573" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_MODIFY">Applies the current gradient properties to the selected gradient. If you want, you can save the gradient under a different name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_GRADIENT:BTN_DELETE" id="bm_id3148924" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_GRADIENT:BTN_LOAD" id="bm_id3146848" localize="false"/>
<paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="2" l10n="U" oldref="31">Load Gradients List</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05210400.xhp b/helpcontent2/source/text/shared/01/05210400.xhp
index 72281218ad..e8401f946e 100755
--- a/helpcontent2/source/text/shared/01/05210400.xhp
+++ b/helpcontent2/source/text/shared/01/05210400.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05210400.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105210400xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105210400xml" indexer="include">
<title id="tit" xml-lang="en-US">Hatching</title>
<filename>/text/shared/01/05210400.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-28T12:32:05">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="schraffuren">
@@ -55,7 +51,7 @@
<paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_AREA_HATCH">Set the properties of a hatching pattern, or save and load hatching lists.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040502.xhp#schraffur"/>
+<embed href="text/shared/00/00040502.xhp#schraffur"/>
</section>
<paragraph role="heading" id="hd_id3156042" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
<paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="4">Define or modify a hatching pattern.</paragraph>
@@ -85,7 +81,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_MODIFY" id="bm_id3146848" localize="false"/>
<paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="3" l10n="U" oldref="17">Modify</paragraph>
<paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_MODIFY">Applies the current hatching properties to the selected hatching pattern. If you want, you can save the pattern under a different name.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_HATCH:BTN_DELETE" id="bm_id3148943" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_HATCH:BTN_LOAD" id="bm_id3153896" localize="false"/>
<paragraph role="heading" id="hd_id3147304" xml-lang="en-US" level="2" l10n="U" oldref="25">Load Hatches List</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05210500.xhp b/helpcontent2/source/text/shared/01/05210500.xhp
index 968b18906a..ff9361dbaa 100755
--- a/helpcontent2/source/text/shared/01/05210500.xhp
+++ b/helpcontent2/source/text/shared/01/05210500.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05210500.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105210500xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105210500xml" indexer="include">
<title id="tit" xml-lang="en-US">Bitmap</title>
<filename>/text/shared/01/05210500.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-05T12:55:10">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="bitmapmuster">
@@ -57,7 +53,7 @@
<paragraph role="paragraph" id="par_id3149495" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_AREA_BITMAP">Select a bitmap that you want to use as a fill pattern, or create your own pixel pattern. You can also import bitmaps, and save or load bitmap lists.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040502.xhp#bitmap"/>
+<embed href="text/shared/00/00040502.xhp#bitmap"/>
</section>
<paragraph role="heading" id="hd_id3148585" xml-lang="en-US" level="2" l10n="U" oldref="3">Pattern Editor</paragraph>
<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="U" oldref="4">Use this editor to create a simple, two-color, 8x8 pixel bitmap pattern.</paragraph>
@@ -81,7 +77,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_IMPORT" id="bm_id3152945" localize="false"/>
<paragraph role="heading" id="hd_id3149516" xml-lang="en-US" level="2" l10n="U" oldref="13">Import</paragraph>
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_IMPORT">Locate the bitmap that you want to import, and then click <emph>Open</emph>. The bitmap is added to the end of the list of available bitmaps.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BITMAP:BTN_DELETE" id="bm_id3149762" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_BITMAP:BTN_LOAD" id="bm_id3148925" localize="false"/>
<paragraph role="heading" id="hd_id3159166" xml-lang="en-US" level="2" l10n="U" oldref="21">Load Bitmap List</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05250000.xhp b/helpcontent2/source/text/shared/01/05250000.xhp
index 9f11db9229..7ddaebbf37 100644
--- a/helpcontent2/source/text/shared/01/05250000.xhp
+++ b/helpcontent2/source/text/shared/01/05250000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05250000.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,19 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105250000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105250000xml" indexer="include">
<title id="tit" xml-lang="en-US">Arrange</title>
<filename>/text/shared/01/05250000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-07T11:17:12">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="anordnung">
@@ -60,11 +57,12 @@
<bookmark xml-lang="en-US" branch="hid/SID_POSITION" id="bm_id8728812" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ObjectPosition" id="bm_id3149551" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ArrangeMenu" id="bm_id3945738" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ArrangeFrameMenu" id="bm_id0801200803311649" localize="false"/>
<paragraph role="heading" id="hd_id3152427" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05250000.xhp" name="Arranging Objects">Arrange</link></paragraph>
<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ObjectPosition">Changes the stacking order of the selected object(s).</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#anordnung"/>
+<embed href="text/shared/00/00040501.xhp#anordnung"/>
</section>
<paragraph role="heading" id="hd_id3153894" xml-lang="en-US" level="2" l10n="U" oldref="9">Layer for text and graphics</paragraph>
<paragraph role="paragraph" id="par_id3154186" xml-lang="en-US" l10n="U" oldref="4">Each object that you place in your document is successively stacked on the preceding object. Use the arrange commands to change the stacking order of objects in your document. You cannot change the stacking order of text.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05250200.xhp b/helpcontent2/source/text/shared/01/05250200.xhp
index ca4cdcafda..0afbc37a22 100644
--- a/helpcontent2/source/text/shared/01/05250200.xhp
+++ b/helpcontent2/source/text/shared/01/05250200.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05250200.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,27 +32,25 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105250200xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105250200xml" indexer="include">
<title id="tit" xml-lang="en-US">Bring Forward </title>
<filename>/text/shared/01/05250200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-23T15:54:51">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="positionnachvorn">
<bookmark xml-lang="en-US" branch="hid/SID_MOREFRONT" id="bm_id9123117" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Forward" id="bm_id3155620" localize="false"/><comment>removed several help ids</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:Forward" id="bm_id3155620" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_UP" id="bm_id0801200803082196" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ObjectForwardOne" id="bm_id080120080307113" localize="false"/>
<paragraph role="heading" id="hd_id3152790" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05250200.xhp" name="Bring Forward ">Bring Forward </link></paragraph>
<paragraph role="paragraph" id="par_id3151264" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Moves the selected object up one level, so that it is closer to top of the stacking order.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#nachvorn"/>
+<embed href="text/shared/00/00040501.xhp#nachvorn"/>
</section>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3149495" xml-lang="en-US" l10n="U" oldref="3"><link href="text/shared/01/05250000.xhp" name="Layer">Layer</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/05250300.xhp b/helpcontent2/source/text/shared/01/05250300.xhp
index 40710bf60b..5b047c24b5 100644
--- a/helpcontent2/source/text/shared/01/05250300.xhp
+++ b/helpcontent2/source/text/shared/01/05250300.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05250300.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -30,28 +30,27 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105250300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105250300xml" indexer="include">
<title id="tit" xml-lang="en-US">Send Backward</title>
<filename>/text/shared/01/05250300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-23T15:56:24">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="positionnachhinten">
<bookmark xml-lang="en-US" branch="hid/SID_MOREBACK" id="bm_id2505918" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Backward" id="bm_id3149988" localize="false"/><comment>UFI: removed some help ids</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:Backward" id="bm_id3149988" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_DOWN" id="bm_id0801200803071063" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ObjectBackOne" id="bm_id0801200803082118" localize="false"/>
<paragraph role="heading" id="hd_id3150146" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05250300.xhp" name="Send Backward">Send Backward</link></paragraph>
<paragraph role="paragraph" id="par_id3150794" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Moves the selected object down one level, so that it is closer to the bottom of the stacking order.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#nachhinten"/>
+<embed href="text/shared/00/00040501.xhp#nachhinten"/>
</section>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="3"><link href="text/shared/01/05250000.xhp" name="Layer">Layer</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/05260000.xhp b/helpcontent2/source/text/shared/01/05260000.xhp
index 0b0d37dab6..b8ac5f557c 100644
--- a/helpcontent2/source/text/shared/01/05260000.xhp
+++ b/helpcontent2/source/text/shared/01/05260000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05260000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105260000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105260000xml" indexer="include">
<title id="tit" xml-lang="en-US">Anchor</title>
<filename>/text/shared/01/05260000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-05-26T13:56:19">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="verankerung">
@@ -56,10 +52,9 @@
</case>
</switch>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#wechsel"/>
+<embed href="text/shared/00/00040501.xhp#wechsel"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SID_ANCHOR_TOGGLE" id="bm_id571270" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ToggleAnchorType" id="bm_id3147399" localize="false"/><embed href="text/shared/02/03200000.xhp#verankerungtext"/>
+<embed href="text/shared/02/03200000.xhp#verankerungtext"/>
<switch select="appl">
<case select="WRITER"><embed href="text/shared/00/00040501.xhp#syverankerung"/>
</case>
diff --git a/helpcontent2/source/text/shared/01/05260100.xhp b/helpcontent2/source/text/shared/01/05260100.xhp
index b9a0307e46..153fe8a358 100644
--- a/helpcontent2/source/text/shared/01/05260100.xhp
+++ b/helpcontent2/source/text/shared/01/05260100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05260100.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,29 +30,27 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105260100xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105260100xml" indexer="include">
<title id="tit" xml-lang="en-US">To Page</title>
<filename>/text/shared/01/05260100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-17T15:42:50">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="anderseite">
-<bookmark xml-lang="en-US" branch="hid/SID_ANCHOR_PAGE" id="bm_id4556654" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_ANCHOR_PAGE" id="bm_id4556654" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SetAnchorToPage" id="bm_id3156045" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_TOOL_ANKER_PAGE" id="bm_id0801200803434125" localize="false"/>
<paragraph role="heading" id="hd_id3150278" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05260100.xhp" name="To Page">To Page</link></paragraph>
<paragraph role="paragraph" id="par_id3150756" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:SetAnchorToPage">Anchors the selected item to the current page.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3149987" xml-lang="en-US" l10n="U" oldref="4">The anchored item remains on the current page even if you insert or delete text.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#anseite"/>
+<embed href="text/shared/00/00040501.xhp#anseite"/>
</section>
<paragraph role="paragraph" id="par_id3152821" xml-lang="en-US" l10n="U" oldref="3">The anchor icon is displayed at the top left corner of the page.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/05260300.xhp b/helpcontent2/source/text/shared/01/05260300.xhp
index 5a499fd26d..dc6e8953ac 100644
--- a/helpcontent2/source/text/shared/01/05260300.xhp
+++ b/helpcontent2/source/text/shared/01/05260300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05260300.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,30 +30,28 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105260300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105260300xml" indexer="include">
<title id="tit" xml-lang="en-US">To Character</title>
<filename>/text/shared/01/05260300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-17T15:42:22">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<switch select="appl">
<case select="WRITER">
<section id="amzeichen">
-<bookmark xml-lang="en-US" branch="hid/FN_TOOL_ANKER_CHAR" id="bm_id9823184" localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:SetAnchorToChar" id="bm_id3147090" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_TOOL_ANKER_CHAR" id="bm_id9823184" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_TOOL_ANKER_AT_CHAR" id="bm_id0801200803430844" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SetAnchorAtChar" id="bm_id0801200803430880" localize="false"/>
<paragraph role="heading" id="hd_id3154044" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05260300.xhp" name="To Character">To Character</link></paragraph>
<paragraph role="paragraph" id="par_id3147069" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Anchors the selected item to a character.</ahelp> This command is only available for graphic objects.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#amzeichen"/>
+<embed href="text/shared/00/00040501.xhp#amzeichen"/>
</section>
<paragraph role="paragraph" id="par_id3146067" xml-lang="en-US" l10n="U" oldref="3">The anchor is displayed in front of the character.</paragraph>
<paragraph role="tip" id="par_id3152924" xml-lang="en-US" l10n="U" oldref="4">To align a graphic relative to the character that it is anchored to, right-click the graphic, and then choose <emph>Graphics</emph>. Click the <emph>Type </emph>tab, and in the <emph>Position </emph>area, select <emph>Character</emph> in the <emph>to</emph> boxes.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05260600.xhp b/helpcontent2/source/text/shared/01/05260600.xhp
index b1841bea5d..09df8c907c 100644
--- a/helpcontent2/source/text/shared/01/05260600.xhp
+++ b/helpcontent2/source/text/shared/01/05260600.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05260600.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,27 +30,25 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105260600xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105260600xml" indexer="include">
<title id="tit" xml-lang="en-US">As Character</title>
<filename>/text/shared/01/05260600.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-17T15:39:34">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="alszeichen">
<bookmark xml-lang="en-US" branch="hid/.uno:SetAnchorAsChar" id="bm_id9494613" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_TOOL_ANKER_CHAR" id="bm_id080120080342379" localize="false"/>
<paragraph role="heading" id="hd_id3154621" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05260600.xhp" name="As Character">As Character</link></paragraph>
<paragraph role="paragraph" id="par_id3146946" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Anchors the selected item as a character in the current text. If the height of the selected item is greater than the current font size, the height of the line containing the item is increased.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#alszeichen"/>
+<embed href="text/shared/00/00040501.xhp#alszeichen"/>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05340300.xhp b/helpcontent2/source/text/shared/01/05340300.xhp
index 519cbc095f..d5988cb0a3 100644
--- a/helpcontent2/source/text/shared/01/05340300.xhp
+++ b/helpcontent2/source/text/shared/01/05340300.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05340300.xhp,v $
- *
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +35,7 @@
<meta>
-<topic id="textshared0105340300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0105340300xml" indexer="include">
<title id="tit" xml-lang="en-US">Alignment</title>
<filename>/text/shared/01/05340300.xhp</filename>
</topic>
@@ -138,8 +136,9 @@
<emph>Text Extension Inside Cells:</emph> Writes the rotated text only within the cell.</paragraph>
</listitem>
</list>
+<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_TXTSTACKED" id="bm_id080420080320333" localize="false"/>
<paragraph role="heading" id="par_idN109F4" xml-lang="en-US" level="3" l10n="NEW">Vertically stacked</paragraph>
-<paragraph role="paragraph" id="par_idN109F8" xml-lang="en-US" l10n="NEW">Aligns text vertically.<comment>UFI: see spec "Shrink to fit"</comment></paragraph>
+<paragraph role="paragraph" id="par_idN109F8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Aligns text vertically.</ahelp><comment>UFI: see spec "Shrink to fit"</comment></paragraph>
<embed href="text/shared/00/00000007.xhp#asiahinweis"/>
<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_ASIAN_VERTICAL" id="bm_id3147441" localize="false"/>
<paragraph role="heading" id="hd_id3152576" xml-lang="en-US" level="3" l10n="CHG" oldref="84">Asian layout mode</paragraph>
@@ -154,7 +153,8 @@
<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_HYPH" id="bm_id3155415" localize="false"/>
<paragraph role="heading" id="hd_id3147380" xml-lang="en-US" level="3" l10n="U" oldref="81">Hyphenation active</paragraph>
<paragraph role="paragraph" id="par_id3148458" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_HYPH">Enables word hyphenation for text wrapping to the next line.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_SHRINK" id="bm_id080420080321345" localize="false"/>
<paragraph role="heading" id="par_idN10AD3" xml-lang="en-US" level="3" l10n="NEW">Shrink to fit cell size</paragraph>
-<paragraph role="paragraph" id="par_idN10AD7" xml-lang="en-US" l10n="NEW">Reduces the apparent size of the font so that the contents of the cell fit into the current cell width. You cannot apply this command to a cell that contains line breaks.</paragraph>
+<paragraph role="paragraph" id="par_idN10AD7" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Reduces the apparent size of the font so that the contents of the cell fit into the current cell width. You cannot apply this command to a cell that contains line breaks.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05340400.xhp b/helpcontent2/source/text/shared/01/05340400.xhp
index 7ce0cf9a7c..a581e64c5c 100644
--- a/helpcontent2/source/text/shared/01/05340400.xhp
+++ b/helpcontent2/source/text/shared/01/05340400.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05340400.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -82,7 +82,7 @@
<paragraph role="tablecontent" id="par_id3149575" xml-lang="en-US" l10n="U" oldref="16">Several records or removing a selection</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149295" xml-lang="en-US" l10n="U" oldref="17">Hold down Ctrl and click the row header</paragraph>
+<paragraph role="tablecontent" id="par_id3149295" xml-lang="en-US" l10n="U" oldref="17">Hold down <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>and click the row header</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/shared/01/05350500.xhp b/helpcontent2/source/text/shared/01/05350500.xhp
index 81e9b3a18b..d539b1b29b 100644
--- a/helpcontent2/source/text/shared/01/05350500.xhp
+++ b/helpcontent2/source/text/shared/01/05350500.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05350500.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -46,7 +46,7 @@
<section id="texturen">
<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEXTURE" id="bm_id3148410" localize="false"/>
<paragraph role="heading" id="hd_id3150014" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05350500.xhp" name="Textures">Textures</link></paragraph>
-<paragraph role="paragraph" id="par_id3147000" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEXTURE">Sets the properties of the surface texture for the selected 3D object. This feature is only available after you apply a surface textures to the selected object. To quickly apply a surface texture, open the <emph>Gallery</emph>, hold down Shift+Ctrl, and then drag an image onto the selected 3D object.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147000" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEXTURE">Sets the properties of the surface texture for the selected 3D object. This feature is only available after you apply a surface textures to the selected object. To quickly apply a surface texture, open the <emph>Gallery</emph>, hold down Shift+Ctrl (Mac: Shift+Command), and then drag an image onto the selected 3D object.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00040500.xhp#3dtexturen"/>
diff --git a/helpcontent2/source/text/shared/01/06010000.xhp b/helpcontent2/source/text/shared/01/06010000.xhp
index 1a9d20206f..e0f179ee50 100644
--- a/helpcontent2/source/text/shared/01/06010000.xhp
+++ b/helpcontent2/source/text/shared/01/06010000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06010000.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,21 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
<topic id="textshared0106010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Spellcheck</title>
+<title id="tit" xml-lang="en-US">Spelling and Grammar</title>
<filename>/text/shared/01/06010000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-21T14:16:29">UFI: fixed #113742#
-UFI: changes due to spec "Spellcheck Dialog" by FL
-DEDR: Reviewed</lastedited>
-</history>
</meta>
<body>
<section id="rechtschreibung">
@@ -52,16 +47,20 @@ DEDR: Reviewed</lastedited>
<bookmark_value>languages; spellcheck</bookmark_value>
</bookmark><comment>mw changes "spellcheck;languages"</comment>
<bookmark xml-lang="en-US" branch="hid/.uno:Spelling" id="bm_id3150702" localize="false"/>
-<paragraph role="heading" id="hd_id3153882" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06010000.xhp" name="Spellcheck">Spellcheck</link></paragraph>
-<paragraph role="paragraph" id="par_id3154682" xml-lang="en-US" l10n="U" oldref="2"><variable id="recht"><ahelp hid=".uno:Spelling">Checks the document or the current selection for spelling errors.</ahelp> $[officename] includes headers, footers, index entries, and footnotes in the spellcheck.
+<bookmark xml-lang="en-US" branch="hid/.uno:SpellingAndGrammarDialog" id="bm_id1022200801253693" localize="false"/>
+<paragraph role="heading" id="hd_id3153882" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06010000.xhp" name="Spellcheck">Spelling and Grammar</link></paragraph>
+<paragraph role="paragraph" id="par_id3154682" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="recht"><ahelp hid=".uno:Spelling">Checks the document or the current selection for spelling errors. If a grammar checking extension is installed, the dialog also checks for grammar errors.</ahelp>
</variable></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#rechtschreibung"/>
+<embed href="text/shared/00/00000406.xhp#rechtschreibung"/>
</section>
<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
<paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW">The spellcheck starts at the current cursor position and advances to the end of the document or selection. You can then choose to continue the spellcheck from the beginning of the document.</paragraph>
<paragraph role="paragraph" id="par_id3166445" xml-lang="en-US" l10n="U" oldref="3">Spellcheck looks for misspelled words and gives you the option of adding an unknown word to a user dictionary. When the first misspelled word is found, the <emph>Spellcheck</emph> dialog opens.</paragraph>
+<paragraph role="paragraph" id="par_id1022200801300654" xml-lang="en-US" l10n="NEW">If a grammar checking extension is installed, this dialog is called <emph>Spelling and Grammar</emph>. Spelling errors are underlined in red, grammar errors in blue. First the dialog presents all spelling errors, then all grammar errors.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SPELLCHECK_CB_CHECK_GRAMMAR" id="bm_id1024200804045685" localize="false"/>
+<paragraph role="paragraph" id="par_id1022200801354366" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable <emph>Check grammar</emph> to work first on all spellcheck errors, then on all grammar errors.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_MultiLineEdit_RID_SVXDLG_SPELLCHECK_ED_NEWWORD" id="bm_id756859" localize="false"/>
<paragraph role="heading" id="hd_id3149511" xml-lang="en-US" level="2" l10n="CHG" oldref="6">Not in dictionary</paragraph>
<paragraph role="paragraph" id="par_id3149798" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp hid=".">Displays the sentence with the misspelled word highlighted. Edit the word or the sentence, or click one of the suggestions in the text box below.</ahelp></paragraph>
@@ -70,7 +69,7 @@ DEDR: Reviewed</lastedited>
<paragraph role="heading" id="hd_id3149885" xml-lang="en-US" level="2" l10n="U" oldref="10">Suggestions</paragraph>
<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="CHG" oldref="11"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_NEWWORD">Lists suggested words to replace the misspelled word. Select the word that you want to use, and then click <emph>Change</emph> or <emph>Change All</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_LANGUAGE" id="bm_id3150822" localize="false"/>
-<paragraph role="heading" id="hd_id3145087" xml-lang="en-US" level="2" l10n="CHG" oldref="12">Dictionary Language</paragraph>
+<paragraph role="heading" id="hd_id3145087" xml-lang="en-US" level="2" l10n="CHG" oldref="12">Text Language<comment>spec doc Spelling_and_Grammar.odt</comment></paragraph>
<paragraph role="paragraph" id="par_id3144422" xml-lang="en-US" l10n="CHG" oldref="13"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_LANGUAGE">Specifies the language to use to check the spelling.</ahelp></paragraph>
<embed href="text/shared/optionen/01010401.xhp#sprachenfeld"/>
<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_AUTOCORR" id="bm_id3148798" localize="false"/>
@@ -91,7 +90,9 @@ DEDR: Reviewed</lastedited>
<bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_IGNORE" id="bm_id7157811" localize="false"/>
<paragraph role="heading" id="hd_id3155994" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Ignore Once</paragraph>
<paragraph role="paragraph" id="par_id3148920" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNORE">Skips the unknown word and continues with the spellcheck.</ahelp></paragraph>
-<paragraph role="note" id="par_idN107CB" xml-lang="en-US" l10n="NEW">This label of this button changes to <emph>Resume</emph> if you leave the Spellcheck dialog open when you return to your document. To continue the spellcheck from the current position of the cursor, click <emph>Resume</emph>.</paragraph>
+<paragraph role="note" id="par_idN107CB" xml-lang="en-US" l10n="NEW">This label of this button changes to <emph>Resume</emph> if you leave the Spellcheck dialog open when you return to your document. To continue the spellcheck from the current position of the cursor, click <emph>Resume</emph>.</paragraph><comment>Ignore Rule button</comment>
+<bookmark xml-lang="en-US" branch="hid/40076" id="bm_id1024200804072166" localize="false"/>
+<paragraph role="paragraph" id="par_id1024200804091149" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">While performing a grammar check, click Ignore Rule to ignore the rule that is currently flagged as a grammar error.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNOREALL" id="bm_id3145171" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_IGNOREALL" id="bm_id4155705" localize="false"/>
<paragraph role="heading" id="hd_id3150740" xml-lang="en-US" level="2" l10n="CHG" oldref="20">Ignore All</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06010500.xhp b/helpcontent2/source/text/shared/01/06010500.xhp
index f0cca951dc..1d423b3c6b 100755
--- a/helpcontent2/source/text/shared/01/06010500.xhp
+++ b/helpcontent2/source/text/shared/01/06010500.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06010500.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,27 +32,30 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0106010500xml" indexer="include" status="PUBLISH">
+<topic id="textshared0106010500xml" indexer="include">
<title id="tit" xml-lang="en-US">Language</title>
<filename>/text/shared/01/06010500.xhp</filename>
</topic>
</meta>
<body>
<section id="language">
-<bookmark xml-lang="en-US" branch="hid/.uno:LanguageMenu" id="bm_id7076326" localize="false"/><paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/06010500.xhp">Language</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:LanguageMenu" id="bm_id7076326" localize="false"/>
+<paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/06010500.xhp">Language</link></paragraph>
<paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a submenu where you can choose language specific commands.</ahelp></paragraph>
</section>
<switch select="appl">
<case select="WRITER"><comment>Writer menu commands, i80434</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageSelectionMenu" id="bm_id3691824" localize="false"/><paragraph role="heading" id="hd_id5787224" xml-lang="en-US" level="2" l10n="NEW">For Selection</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageSelectionMenu" id="bm_id3691824" localize="false"/>
+<paragraph role="heading" id="hd_id5787224" xml-lang="en-US" level="2" l10n="NEW">For Selection</paragraph>
<paragraph role="paragraph" id="par_id1507309" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a submenu. Choose a language for the selected text. <br/>Choose None to exclude the selected text from spellchecking and hyphenation.<br/>Choose More to open a dialog with more options.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageParagraphMenu" id="bm_id5369426" localize="false"/><paragraph role="heading" id="hd_id7693411" xml-lang="en-US" level="2" l10n="NEW">For Paragraph</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageParagraphMenu" id="bm_id5369426" localize="false"/>
+<paragraph role="heading" id="hd_id7693411" xml-lang="en-US" level="2" l10n="NEW">For Paragraph</paragraph>
<paragraph role="paragraph" id="par_id3928952" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a submenu. Choose a language for the current paragraph. <br/>Choose None to exclude the current paragraph from spellchecking and hyphenation.<br/>Choose More to open a dialog with more options.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageAllTextMenu" id="bm_id1342204" localize="false"/><paragraph role="heading" id="hd_id5206762" xml-lang="en-US" level="2" l10n="NEW">For all Text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageAllTextMenu" id="bm_id1342204" localize="false"/>
+<paragraph role="heading" id="hd_id5206762" xml-lang="en-US" level="2" l10n="NEW">For all Text</paragraph>
<paragraph role="paragraph" id="par_id5735953" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a submenu. Choose a language for all text. <br/>Choose None to exclude all text from spellchecking and hyphenation.<br/>Choose More to open a dialog with more options.</ahelp></paragraph>
</case>
</switch>
@@ -63,14 +65,21 @@
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/01/06030000.xhp#hyphenation"/>
</case>
-<case select="CALC"><paragraph role="heading" id="par_idN105AF" xml-lang="en-US" level="2" l10n="NEW">Hyphenation</paragraph>
+<case select="CALC">
+<paragraph role="heading" id="par_idN105AF" xml-lang="en-US" level="2" l10n="NEW">Hyphenation</paragraph>
<paragraph role="paragraph" id="par_idN105B3" xml-lang="en-US" l10n="NEW">Opens the <link href="text/shared/01/05340300.xhp">Format - Cells - Alignment</link> tab page.</paragraph>
</case>
-<case select="DRAW"><paragraph role="heading" id="par_idN105D0" xml-lang="en-US" level="2" l10n="NEW">Hyphenation</paragraph>
+<case select="DRAW">
+<paragraph role="heading" id="par_idN105D0" xml-lang="en-US" level="2" l10n="NEW">Hyphenation</paragraph>
<paragraph role="paragraph" id="par_idN105D4" xml-lang="en-US" l10n="NEW">Turns hyphenation on and off.</paragraph>
</case>
-<case select="IMPRESS"><paragraph role="heading" id="par_idN105E7" xml-lang="en-US" level="2" l10n="NEW">Hyphenation</paragraph>
+<case select="IMPRESS">
+<paragraph role="heading" id="par_idN105E7" xml-lang="en-US" level="2" l10n="NEW">Hyphenation</paragraph>
<paragraph role="paragraph" id="par_idN105EB" xml-lang="en-US" l10n="NEW">Turns hyphenation on and off.</paragraph>
</case>
-</switch></body>
+</switch>
+<bookmark xml-lang="en-US" branch="hid/.uno:MoreDictionaries" id="bm_id0805200811520622" localize="false"/>
+<paragraph role="heading" id="hd_id0805200811534540" xml-lang="en-US" level="2" l10n="NEW">More Dictionaries Online</paragraph>
+<paragraph role="paragraph" id="par_id0805200811534630" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the default browser on the dictionaries extension page.</ahelp></paragraph>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06040200.xhp b/helpcontent2/source/text/shared/01/06040200.xhp
index 37497156c3..6a052cc546 100644
--- a/helpcontent2/source/text/shared/01/06040200.xhp
+++ b/helpcontent2/source/text/shared/01/06040200.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06040200.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0106040200xml" indexer="include" status="PUBLISH">
+<topic id="textshared0106040200xml" indexer="include">
<title id="tit" xml-lang="en-US">Replace</title>
<filename>/text/shared/01/06040200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-17T09:49:14">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="ersetzung">
@@ -61,7 +57,7 @@
<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="CHG" oldref="17"><switchinline select="appl"><caseinline select="WRITER">To enable the replacement table, choose <emph>Tools - AutoCorrect</emph>, click the<emph> Options</emph> tab, and then select<emph> Use replacement table</emph>. To use the replacement table while you type, choose <emph>Format - AutoFormat - While Typing</emph>.
</caseinline></switchinline></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#autokoersetzung"/>
+<embed href="text/shared/00/00000406.xhp#autokoersetzung"/>
</section>
<embed href="text/shared/01/06040300.xhp#sprache"/>
<bookmark xml-lang="en-US" branch="hid/HID_OFACTL_AUTOCORR_REPLACE" id="bm_id3154810" localize="false"/>
@@ -86,7 +82,6 @@
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_REPLACE_PB_NEW_REPLACE" id="bm_id8823511" localize="false"/>
<paragraph role="heading" id="hd_id3153797" xml-lang="en-US" level="2" l10n="U" oldref="11">New</paragraph>
<paragraph role="paragraph" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE">Adds or replaces an entry in the replacement table.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE" id="bm_id3154821" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_REPLACE_PB_DELETE_REPLACE" id="bm_id7878353" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen1"/>
+<embed href="text/shared/00/00000001.xhp#loeschen1"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06040300.xhp b/helpcontent2/source/text/shared/01/06040300.xhp
index d44890b604..694f729484 100644
--- a/helpcontent2/source/text/shared/01/06040300.xhp
+++ b/helpcontent2/source/text/shared/01/06040300.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06040300.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0106040300xml" indexer="include" status="PUBLISH">
+<topic id="textshared0106040300xml" indexer="include">
<title id="tit" xml-lang="en-US">Exceptions</title>
<filename>/text/shared/01/06040300.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-03-04T15:21:14">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="ausnahmen">
@@ -50,7 +48,7 @@
</section>
<paragraph role="paragraph" id="par_id3154926" xml-lang="en-US" l10n="U" oldref="17">The exceptions that you define depend on the current language setting. If you want, you can change the language setting by selecting a different language in the <emph>Replacements and exceptions for language</emph> box.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#autokoausnahmen"/>
+<embed href="text/shared/00/00000406.xhp#autokoausnahmen"/>
</section>
<section id="sprache">
<bookmark xml-lang="en-US" branch="hid/HID_AUTOCORR_LANGUAGE" id="bm_id3150902" localize="false"/>
@@ -77,10 +75,7 @@
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_NEWDOUBLECAPS" id="bm_id2211066" localize="false"/>
<paragraph role="heading" id="hd_id3155503" xml-lang="en-US" level="3" l10n="U" oldref="8">New</paragraph>
<paragraph role="paragraph" id="par_id3147573" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS">Adds the current entry to the list of exceptions.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV" id="bm_id3154810" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS" id="bm_id3153257" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_DELABBREV" id="bm_id5413373" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOCORR_EXCEPT_PB_DELDOUBLECAPS" id="bm_id2580950" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen1"/>
+<embed href="text/shared/00/00000001.xhp#loeschen1"/>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV" id="bm_id3152909" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS" id="bm_id3155179" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_AUTOCORR_EXCEPT_CB_AUTOABBREV" id="bm_id8066347" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/06050600.xhp b/helpcontent2/source/text/shared/01/06050600.xhp
index 8f9b1feb30..5d50012a57 100644
--- a/helpcontent2/source/text/shared/01/06050600.xhp
+++ b/helpcontent2/source/text/shared/01/06050600.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06050600.xhp,v $
- *
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -44,13 +42,13 @@
</meta>
<body>
<section id="position">
-<paragraph role="head1" id="hd_id3150467" xml-lang="en-US" l10n="U" oldref="1"><link href="text/shared/01/06050600.xhp" name="Position">Position</link></paragraph>
+<paragraph role="heading" id="hd_id3150467" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050600.xhp" name="Position">Position</link></paragraph>
<paragraph role="paragraph" id="par_id3158397" xml-lang="en-US" l10n="U" oldref="2">Sets the indent, spacing, and alignment options for the numbered or bulleted list.</paragraph>
</section><comment>do we have a how-to for numbering/bullets/outlines with/without styles? seems we really need one</comment>
<section id="howtoget">
<embed href="text/shared/00/00040500.xhp#numposition"/>
</section>
-<paragraph role="note" id="par_id5004119" xml-lang="en-US" l10n="NEW">The Position tab page looks different for documents using the new position and spacing attributes introduced with OpenOffice.org 3.0, or documents using the old attributes from versions before 3.0. The new version of this tab page shows the controls "Numbering followed by", "Numbering alignment", "Aligned at", and "Indent at". The old version of this tab page that can be seen in an old numbered or bulleted list shows the controls "Indent", "Width of numbering", "Minimum space numbering &lt;-&gt; text", and "Numbering alignment".</paragraph>
+<paragraph role="note" id="par_id5004119" xml-lang="en-US" l10n="NEW">The Position tab page looks different for documents using the new position and spacing attributes introduced with OpenOffice.org 3.0, or documents using the old attributes from versions before 3.0. The new version of this tab page shows the controls "Numbering followed by", "Numbering alignment", "Aligned at", and "Indent at". The old version of this tab page that can be seen in an old numbered or bulleted list shows the controls "Indent", "Width of numbering", "Minimum space numbering &lt;-&gt; text", and "Numbering alignment".<comment>see http://specs.openoffice.org/writer/numbering/NewListLevelAttrs.odt</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:MULTILISTBOX:RID_SVXPAGE_NUM_POSITION:LB_LEVEL" id="bm_id3149119" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SW:MULTILISTBOX:TP_NUM_POSITION:LB_LEVEL" id="bm_id3153323" localize="false"/>
<paragraph role="heading" id="hd_id3149031" xml-lang="en-US" level="2" l10n="U" oldref="3">Level</paragraph>
@@ -60,7 +58,7 @@
<paragraph role="paragraph" id="par_id423291" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the element that will follow the numbering: a tab stop, a space, or nothing.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_MetricField_RID_SVXPAGE_NUM_POSITION_MF_LISTTAB" id="bm_id3496810" localize="false"/>
<paragraph role="heading" id="hd_id7809686" xml-lang="en-US" level="3" l10n="NEW">at</paragraph>
-<paragraph role="paragraph" id="par_id8177434" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If you select a tab stop to follow the numbering, you can enter a non-negative value as the tab stop position.</ahelp><comment>Position from where?</comment></paragraph>
+<paragraph role="paragraph" id="par_id8177434" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If you select a tab stop to follow the numbering, you can enter a non-negative value as the tab stop position.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_NUM_POSITION:LB_ALIGN" id="bm_id3151246" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_NUM_POSITION:LB_ALIGN" id="bm_id3151245" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_NUM_POSITION_LB_ALIGN_2" id="bm_id5262611" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/06130000.xhp b/helpcontent2/source/text/shared/01/06130000.xhp
index cc5841c823..41b0bbfc52 100644
--- a/helpcontent2/source/text/shared/01/06130000.xhp
+++ b/helpcontent2/source/text/shared/01/06130000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06130000.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,95 +32,123 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0106130000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0106130000xml" indexer="include">
<title id="tit" xml-lang="en-US">Macro</title>
<filename>/text/shared/01/06130000.xhp</filename>
</topic>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/SID_BASICCHOOSER" id="bm_id870519" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:MacroDialog" id="bm_id3149948" localize="false"/><paragraph role="heading" id="hd_id3157552" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Macro</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:MacroDialog" id="bm_id3149948" localize="false"/>
+<paragraph role="heading" id="hd_id3157552" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Macro</paragraph>
<paragraph role="paragraph" id="par_id3148765" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="makro"><ahelp hid=".uno:MacroDialog">Opens a dialog to organize macros.</ahelp>
</variable><comment>UFI: it is not the dialog to run a macro</comment></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#makro"/>
+<embed href="text/shared/00/00000406.xhp#makro"/>
</section>
<embed href="text/shared/guide/macro_recording.xhp#macro_recording"/>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_EDIT_RID_MACROCHOOSER_RID_ED_MACRONAME" id="bm_id3155351" localize="false"/><paragraph role="heading" id="par_id3154863" xml-lang="en-US" level="2" l10n="U" oldref="3">Macro name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_EDIT_RID_MACROCHOOSER_RID_ED_MACRONAME" id="bm_id3155351" localize="false"/>
+<paragraph role="heading" id="par_id3154863" xml-lang="en-US" level="2" l10n="U" oldref="3">Macro name</paragraph>
<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="BASCTL_EDIT_RID_MACROCHOOSER_RID_ED_MACRONAME">Displays the name of the selected macro. To create or to change the name of a macro, enter a name here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_MACROS" id="bm_id3149283" localize="false"/><paragraph role="paragraph" id="par_id3150902" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="." visibility="hidden">Lists the macros that are contained in the module selected in the <emph>Macro from </emph>list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_MACROS" id="bm_id3149283" localize="false"/>
+<paragraph role="paragraph" id="par_id3150902" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="." visibility="hidden">Lists the macros that are contained in the module selected in the <emph>Macro from </emph>list.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10642" xml-lang="en-US" l10n="NEW"><comment>UFI: Important: do not add Help IDS for SELECTOR_COMMANDS and SELECTOR_CATEGORIES, because they are reused for Customize dialog and will lead to display errors there if assigned. See #i51556#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_LIBS" id="bm_id3152867" localize="false"/><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="7">Macro from / Save macro in</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_LIBS" id="bm_id3152867" localize="false"/>
+<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="7">Macro from / Save macro in</paragraph>
<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_BASICIDE_LIBS">Lists the libraries and the modules where you can open or save your macros. To save a macro with a particular document, open the document, and then open this dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_RUN" id="bm_id3147577" localize="false"/><paragraph role="heading" id="hd_id3147373" xml-lang="en-US" level="2" l10n="U" oldref="11">Run / Save<comment>unfortunately both have the same Help ID</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_RUN" id="bm_id3147577" localize="false"/>
+<paragraph role="heading" id="hd_id3147373" xml-lang="en-US" level="2" l10n="U" oldref="11">Run / Save<comment>unfortunately both have the same Help ID</comment></paragraph>
<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_RUN">Runs or saves the current macro.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ASSIGN" id="bm_id3150694" localize="false"/><paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="2" l10n="U" oldref="15">Assign</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ASSIGN" id="bm_id3150694" localize="false"/>
+<paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="2" l10n="U" oldref="15">Assign</paragraph>
<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ASSIGN">Opens the <link href="text/shared/01/06140000.xhp" name="Customize">Customize</link> dialog, where you can assign the selected macro to a menu command, a toolbar, or an event.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_EDIT" id="bm_id3147276" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_EDIT" id="bm_id5118869" localize="false"/><paragraph role="heading" id="hd_id3153662" xml-lang="en-US" level="2" l10n="U" oldref="17">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_EDIT" id="bm_id5118869" localize="false"/>
+<paragraph role="heading" id="hd_id3153662" xml-lang="en-US" level="2" l10n="U" oldref="17">Edit</paragraph>
<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_EDIT">Starts the $[officename] Basic editor and opens the selected macro or dialog for editing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_DEL" id="bm_id3155390" localize="false"/><paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="2" l10n="U" oldref="19">New / Delete</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_DEL" id="bm_id3155390" localize="false"/>
+<paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="2" l10n="U" oldref="19">New / Delete</paragraph>
<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="CHG" oldref="61"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_DEL">Creates a new macro, or deletes the selected macro.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3154514" xml-lang="en-US" l10n="CHG" oldref="20">To create a new macro, select the "Standard" module in the <emph>Macro from</emph> list, and then click <emph>New</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3148474" xml-lang="en-US" l10n="U" oldref="21">To delete a macro, select it, and then click <emph>Delete</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWLIB" id="bm_id3152910" localize="false"/><paragraph role="heading" id="hd_id3159342" xml-lang="en-US" level="2" l10n="U" oldref="64">New Library</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWLIB" id="bm_id3152910" localize="false"/>
+<paragraph role="heading" id="hd_id3159342" xml-lang="en-US" level="2" l10n="U" oldref="64">New Library</paragraph>
<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="65"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWLIB">Saves the recorded macro in a new library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWMOD" id="bm_id3155262" localize="false"/><paragraph role="heading" id="hd_id3154173" xml-lang="en-US" level="2" l10n="U" oldref="66">New Module</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWMOD" id="bm_id3155262" localize="false"/>
+<paragraph role="heading" id="hd_id3154173" xml-lang="en-US" level="2" l10n="U" oldref="66">New Module</paragraph>
<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWMOD">Saves the recorded macro in a new module.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ORG" id="bm_id3150118" localize="false"/><paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="2" l10n="U" oldref="22">Organizer</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ORG" id="bm_id3150118" localize="false"/>
+<paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="2" l10n="U" oldref="22">Organizer</paragraph>
<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ORG">Opens the <emph>Macro Organizer</emph> dialog, where you can add, edit, or delete existing macro modules, dialogs, and libraries.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="3" l10n="CHG" oldref="24">Module/Dialog tab page</paragraph>
<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ORG">Lets you manage modules or dialog boxes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_MODULES_TREE" id="bm_id3147304" localize="false"/><paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="3" l10n="U" oldref="29">Module/Dialog</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_MODULES_TREE" id="bm_id3147304" localize="false"/>
+<paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="3" l10n="U" oldref="29">Module/Dialog</paragraph>
<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_BASICIDE_MODULES_TREE">Lists the existing macros and dialogs.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_EDIT" id="bm_id3153779" localize="false"/><paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="34">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_EDIT" id="bm_id3153779" localize="false"/>
+<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="34">Edit</paragraph>
<paragraph role="paragraph" id="par_id3150543" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_EDIT">Opens the selected macro or dialog for editing.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#schliessen"/>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_NEWMOD" id="bm_id3156080" localize="false"/><paragraph role="heading" id="hd_id3151210" xml-lang="en-US" level="3" l10n="CHG" oldref="36">New<comment>UFI: i40875</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_NEWMOD" id="bm_id3156080" localize="false"/>
+<paragraph role="heading" id="hd_id3151210" xml-lang="en-US" level="3" l10n="CHG" oldref="36">New<comment>UFI: i40875</comment></paragraph>
<paragraph role="paragraph" id="par_id3149291" xml-lang="en-US" l10n="CHG" oldref="37"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_NEWMOD">Opens the editor and creates a new module.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_NEWDLG" id="bm_id3150496" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_NEWDLG" id="bm_id5659047" localize="false"/><paragraph role="heading" id="hd_id3145173" xml-lang="en-US" level="3" l10n="CHG" oldref="39">New</paragraph>
+<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_NEWDLG" id="bm_id5659047" localize="false"/>
+<paragraph role="heading" id="hd_id3145173" xml-lang="en-US" level="3" l10n="CHG" oldref="39">New</paragraph>
<paragraph role="paragraph" id="par_id3150767" xml-lang="en-US" l10n="CHG" oldref="40"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_NEWDLG">Opens the editor and creates a new dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_DELETE" id="bm_id3143232" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/basctl_PushButton_RID_TP_DLGS_RID_PB_DELETE" id="bm_id3214514" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
-<paragraph role="heading" id="hd_id3151177" xml-lang="en-US" level="3" l10n="U" oldref="42">Libraries tab page</paragraph><comment>the three tab pages have no Help button, so no need to have three help pages</comment><paragraph role="paragraph" id="par_id3156281" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_DELETE">Lets you manage the macro libraries for the current application and any open documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_LISTBOX_RID_TP_LIBS_RID_LB_BASICS" id="bm_id3150650" localize="false"/><paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="3" l10n="CHG" oldref="44">Location</paragraph>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
+<paragraph role="heading" id="hd_id3151177" xml-lang="en-US" level="3" l10n="U" oldref="42">Libraries tab page</paragraph><comment>the three tab pages have no Help button, so no need to have three help pages</comment>
+<paragraph role="paragraph" id="par_id3156281" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_MODULS_RID_PB_DELETE">Lets you manage the macro libraries for the current application and any open documents.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_LISTBOX_RID_TP_LIBS_RID_LB_BASICS" id="bm_id3150650" localize="false"/>
+<paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="3" l10n="CHG" oldref="44">Location</paragraph>
<paragraph role="paragraph" id="par_id3150290" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="BASCTL_LISTBOX_RID_TP_LIBS_RID_LB_BASICS">Select the application or the document containing the macro libraries that you want to organize.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_LIBS_TREE" id="bm_id3154910" localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="46">Library</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_BASICIDE_LIBS_TREE" id="bm_id3154910" localize="false"/>
+<paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="3" l10n="U" oldref="46">Library</paragraph>
<paragraph role="paragraph" id="par_id3147500" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="HID_BASICIDE_LIBS_TREE">Lists the existing macro libraries for the current application and any open documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_EDIT" id="bm_id3156212" localize="false"/><paragraph role="heading" id="hd_id3157320" xml-lang="en-US" level="3" l10n="U" oldref="48">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_EDIT" id="bm_id3156212" localize="false"/>
+<paragraph role="heading" id="hd_id3157320" xml-lang="en-US" level="3" l10n="U" oldref="48">Edit</paragraph>
<paragraph role="paragraph" id="par_id3150868" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_EDIT">Opens the $[officename] Basic editor so that you can modify the selected library.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#schliessen"/>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_PASSWORD" id="bm_id3148561" localize="false"/><paragraph role="heading" id="hd_id3153104" xml-lang="en-US" level="3" l10n="U" oldref="50">Password</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_PASSWORD" id="bm_id3148561" localize="false"/>
+<paragraph role="heading" id="hd_id3153104" xml-lang="en-US" level="3" l10n="U" oldref="50">Password</paragraph>
<paragraph role="paragraph" id="par_id3154299" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_PASSWORD">Assigns or edits the <link href="text/shared/01/06130100.xhp" name="password">password</link> for the selected library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_NEWLIB" id="bm_id3153056" localize="false"/><paragraph role="heading" id="hd_id3147502" xml-lang="en-US" level="3" l10n="U" oldref="52">New</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_NEWLIB" id="bm_id3153056" localize="false"/>
+<paragraph role="heading" id="hd_id3147502" xml-lang="en-US" level="3" l10n="U" oldref="52">New</paragraph>
<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_NEWLIB">Creates a new library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_EDIT_RID_DLG_NEWLIB_RID_ED_LIBNAME" id="bm_id3154985" localize="false"/><paragraph role="heading" id="hd_id3153770" xml-lang="en-US" level="3" l10n="U" oldref="56">Name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_EDIT_RID_DLG_NEWLIB_RID_ED_LIBNAME" id="bm_id3154985" localize="false"/>
+<paragraph role="heading" id="hd_id3153770" xml-lang="en-US" level="3" l10n="U" oldref="56">Name</paragraph>
<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="57"><ahelp hid="BASCTL_EDIT_RID_DLG_NEWLIB_RID_ED_LIBNAME">Enter a name for the new library or module.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_APPEND" id="bm_id3153951" localize="false"/><paragraph role="heading" id="hd_id3154693" xml-lang="en-US" level="3" l10n="CHG" oldref="54">Import<comment>changed in #i64102</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_APPEND" id="bm_id3153951" localize="false"/>
+<paragraph role="heading" id="hd_id3154693" xml-lang="en-US" level="3" l10n="CHG" oldref="54">Import<comment>changed in #i64102</comment></paragraph>
<paragraph role="paragraph" id="par_id3147441" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_APPEND">Locate that $[officename] Basic library that you want to add to the current list, and then click Open.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/BASCTL_PUSHBUTTON_RID_TP_LIBS_RID_PB_DELETE" id="bm_id3145749" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
-<paragraph role="paragraph" id="par_idN10A39" xml-lang="en-US" l10n="NEW"><variable id="script">Scripts
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
+<paragraph role="paragraph" id="par_idN10A39" xml-lang="en-US" l10n="NEW"><variable id="script">Scripts
</variable></paragraph>
<paragraph role="paragraph" id="par_idN109BB" xml-lang="en-US" l10n="NEW">To open the BeanShell Macros dialog box, choose Tools - Macros - Organize Macros - BeanShell. To open the JavaScript dialog box, choose Tools - Macros - Organize Macros - JavaScript.</paragraph>
<paragraph role="heading" id="hd_id6963408" xml-lang="en-US" level="2" l10n="NEW">Export</paragraph>
<paragraph role="paragraph" id="par_id8968169" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog to export the selected library either as an extension or as a Basic library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SCRIPTSBOX" id="bm_id7982421" localize="false"/><paragraph role="heading" id="par_idN109BE" xml-lang="en-US" level="2" l10n="NEW">Macros</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCRIPTSBOX" id="bm_id7982421" localize="false"/>
+<paragraph role="heading" id="par_idN109BE" xml-lang="en-US" level="2" l10n="NEW">Macros</paragraph>
<paragraph role="paragraph" id="par_idN109C2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a macro or script from "user", "share", or an open document. To view the available macros or scripts, double-click an entry.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN" id="bm_id8628498" localize="false"/><paragraph role="heading" id="par_idN109CD" xml-lang="en-US" level="3" l10n="NEW">Run</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN" id="bm_id8628498" localize="false"/>
+<paragraph role="heading" id="par_idN109CD" xml-lang="en-US" level="3" l10n="NEW">Run</paragraph>
<paragraph role="paragraph" id="par_idN109D1" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731587">To run a script, select a script in the list, and then click Run.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE" id="bm_id6405835" localize="false"/><paragraph role="heading" id="par_idN109E8" xml-lang="en-US" level="3" l10n="NEW">Create</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE" id="bm_id6405835" localize="false"/>
+<paragraph role="heading" id="par_idN109E8" xml-lang="en-US" level="3" l10n="NEW">Create</paragraph>
<paragraph role="paragraph" id="par_idN109EC" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731589">Creates a new script.</ahelp> The default script editor opens after you enter a name for the script.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:DLG_NEWLIB:ED_LIBNAME" id="bm_id5546128" localize="false"/><paragraph role="paragraph" id="par_idN10A04" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:Edit:DLG_NEWLIB:ED_LIBNAME">Enter a name for the script.</ahelp><comment>UFI: called from Create and from Rename</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT" id="bm_id1055330" localize="false"/><paragraph role="heading" id="par_idN10A2F" xml-lang="en-US" level="3" l10n="NEW">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:DLG_NEWLIB:ED_LIBNAME" id="bm_id5546128" localize="false"/>
+<paragraph role="paragraph" id="par_idN10A04" xml-lang="en-US" l10n="NEW"><ahelp hid="svx:Edit:DLG_NEWLIB:ED_LIBNAME">Enter a name for the script.</ahelp><comment>UFI: called from Create and from Rename</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT" id="bm_id1055330" localize="false"/>
+<paragraph role="heading" id="par_idN10A2F" xml-lang="en-US" level="3" l10n="NEW">Edit</paragraph>
<paragraph role="paragraph" id="par_idN10A33" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731590">Opens the default script editor for your operating system.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME" id="bm_id9843745.00000001" localize="false"/><paragraph role="heading" id="par_idN10A4B" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME" id="bm_id9843745.00000001" localize="false"/>
+<paragraph role="heading" id="par_idN10A4B" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
<paragraph role="paragraph" id="par_idN10A4F" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731591">Opens a dialog where you can change the name of the selected script.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL" id="bm_id4198736" localize="false"/><paragraph role="heading" id="par_idN10A66" xml-lang="en-US" level="3" l10n="NEW">Delete</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL" id="bm_id4198736" localize="false"/>
+<paragraph role="heading" id="par_idN10A66" xml-lang="en-US" level="3" l10n="NEW">Delete</paragraph>
<paragraph role="paragraph" id="par_idN10A6A" xml-lang="en-US" l10n="NEW"><ahelp hid="1241731592">Prompts you to delete the selected script.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10AE5" xml-lang="en-US" l10n="NEW">The Macro Selector dialog contains two list boxes, namely the Library list box and the Macro name list box.</paragraph>
<paragraph role="heading" id="par_idN10AFC" xml-lang="en-US" level="3" l10n="NEW">Library</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06130010.xhp b/helpcontent2/source/text/shared/01/06130010.xhp
index 2d69bbc473..cdf1b17810 100644
--- a/helpcontent2/source/text/shared/01/06130010.xhp
+++ b/helpcontent2/source/text/shared/01/06130010.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06130010.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,34 +30,33 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textshared0106130010xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Record Macro</title>
+<topic id="textshared0106130010xml" indexer="include">
+<title id="tit" xml-lang="en-US">Record Macro</title>
<filename>/text/shared/01/06130010.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
- <section id="recordmacro">
- <bookmark xml-lang="en-US" branch="hid/SID_RECORDMACRO" id="bm_id986626" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:MacroRecorder" xml-lang="en-US" id="bm_id3156045"/><paragraph id="hd_id3153383" role="heading" level="1" oldref="5" l10n="U" xml-lang="en-US"><link href="text/shared/01/06130010.xhp" name="Record Macro">Record Macro</link></paragraph>
- <paragraph id="par_id3152952" l10n="U" role="paragraph" oldref="1" xml-lang="en-US"><ahelp hid=".uno:MacroRecorder" visibility="visible">Records a new a macro.</ahelp><comment> icon and comnmand!</comment></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#recordmacro"/>
+<section id="recordmacro">
+<bookmark xml-lang="en-US" branch="hid/SID_RECORDMACRO" id="bm_id986626" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:MacroRecorder" id="bm_id3156045" localize="false"/>
+<paragraph role="heading" id="hd_id3153383" xml-lang="en-US" level="1" l10n="U" oldref="5"><link href="text/shared/01/06130010.xhp" name="Record Macro">Record Macro</link></paragraph>
+<paragraph role="paragraph" id="par_id3152952" xml-lang="en-US" l10n="U" oldref="1"><ahelp hid=".uno:MacroRecorder">Records a new macro.</ahelp><comment> icon and comnmand!</comment></paragraph>
</section>
- <bookmark xml-lang="en-US" branch="hid/SID_STOP_RECORDING" id="bm_id1545801" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:StopRecording" xml-lang="en-US" id="bm_id3150264"/><paragraph role="heading" level="2" id="hd_id3154788" l10n="U" xml-lang="en-US" oldref="2">Stop Recording</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3146067" xml-lang="en-US" oldref="4"><ahelp hid=".uno:StopRecording" visibility="visible">Stops recording a macro.</ahelp></paragraph>
- <section id="relatedtopics">
- <embed href="text/shared/guide/macro_recording.xhp#macro_recording"/>
- <embed href="text/shared/main0600.xhp#programming"/>
- </section>
- </body>
+<section id="howtoget">
+<embed href="text/shared/00/00000406.xhp#recordmacro"/>
+</section>
+<bookmark xml-lang="en-US" branch="hid/SID_STOP_RECORDING" id="bm_id1545801" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:StopRecording" id="bm_id3150264" localize="false"/>
+<paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="2" l10n="U" oldref="2">Stop Recording</paragraph>
+<paragraph role="paragraph" id="par_id3146067" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid=".uno:StopRecording">Stops recording a macro.</ahelp></paragraph>
+<section id="relatedtopics">
+<embed href="text/shared/guide/macro_recording.xhp#macro_recording"/>
+<embed href="text/shared/main0600.xhp#programming"/>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06140200.xhp b/helpcontent2/source/text/shared/01/06140200.xhp
index 068a11cf41..37776201ef 100644
--- a/helpcontent2/source/text/shared/01/06140200.xhp
+++ b/helpcontent2/source/text/shared/01/06140200.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06140200.xhp,v $
- *
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -34,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0106140200xml" indexer="include" status="PUBLISH">
+<topic id="textshared0106140200xml" indexer="include">
<title id="tit" xml-lang="en-US">Keyboard</title>
<filename>/text/shared/01/06140200.xhp</filename>
</topic>
@@ -50,7 +47,8 @@
<bookmark_value>editing;shortcut keys</bookmark_value>
<bookmark_value>styles;keyboard shortcuts</bookmark_value>
</bookmark><comment>MW deleted "modifying;..."</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_CONFIG_ACCEL" id="bm_id3154183" localize="false"/><paragraph role="heading" id="hd_id3148882" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140200.xhp" name="Keyboard">Keyboard</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_CONFIG_ACCEL" id="bm_id3154183" localize="false"/>
+<paragraph role="heading" id="hd_id3148882" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140200.xhp" name="Keyboard">Keyboard</link></paragraph>
<paragraph role="paragraph" id="par_id3159411" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_CONFIG_ACCEL">Assigns or edits the shortcut keys for $[officename] commands, or $[officename] Basic macros.</ahelp></paragraph>
</section>
<section id="howtoget">
@@ -60,33 +58,45 @@
<section id="operatinghint">
<paragraph role="note" id="par_id3150144" xml-lang="en-US" l10n="U" oldref="29">Avoid assigning shortcut keys that are currently used by your operating system.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE" id="bm_id3151226" localize="false"/><paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="2" l10n="U" oldref="27">$[officename]</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE" id="bm_id3151226" localize="false"/>
+<paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="2" l10n="U" oldref="27">$[officename]</paragraph>
<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE">Displays shortcut keys that are common to all $[officename] applications.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE" id="bm_id3145345" localize="false"/><paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="25"><switchinline select="appl"><caseinline select="WRITER">Writer
+<bookmark xml-lang="en-US" branch="hid/SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE" id="bm_id3145345" localize="false"/>
+<paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="25"><switchinline select="appl"><caseinline select="WRITER">Writer
</caseinline><caseinline select="CALC">Calc
</caseinline><caseinline select="IMPRESS">Impress
</caseinline><caseinline select="DRAW">Draw
</caseinline><caseinline select="MATH">Math
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE">Displays shortcut keys for the current $[officename] application.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ACCELCONFIG_LISTBOX" id="bm_id3150355" localize="false"/><paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="2" l10n="U" oldref="3">Shortcut keys</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_ACCELCONFIG_LISTBOX" id="bm_id3150355" localize="false"/>
+<paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="2" l10n="U" oldref="3">Shortcut keys</paragraph>
<paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_ACCELCONFIG_LISTBOX">Lists the shortcut keys and the associated commands. To assign or modify the shortcut key for the command selected in the <emph>Function</emph> list, click a shortcut in this list, and then click <emph>Modify</emph>.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="2" l10n="U" oldref="5">Functions</paragraph>
<paragraph role="paragraph" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="6">Lists the function categories and the $[officename] functions that you can assign shortcut keys to.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_CONFIGGROUP_ACC_LISTBOX" id="bm_id3155503" localize="false"/><paragraph role="heading" id="hd_id3155321" xml-lang="en-US" level="3" l10n="U" oldref="7">Category</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_CONFIGGROUP_ACC_LISTBOX" id="bm_id3155503" localize="false"/>
+<paragraph role="heading" id="hd_id3155321" xml-lang="en-US" level="3" l10n="U" oldref="7">Category</paragraph>
<paragraph role="paragraph" id="par_id3149166" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="HID_CONFIGGROUP_ACC_LISTBOX">Lists the available function categories. To assign shortcuts to Styles, open the "Styles" category.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_CONFIGFUNCTION_ACC_LISTBOX" id="bm_id3159342" localize="false"/><paragraph role="heading" id="hd_id3154380" xml-lang="en-US" level="3" l10n="U" oldref="9">Function</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_CONFIGFUNCTION_ACC_LISTBOX" id="bm_id3159342" localize="false"/>
+<paragraph role="heading" id="hd_id3154380" xml-lang="en-US" level="3" l10n="U" oldref="9">Function</paragraph>
<paragraph role="paragraph" id="par_id3159148" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_CONFIGFUNCTION_ACC_LISTBOX">Select a function that you want to assign a shortcut key to, click a key combination in the <emph>Shortcut keys</emph> list, and then click <emph>Modify</emph>. If the selected function already has a shortcut key, it is displayed in the <emph>Keys </emph>list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:TP_CONFIG_ACCEL:BOX_ACC_KEY" id="bm_id3153666" localize="false"/><paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="3" l10n="U" oldref="11">Keys</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:TP_CONFIG_ACCEL:BOX_ACC_KEY" id="bm_id3153666" localize="false"/>
+<paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="3" l10n="U" oldref="11">Keys</paragraph>
<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SFX2:LISTBOX:TP_CONFIG_ACCEL:BOX_ACC_KEY">Displays the shortcut keys that are assigned to the selected function.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_CHANGE" id="bm_id3156153" localize="false"/><paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="2" l10n="U" oldref="15">Modify</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_CHANGE" id="bm_id3156153" localize="false"/>
+<paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="2" l10n="U" oldref="15">Modify</paragraph>
<paragraph role="paragraph" id="par_id3152909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_CHANGE">Assigns the key combination selected in the <emph>Shortcut keys</emph> list to the command selected in the <emph>Function </emph>list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_REMOVE" id="bm_id3149578" localize="false"/><paragraph role="paragraph" id="par_id7730033" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected element or elements without requiring confirmation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_LOAD" id="bm_id3151245" localize="false"/><paragraph role="heading" id="hd_id3154307" xml-lang="en-US" level="2" l10n="U" oldref="17">Load</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_REMOVE" id="bm_id3149578" localize="false"/>
+<paragraph role="paragraph" id="par_id7730033" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected element or elements without requiring confirmation.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_LOAD" id="bm_id3151245" localize="false"/>
+<paragraph role="heading" id="hd_id3154307" xml-lang="en-US" level="2" l10n="U" oldref="17">Load</paragraph>
<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_LOAD">Replaces the shortcut key configuration with one that was previously saved.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE" id="bm_id3148943" localize="false"/><paragraph role="heading" id="hd_id3150823" xml-lang="en-US" level="2" l10n="U" oldref="19">Save</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE" id="bm_id3148943" localize="false"/>
+<paragraph role="heading" id="hd_id3150823" xml-lang="en-US" level="2" l10n="U" oldref="19">Save</paragraph>
<paragraph role="paragraph" id="par_id3149655" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE">Saves the current shortcut key configuration, so that you can load it later.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_RESET" id="bm_id3147265" localize="false"/><paragraph role="paragraph" id="par_id756248" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Resets modified values back to the default values.</ahelp></paragraph><comment>i48946</comment><section id="relatedtopics">
+<bookmark xml-lang="en-US" branch="hid/sfx2_PushButton_TP_CONFIG_ACCEL_BTN_RESET" id="bm_id0904200812484017" localize="false"/>
+<paragraph role="paragraph" id="par_id756248" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Resets modified values back to the default values.</ahelp></paragraph><comment>i48946</comment>
+<section id="relatedtopics">
<embed href="text/shared/guide/configure_overview.xhp#configure_overview"/>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/01/06150000.xhp b/helpcontent2/source/text/shared/01/06150000.xhp
index 522cae8e04..c404e46a37 100644
--- a/helpcontent2/source/text/shared/01/06150000.xhp
+++ b/helpcontent2/source/text/shared/01/06150000.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: 06150000.xhp,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -104,7 +104,7 @@
<paragraph role="listitem" id="par_id3154577" xml-lang="en-US" l10n="U" oldref="14">Click a filter to select it.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149885" xml-lang="en-US" l10n="U" oldref="15">Shift-click or Ctrl-click to select several filters.</paragraph>
+<paragraph role="listitem" id="par_id3149885" xml-lang="en-US" l10n="U" oldref="15">Shift-click or <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click to select several filters.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149784" xml-lang="en-US" l10n="U" oldref="16">Double-click a name to edit the filter.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/08060100.xhp b/helpcontent2/source/text/shared/01/08060100.xhp
index 0ab9fd398c..87f86a8bf8 100644
--- a/helpcontent2/source/text/shared/01/08060100.xhp
+++ b/helpcontent2/source/text/shared/01/08060100.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 08060100.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0108060100xml" indexer="include" status="PUBLISH">
+<topic id="textshared0108060100xml" indexer="include">
<title id="tit" xml-lang="en-US">Registration</title>
<filename>/text/shared/01/08060100.xhp</filename>
</topic>
@@ -49,7 +47,9 @@
<bookmark_value>registering; %PRODUCTNAME</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_ONLINE_REGISTRATION" id="bm_id3640231" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:OnlineRegistrationDlg" id="bm_id3147617" localize="false"/><paragraph role="heading" id="hd_id3147477" xml-lang="en-US" level="1" l10n="U" oldref="2"><link href="text/shared/01/08060100.xhp" name="Registration">Registration</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:OnlineRegistrationDlg" id="bm_id3147617" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_REGISTRATION" id="bm_id2025818" localize="false"/>
+<paragraph role="heading" id="hd_id3147477" xml-lang="en-US" level="1" l10n="U" oldref="2"><link href="text/shared/01/08060100.xhp" name="Registration">Registration</link></paragraph>
<paragraph role="paragraph" id="par_id3153882" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid=".uno:OnlineRegistrationDlg">Connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
</section>
<section id="howtoget">
@@ -59,12 +59,15 @@
<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="5">The <emph>Registration</emph> dialog appears after you install $[officename].</paragraph>
<paragraph role="heading" id="hd_id3145629" xml-lang="en-US" level="3" l10n="U" oldref="10">Register Now</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NOW" id="bm_id3150902" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW" id="bm_id4082461" localize="false"/><paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NOW">Launches your default Web browser and connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NOW" id="bm_id4082461" localize="false"/>
+<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NOW">Launches your default Web browser and connects to the $[officename] Web site where you can register your copy of $[officename].</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149760" xml-lang="en-US" level="3" l10n="U" oldref="11">Remind me to register later</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_LATER" id="bm_id3156302" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER" id="bm_id5322122" localize="false"/><paragraph role="paragraph" id="par_id3151234" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_LATER">Hides the <emph>Registration</emph> dialog for the next seven days.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_LATER" id="bm_id5322122" localize="false"/>
+<paragraph role="paragraph" id="par_id3151234" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_LATER">Hides the <emph>Registration</emph> dialog for the next seven days.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147557" xml-lang="en-US" level="3" l10n="U" oldref="12">Never register</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NEVER" id="bm_id3152425" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER" id="bm_id9121677" localize="false"/><paragraph role="paragraph" id="par_id3148548" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NEVER">Permanently hides the <emph>Registration</emph> dialog. To register at a later time, choose <emph>Help - Registration</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/desktop_RadioButton_TP_REGISTRATION_RB_REGISTRATION_NEVER" id="bm_id9121677" localize="false"/>
+<paragraph role="paragraph" id="par_id3148548" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVTOOLS_RADIOBUTTON_DLG_REGISTRATION_REQUEST_RB_NEVER">Permanently hides the <emph>Registration</emph> dialog. To register at a later time, choose <emph>Help - Registration</emph>.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/about_meta_tags.xhp b/helpcontent2/source/text/shared/01/about_meta_tags.xhp
index 9a2ad2127e..e83b1d19d0 100644
--- a/helpcontent2/source/text/shared/01/about_meta_tags.xhp
+++ b/helpcontent2/source/text/shared/01/about_meta_tags.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: about_meta_tags.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared01about_meta_tagsxml" indexer="include" status="PUBLISH">
+<topic id="textshared01about_meta_tagsxml" indexer="include">
<title id="tit" xml-lang="en-US">HTML import and export</title>
<filename>/text/shared/01/about_meta_tags.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-20T13:05:58">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154380"><bookmark_value>importing; HTML with META tags</bookmark_value>
@@ -57,48 +53,49 @@
<paragraph role="paragraph" id="par_id3148552" xml-lang="en-US" l10n="U" oldref="21">The following file properties are converted to META tags when you export a file as an HTML document:</paragraph>
<table id="tbl_id3147304">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154935" xml-lang="en-US" l10n="U" oldref="2">File Property</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="3">&lt;TITLE&gt;</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153778" xml-lang="en-US" l10n="U" oldref="4">Subject</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="5">&lt;META NAME="CLASSIFICATION" CONTENT="Field Content"&gt;</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154908" xml-lang="en-US" l10n="U" oldref="6">Keywords</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="U" oldref="7">&lt;META NAME="KEYWORDS" CONTENT="Field Content"&gt;</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="8">Description</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="9">&lt;META NAME="DESCRIPTION" CONTENT="Field Content"&gt;</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="10">Info fields 1...4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3157892" xml-lang="en-US" l10n="U" oldref="11">&lt;META NAME="Info field name" CONTENT="Field Content"&gt;</paragraph>
</tablecell>
</tablerow>
</table>
<paragraph role="note" id="par_id3155855" xml-lang="en-US" l10n="U" oldref="22">When you import an HTML containing these META tags, the contents of the tags are added to the corresponding $[officename] file property box. </paragraph>
+<paragraph role="tip" id="par_id0926200812164481" xml-lang="en-US" l10n="NEW">Keywords must be separated by commas. A keyword can contain white space characters or semicolons.</paragraph>
<paragraph role="heading" id="hd_id3163822" xml-lang="en-US" level="3" l10n="U" oldref="12">Import Tips</paragraph>
<paragraph role="paragraph" id="par_id3155307" xml-lang="en-US" l10n="U" oldref="13">When you import an HTML document, following META tags are automatically converted to $[officename] fields: &lt;META HTTP-EQUIV="REFRESH"...&gt; and &lt;META NAME="..." ...&gt; , where NAME equals to AUTHOR, CREATED, CHANGED, CHANGEDBY, DESCRIPTION, KEYWORDS or CLASSIFICATION.</paragraph>
<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="U" oldref="15">Scripts, comments, and META tags that are positioned directly before a TABLE tag are inserted in the first cell of the table.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/gallery.xhp b/helpcontent2/source/text/shared/01/gallery.xhp
index 17d4c36067..6df461b946 100644
--- a/helpcontent2/source/text/shared/01/gallery.xhp
+++ b/helpcontent2/source/text/shared/01/gallery.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: gallery.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared01galleryxml" indexer="include" status="PUBLISH">
+<topic id="textshared01galleryxml" indexer="include">
<title id="tit" xml-lang="en-US">Gallery</title>
<filename>/text/shared/01/gallery.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-06-01T12:04:49">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_ICONVIEW" id="bm_id3146946" localize="false"/>
@@ -48,7 +46,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_LISTVIEW" id="bm_id3152821" localize="false"/>
<paragraph role="paragraph" id="par_id3148983" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="HID_GALLERY_LISTVIEW" visibility="hidden">Displays the contents of the <emph>Gallery </emph>as small icons, with title and path information.</ahelp></paragraph>
<section id="stargallery">
-<bookmark xml-lang="en-US" branch="hid/SID_GALLERY" id="bm_id2975847" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_GALLERY" id="bm_id2975847" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Gallery" id="bm_id3150616" localize="false"/>
<paragraph role="heading" id="hd_id3153894" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/gallery.xhp" name="Gallery">Gallery</link></paragraph>
<paragraph role="paragraph" id="par_id3150789" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Gallery">Opens the <emph>Gallery</emph>, where you can select graphics and sounds to insert into your document.</ahelp></paragraph>
@@ -56,7 +54,7 @@
<paragraph role="paragraph" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="44">You can display the contents of the <emph>Gallery </emph>as icons, or icons with titles and path information.</paragraph>
<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="45">To zoom in or zoom out on a single object in the <emph>Gallery</emph>, double-click the object, or select the object, and then press the Spacebar.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#gallery"/>
+<embed href="text/shared/00/00000406.xhp#gallery"/>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_THEMELIST" id="bm_id3150774" localize="false"/>
<paragraph role="paragraph" id="par_id3145346" xml-lang="en-US" l10n="U" oldref="26">Themes are listed on the left side of the <emph>Gallery</emph>.<ahelp hid="HID_GALLERY_THEMELIST">Click a theme to view the objects associated with the theme.</ahelp></paragraph>
@@ -82,6 +80,6 @@
<paragraph role="heading" id="hd_id3151384" xml-lang="en-US" level="2" l10n="U" oldref="25"><link href="text/shared/01/gallery_files.xhp" name="Files">Files</link></paragraph>
<embed href="text/shared/01/gallery_files.xhp#stargallerymanager"/>
<embed href="text/shared/00/00000010.xhp#hinzufuegen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_GALLERY_PREVIEW" id="bm_id3153896" localize="false"/><embed href="text/shared/00/00000010.xhp#vorschau"/>
+<embed href="text/shared/00/00000010.xhp#vorschau"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/grid.xhp b/helpcontent2/source/text/shared/01/grid.xhp
index 38c0be0fd4..d56720daa0 100755
--- a/helpcontent2/source/text/shared/01/grid.xhp
+++ b/helpcontent2/source/text/shared/01/grid.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: grid.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -55,8 +55,7 @@
<paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="2" l10n="NEW">Display Grid</paragraph>
<paragraph role="paragraph" id="par_idN10582" xml-lang="en-US" l10n="NEW">Displays or hides grid lines that you can use to align objects such as graphics on a page.</paragraph>
<paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Snap to Grid</paragraph>
-<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW">Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Control key
-</caseinline><defaultinline>Ctrl key</defaultinline></switchinline> when you drag an object.<comment>UFI: copied from shared\optionen\01050100.xhp</comment></paragraph><comment>UFI removed GridFront help id</comment><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Grid to Front</paragraph>
+<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW">Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key</defaultinline></switchinline> when you drag an object.<comment>UFI: copied from shared\optionen\01050100.xhp</comment></paragraph><comment>UFI removed GridFront help id</comment><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Grid to Front</paragraph>
<paragraph role="paragraph" id="par_idN105CD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the grid lines in front of the objects on the slide or page.</ahelp></paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id4372692" xml-lang="en-US" l10n="NEW">Set the grid color on Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/guides.xhp b/helpcontent2/source/text/shared/01/guides.xhp
index 60e26bc9ed..749ffe8a3a 100755
--- a/helpcontent2/source/text/shared/01/guides.xhp
+++ b/helpcontent2/source/text/shared/01/guides.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: guides.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -55,8 +55,7 @@
<paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">Display Guides</paragraph>
<paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW">Displays or hides guides that you can use to align objects on a page.</paragraph>
<paragraph role="heading" id="par_idN10582" xml-lang="en-US" level="2" l10n="NEW">Snap to Guides</paragraph>
-<paragraph role="paragraph" id="par_idN10586" xml-lang="en-US" l10n="CHG">Automatically aligns objects to vertical and horizontal guides. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Control key
-</caseinline><defaultinline>Ctrl key </defaultinline></switchinline>when you drag an object.<comment>UFI: test it! copied from shared\01\grid.xhp</comment></paragraph><comment>UFI: removed double help id</comment><paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Guides to Front</paragraph>
+<paragraph role="paragraph" id="par_idN10586" xml-lang="en-US" l10n="CHG">Automatically aligns objects to vertical and horizontal guides. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key </defaultinline></switchinline>when you drag an object.<comment>UFI: test it! copied from shared\01\grid.xhp</comment></paragraph><comment>UFI: removed double help id</comment><paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Guides to Front</paragraph>
<paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the guides in front of the objects on the slide or page.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/makefile.mk b/helpcontent2/source/text/shared/01/makefile.mk
index 51adbfe9a7..684ee2a8a4 100644
--- a/helpcontent2/source/text/shared/01/makefile.mk
+++ b/helpcontent2/source/text/shared/01/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.21 $
+# $Revision: 1.21.4.4 $
#
# This file is part of OpenOffice.org.
#
@@ -183,19 +183,25 @@ XHPFILES = \
05080400.xhp \
05090000.xhp \
05100000.xhp \
+ 05100100.xhp \
+ 05100200.xhp \
+ 05100500.xhp \
+ 05100600.xhp \
+ 05100700.xhp \
05110000.xhp \
05110100.xhp \
05110200.xhp \
05110300.xhp \
05110400.xhp \
05110500.xhp \
- 05110600.xhp \
+ 05110600m.xhp \
05110700.xhp \
05110800.xhp \
05120000.xhp \
05120100.xhp \
05120200.xhp \
05120300.xhp \
+ 05120600.xhp \
05140100.xhp \
05150101.xhp \
05190000.xhp \
diff --git a/helpcontent2/source/text/shared/01/packagemanager.xhp b/helpcontent2/source/text/shared/01/packagemanager.xhp
index 061832ad44..2b68f5a091 100755
--- a/helpcontent2/source/text/shared/01/packagemanager.xhp
+++ b/helpcontent2/source/text/shared/01/packagemanager.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: packagemanager.xhp,v $
- *
- * $Revision: 1.18 $
+ * $Revision: 1.18.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +35,7 @@
<meta>
-<topic id="textshared01packagemanagerxml" indexer="include" status="PUBLISH">
+<topic id="textshared01packagemanagerxml" indexer="include">
<title id="tit" xml-lang="en-US">Extension Manager</title>
<filename>/text/shared/01/packagemanager.xhp</filename>
</topic>
@@ -50,7 +48,9 @@
</bookmark><comment>MW corrected typos in "UNO components;...", made "Extension Manager" a two level entry and changed the "packages" reference</comment>
<bookmark xml-lang="en-US" branch="hid/HID_PACKAGE_MANAGER_MENU_ITEM" id="bm_id307931" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.deployment.ui.PackageManagerDialog" id="bm_id2198553" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_PACKAGE_MANAGER" id="bm_id828882" localize="false"/><paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph><comment>renamed in i69568</comment><paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="CHG"><ahelp hid="42772">The Extension Manager adds, removes, disables, enables, and updates %PRODUCTNAME extensions.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PACKAGE_MANAGER" id="bm_id828882" localize="false"/>
+<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph><comment>renamed in i69568</comment>
+<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="CHG"><ahelp hid="42772">The Extension Manager adds, removes, disables, enables, and updates %PRODUCTNAME extensions.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#packagemanager"/>
@@ -75,7 +75,7 @@
</list>
<paragraph role="heading" id="hd_id8570513" xml-lang="en-US" level="2" l10n="NEW">Extension Scope</paragraph>
<paragraph role="paragraph" id="par_idN1068A" xml-lang="en-US" l10n="CHG">Users with administrator or root privileges will see a dialog where they can choose to install extensions "for all users" or "only for me". Normal users without those privileges can install, remove, or modify extensions only for their own use.</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN10626" xml-lang="en-US" l10n="CHG">A user with root or administrator privileges can install an extension as a shared extension that is available to all users. After selecting an extension, a dialog opens and asks whether to install for the current user or all users.</paragraph>
</listitem>
@@ -115,7 +115,6 @@
</paragraph>
</listitem>
</list>
-<embed href="text/shared/01/packagemanager.xhp#sharedextnotes"/>
<bookmark xml-lang="en-US" branch="hid/HID_PACKAGE_MANAGER_TREELISTBOX" id="bm_id8800927" localize="false"/>
<paragraph role="paragraph" id="par_idN106AD" xml-lang="en-US" l10n="CHG"><ahelp hid="42769">Select the extension that you want to remove, enable, or disable. For some extensions, you can also open an Options dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ADD" id="bm_id788903" localize="false"/>
@@ -146,6 +145,5 @@
<bookmark xml-lang="en-US" branch="hid/42792" id="bm_id052320081054360" localize="false"/>
<paragraph role="heading" id="hd_id4921414" xml-lang="en-US" level="2" l10n="NEW">Options</paragraph>
<paragraph role="paragraph" id="par_id1439558" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select an installed extension, then click to open the Options dialog for the extension.</ahelp></paragraph>
-<embed href="text/shared/01/packagemanager.xhp#sharedextnotes"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/password_dlg.xhp b/helpcontent2/source/text/shared/01/password_dlg.xhp
index 4c6e37173e..2c7522e04f 100644
--- a/helpcontent2/source/text/shared/01/password_dlg.xhp
+++ b/helpcontent2/source/text/shared/01/password_dlg.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: password_dlg.xhp,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,32 +30,30 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textshared01password_dlgxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Password</title>
+<topic id="textshared01password_dlgxml" indexer="include">
+<title id="tit" xml-lang="en-US">Password</title>
<filename>/text/shared/01/password_dlg.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
- <section id="passwort">
- <paragraph id="hd_id3146902" role="heading" level="1" oldref="63" l10n="U" xml-lang="en-US"><link href="text/shared/01/password_dlg.xhp" name="Password">Password</link></paragraph>
- <paragraph role="paragraph" id="par_id3154350" l10n="U" xml-lang="en-US" oldref="64">Assigns a password to prevent users from making unauthorized changes.</paragraph>
- <bookmark branch="hid/SFX2_EDIT_DLG_PASSWD_ED_PASSWD_PASSWORD" xml-lang="en-US" id="bm_id3152876"/><bookmark branch="hid/HID_PASSWD_TABLE" xml-lang="en-US" id="bm_id3154044"/><paragraph role="heading" level="2" id="hd_id3146857" l10n="U" xml-lang="en-US" oldref="65">Password</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150502" xml-lang="en-US" oldref="62"><ahelp hid="HID_PASSWD_TABLE" visibility="visible">Type a password that is at least five characters long. A password is case sensitive.</ahelp></paragraph>
- <bookmark branch="hid/SFX2_EDIT_DLG_PASSWD_ED_PASSWD_CONFIRM" xml-lang="en-US" id="bm_id3149495"/><bookmark branch="hid/HID_PASSWD_DOC" xml-lang="en-US" id="bm_id3154863"/><paragraph role="heading" level="2" id="hd_id3153029" l10n="U" xml-lang="en-US" oldref="66">Confirm</paragraph>
- <paragraph role="paragraph" id="par_id3151100" l10n="U" xml-lang="en-US" oldref="67">Re-enter the password.</paragraph>
- <paragraph role="heading" level="2" id="hd_id3155351" l10n="U" xml-lang="en-US" oldref="68">Undoing password protection</paragraph>
- <paragraph role="paragraph" id="par_id3146109" l10n="U" xml-lang="en-US" oldref="69">To remove a password, re-open this dialog, and then enter the password.</paragraph>
- <paragraph role="warning" id="par_id3148621" l10n="U" xml-lang="en-US" oldref="46">$[officename] will not help you to open a document that is protected with a password.</paragraph>
- </section>
-
- </body>
+<section id="passwort">
+<paragraph role="heading" id="hd_id3146902" xml-lang="en-US" level="1" l10n="U" oldref="63"><link href="text/shared/01/password_dlg.xhp" name="Password">Password</link></paragraph>
+<paragraph role="paragraph" id="par_id3154350" xml-lang="en-US" l10n="U" oldref="64">Assigns a password to prevent users from making unauthorized changes.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2_EDIT_DLG_PASSWD_ED_PASSWD_PASSWORD" id="bm_id3152876" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_PASSWD_TABLE" id="bm_id3154044" localize="false"/>
+<paragraph role="heading" id="hd_id3146857" xml-lang="en-US" level="2" l10n="U" oldref="65">Password</paragraph>
+<paragraph role="paragraph" id="par_id3150502" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="HID_PASSWD_TABLE">Type a password that is at least five characters long. A password is case sensitive.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SFX2_EDIT_DLG_PASSWD_ED_PASSWD_CONFIRM" id="bm_id3149495" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_PASSWD_DOC" id="bm_id3154863" localize="false"/>
+<paragraph role="heading" id="hd_id3153029" xml-lang="en-US" level="2" l10n="U" oldref="66">Confirm</paragraph>
+<paragraph role="paragraph" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="67">Re-enter the password.</paragraph>
+<paragraph role="heading" id="hd_id3155351" xml-lang="en-US" level="2" l10n="U" oldref="68">Undoing password protection</paragraph>
+<paragraph role="paragraph" id="par_id3146109" xml-lang="en-US" l10n="U" oldref="69">To remove a password, re-open this dialog, and then enter the password.</paragraph>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
index e356e5e624..31dcfcb86a 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ref_pdf_export.xhp,v $
- *
- * $Revision: 1.23 $
+ * $Revision: 1.23.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,13 +52,13 @@
<paragraph role="heading" id="hd_id3149532" xml-lang="en-US" level="1" l10n="U" oldref="52"><variable id="export_as_pdf"><variable id="ref_pdf_export"><link href="text/shared/01/ref_pdf_export.xhp" name="Export as PDF">Export as PDF</link>
</variable>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154044" xml-lang="en-US" l10n="U" oldref="1"><variable id="export"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Saves the current file to Portable Document Format (PDF).</ahelp> A PDF file can be viewed and printed on any platform with the original formatting intact, provided that supporting software is installed.
+<paragraph role="paragraph" id="par_id3154044" xml-lang="en-US" l10n="CHG" oldref="1"><variable id="export"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Saves the current file to Portable Document Format (PDF) version 1.4.</ahelp> A PDF file can be viewed and printed on any platform with the original formatting intact, provided that supporting software is installed.
</variable></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#exportpdf"/>
</section>
-<paragraph role="heading" id="hd_id746482" xml-lang="en-US" level="2" l10n="NEW">General<comment>UFI: all on one page because they will shrink to AHID tags with OOo3 anyway</comment></paragraph>
+<paragraph role="heading" id="hd_id746482" xml-lang="en-US" level="2" l10n="NEW">General<comment>UFI: all on one page because they were intended to shrink to AHID tags with OOo3 anyway. Sadly cws help9s stalled ...</comment></paragraph>
<paragraph role="heading" id="hd_id3148520" xml-lang="en-US" level="3" l10n="CHG" oldref="2">Pages</paragraph>
<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="CHG" oldref="3">Sets the export options for the pages included in the PDF file.</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_EXPORT_DLG_RB_ALL" id="bm_id1623889" localize="false"/>
@@ -102,8 +100,8 @@
<paragraph role="heading" id="par_idN10791" xml-lang="en-US" level="3" l10n="NEW">General</paragraph>
<paragraph role="paragraph" id="par_idN10795" xml-lang="en-US" l10n="NEW">Sets general PDF export options.</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_PDFA_1B_SELECT" id="bm_id303964" localize="false"/>
-<paragraph role="heading" id="hd_id2796411" xml-lang="en-US" level="3" l10n="NEW">PDF/A-1</paragraph>
-<paragraph role="paragraph" id="par_id5016327" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts to the PDF/A-1 format. This is defined as an electronic document file format for long term preservation. All fonts that were used in the source document will be embedded into the generated PDF file. PDF tags will be written.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id2796411" xml-lang="en-US" level="3" l10n="NEW">PDF/A-1a</paragraph>
+<paragraph role="paragraph" id="par_id5016327" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts to the PDF/A-1a format. This is defined as an electronic document file format for long term preservation. All fonts that were used in the source document will be embedded into the generated PDF file. PDF tags will be written.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_TAGGEDPDF" id="bm_id3958250" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_TAGGEDPDF" id="bm_id6884975" localize="false"/>
<paragraph role="heading" id="par_idN107A0" xml-lang="en-US" level="3" l10n="NEW">Tagged PDF</paragraph>
@@ -123,11 +121,15 @@
<bookmark xml-lang="en-US" branch="hid/filter_ListBox_RID_PDF_TAB_GENER_LB_FORMSFORMAT" id="bm_id3088167" localize="false"/>
<paragraph role="heading" id="hd_id6585283" xml-lang="en-US" level="4" l10n="NEW">Submit format</paragraph>
<paragraph role="paragraph" id="par_idN107F8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the format of submitting forms from within the PDF file.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id0901200811454970" xml-lang="en-US" l10n="NEW">Select the format of the data that you will receive from the submitter: FDF (Forms Data Format), PDF, HTML, or XML.</paragraph>
<paragraph role="paragraph" id="par_idN10807" xml-lang="en-US" l10n="CHG">This setting overrides the control's URL property that you set in the document.</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTEMPTYPAGES" id="bm_id113223" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTEMPTYPAGES" id="bm_id5027619" localize="false"/>
<paragraph role="heading" id="hd_id3946958" xml-lang="en-US" level="3" l10n="NEW">Export automatically inserted blank pages</paragraph>
<paragraph role="paragraph" id="par_id8551896" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If switched on, automatically inserted blank pages are being exported to pdf file. This is best if you are printing the pdf file double-sided. Example: In a book a chapter paragraph style is set to always start with an odd numbered page. The previous chapter ends on an odd page. %PRODUCTNAME inserts an even numbered blank page. This option controls whether to export that even numbered page or not.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_ADDSTREAM" id="bm_id0804200803552411" localize="false"/>
+<paragraph role="heading" id="hd_id080420080355360" xml-lang="en-US" level="3" l10n="NEW">Create hybrid file</paragraph>
+<paragraph role="paragraph" id="par_id0804200803553767" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When the <link href="http://extensions.services.openoffice.org/project/pdfimport">Sun PDF Import Extension</link> is installed, this setting enables you to export the document as a .pdf file containing two file formats: PDF and ODF.</ahelp></paragraph>
<paragraph role="heading" id="hd_id9796441" xml-lang="en-US" level="2" l10n="NEW">Initial View</paragraph>
<paragraph role="heading" id="hd_id1218604" xml-lang="en-US" level="3" l10n="NEW">Panes</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_OPNMODE_PAGEONLY" id="bm_id4472792" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/selectcertificate.xhp b/helpcontent2/source/text/shared/01/selectcertificate.xhp
index 23cb77cac5..a3578bdadb 100644
--- a/helpcontent2/source/text/shared/01/selectcertificate.xhp
+++ b/helpcontent2/source/text/shared/01/selectcertificate.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: selectcertificate.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,25 +32,22 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared01selectcertificatexhp" indexer="include" status="PUBLISH">
+<topic id="textshared01selectcertificatexhp" indexer="include">
<title id="tit" xml-lang="en-US">Select Certificate</title>
<filename>/text/shared/01/selectcertificate.xhp</filename>
</topic>
-<history>
-<created date="2004-08-25T17:40:19">UFI: Select Certificate from Digital Signatures dialog</created>
-<lastedited date="2007-03-02T16:29:48">DEDR: reviewed</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN10541" xml-lang="en-US" level="1" l10n="NEW">Select Certificate</paragraph>
<paragraph role="paragraph" id="par_idN10545" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the certificate that you want to <link href="text/shared/01/digitalsignatures.xhp">digitally sign</link> the current document with.</ahelp></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#digitalsigsel"/>
+<embed href="text/shared/00/00000401.xhp#digitalsigsel"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_CHOOSESIGNATURES" id="bm_id8177129" localize="false"/><embed href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
+<embed href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
+<bookmark xml-lang="en-US" branch="hid/HID_XMLSEC_CTRL_CHOOSESIGNATURES" id="bm_id8177129" localize="false"/>
<paragraph role="heading" id="par_idN1056A" xml-lang="en-US" level="2" l10n="NEW">List</paragraph>
<paragraph role="paragraph" id="par_idN1056E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the certificate that you want to digitally sign the current document with.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/xmlsecurity_PushButton_RID_XMLSECDLG_CERTCHOOSER_BTN_VIEWCERT" id="bm_id5101168" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/xformsdata.xhp b/helpcontent2/source/text/shared/01/xformsdata.xhp
index ca0011d95a..507976dfa6 100644
--- a/helpcontent2/source/text/shared/01/xformsdata.xhp
+++ b/helpcontent2/source/text/shared/01/xformsdata.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: xformsdata.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,103 +32,80 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared01xformsdataxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Data Navigator</title>
+<topic id="textshared01xformsdataxhp" indexer="include">
+<title id="tit" xml-lang="en-US">Data Navigator</title>
<filename>/text/shared/01/xformsdata.xhp</filename>
</topic>
</meta>
<body>
-
-
- <section id="datanavigator">
-
-
+<section id="datanavigator">
<bookmark xml-lang="en-US" branch="index" id="bm_id6823023"><bookmark_value>data structure of XForms</bookmark_value>
<bookmark_value>deleting;models/instances</bookmark_value>
<bookmark_value>models in XForms</bookmark_value>
<bookmark_value>Data Navigator;display options</bookmark_value>
-</bookmark>
- <comment>MW made "Data Navigator.." a two level entry</comment>
-
+</bookmark><comment>MW made "Data Navigator.." a two level entry</comment>
<bookmark xml-lang="en-US" branch="hid/SID_FM_SHOW_DATANAVIGATOR" id="bm_id7463799" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/.uno:ShowDataNavigator" id="bm_id7677236" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN1054E" role="heading" level="1" l10n="NEW"><variable id="xformsdata"><link href="text/shared/01/xformsdata.xhp">Data Navigator</link>
+<paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="1" l10n="NEW"><variable id="xformsdata"><link href="text/shared/01/xformsdata.xhp">Data Navigator</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN1056C" role="paragraph" l10n="CHG"><ahelp hid=".">Specifies the data structure of the current XForms document.</ahelp></paragraph>
-
- </section>
-
+<paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Specifies the data structure of the current XForms document.</ahelp></paragraph>
+</section>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_MODELS_LIST" id="bm_id759300" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN1056F" role="heading" level="2" l10n="NEW">Model name</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10573" role="paragraph" l10n="NEW"><ahelp hid=".">Selects the XForms model that you want to use.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN1056F" xml-lang="en-US" level="2" l10n="NEW">Model name</paragraph>
+<paragraph role="paragraph" id="par_idN10573" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects the XForms model that you want to use.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_MODELS_MENUBTN" id="bm_id6110721" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10576" role="heading" level="2" l10n="NEW">Models</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1057A" role="paragraph" l10n="NEW"><ahelp hid=".">Adds, renames, and removes XForms models.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10576" xml-lang="en-US" level="2" l10n="NEW">Models</paragraph>
+<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds, renames, and removes XForms models.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_MODELS_ADD" id="bm_id6934415" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10604" role="heading" level="3" l10n="NEW">Add</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10608" role="paragraph" l10n="CHG"><ahelp hid=".">Opens the Add Model dialog where you can add an XForm model.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10604" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
+<paragraph role="paragraph" id="par_idN10608" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the Add Model dialog where you can add an XForm model.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_ADD_MODEL_CB_MODIFIES_DOCUMENT" id="bm_id0910200811130823" localize="false"/>
+<paragraph role="heading" id="hd_id0910200811173295" xml-lang="en-US" level="3" l10n="NEW">Model data updates change document's modification status</paragraph>
+<paragraph role="paragraph" id="par_id0910200811173255" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When enabled, the document status will be set to "modified" when you change any form control that is bound to any data in the model. When not enabled, such a change does not set the document status to "modified".</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_MODELS_REMOVE" id="bm_id5671559" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10612" role="heading" level="3" l10n="NEW">Remove</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10616" role="paragraph" l10n="NEW"><ahelp hid=".">Deletes the selected XForm model. You cannot delete the last model.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10612" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
+<paragraph role="paragraph" id="par_idN10616" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected XForm model. You cannot delete the last model.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_MODELS_EDIT" id="bm_id8617816" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10743" role="heading" level="3" l10n="NEW">Rename</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10749" role="paragraph" l10n="NEW"><ahelp hid=".">Renames the selected Xform model.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10743" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
+<paragraph role="paragraph" id="par_idN10749" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Renames the selected Xform model.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_SHOW_DETAILS" id="bm_id5646229" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10619" role="heading" level="3" l10n="NEW">Show Details</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1061D" role="paragraph" l10n="NEW"><ahelp hid=".">Switches the display to show or hide details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
-
+<paragraph role="heading" id="par_idN10619" xml-lang="en-US" level="3" l10n="NEW">Show Details</paragraph>
+<paragraph role="paragraph" id="par_idN1061D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the display to show or hide details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_ITEMS_LIST" id="bm_id2524491" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN1057D" role="heading" level="2" l10n="NEW">Instance</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10682" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the items that belong to the current instance.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN1057D" xml-lang="en-US" level="2" l10n="NEW">Instance</paragraph>
+<paragraph role="paragraph" id="par_idN10682" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the items that belong to the current instance.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD" id="bm_id4040955" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN1058B" role="heading" level="2" l10n="NEW">Submissions</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1058F" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the submissions.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10592" role="heading" level="2" l10n="NEW">Bindings</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10596" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the bindings for the XForm.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
-
+<paragraph role="heading" id="par_idN1058B" xml-lang="en-US" level="2" l10n="NEW">Submissions</paragraph>
+<paragraph role="paragraph" id="par_idN1058F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the submissions.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
+<paragraph role="heading" id="par_idN10592" xml-lang="en-US" level="2" l10n="NEW">Bindings</paragraph>
+<paragraph role="paragraph" id="par_idN10596" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the bindings for the XForm.</ahelp><comment>UFI. it's not in the spec</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_INSTANCES_MENUBTN" id="bm_id3339335" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10599" role="heading" level="2" l10n="NEW">Instances</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1059D" role="paragraph" l10n="NEW"><ahelp hid=".">This button has submenus to add, edit or remove instances.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10599" xml-lang="en-US" level="2" l10n="NEW">Instances</paragraph>
+<paragraph role="paragraph" id="par_idN1059D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">This button has submenus to add, edit or remove instances.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_ADD" id="bm_id9214148" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10649" role="heading" level="3" l10n="NEW">Add</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1064D" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog where you can add a new instance.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10649" xml-lang="en-US" level="3" l10n="NEW">Add</paragraph>
+<paragraph role="paragraph" id="par_idN1064D" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog where you can add a new instance.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_EDIT" id="bm_id4229255" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10650" role="heading" level="3" l10n="NEW">Edit</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10654" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog where you can modify the current instance.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10650" xml-lang="en-US" level="3" l10n="NEW">Edit</paragraph>
+<paragraph role="paragraph" id="par_idN10654" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog where you can modify the current instance.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MN_XFORMS_INSTANCES_REMOVE" id="bm_id1858882" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10657" role="heading" level="3" l10n="NEW">Remove</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1065B" role="paragraph" l10n="NEW"><ahelp hid=".">Deletes the current instance. You cannot delete the last instance.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_idN1065E" role="heading" level="3" l10n="NEW">Show data types</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10662" role="paragraph" l10n="NEW"><ahelp hid=".">Switches the display to show more or less details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
-
+<paragraph role="heading" id="par_idN10657" xml-lang="en-US" level="3" l10n="NEW">Remove</paragraph>
+<paragraph role="paragraph" id="par_idN1065B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the current instance. You cannot delete the last instance.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN1065E" xml-lang="en-US" level="3" l10n="NEW">Show data types</paragraph>
+<paragraph role="paragraph" id="par_idN10662" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the display to show more or less details.</ahelp><comment>UFI: not explained in spec</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT" id="bm_id2156132" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE" id="bm_id9931943" localize="false"/>
-
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_ADD" id="bm_id1840876" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10584" role="heading" level="3" l10n="CHG">Add</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10588" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog to add a new item (element, attribute, submission, or binding) as a sub-item of the current item.</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10584" xml-lang="en-US" level="3" l10n="CHG">Add</paragraph>
+<paragraph role="paragraph" id="par_idN10588" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog to add a new item (element, attribute, submission, or binding) as a sub-item of the current item.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_EDIT" id="bm_id1051362" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN10624" role="heading" level="3" l10n="CHG">Edit</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10628" role="paragraph" l10n="CHG"><ahelp hid=".">Opens a dialog to edit the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
-
+<paragraph role="heading" id="par_idN10624" xml-lang="en-US" level="3" l10n="CHG">Edit</paragraph>
+<paragraph role="paragraph" id="par_idN10628" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens a dialog to edit the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_XFORMS_TOOLBOX_ITEM_REMOVE" id="bm_id3862117" localize="false"/>
- <paragraph xml-lang="en-US" id="par_idN1062B" role="heading" level="3" l10n="CHG">Delete</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1062F" role="paragraph" l10n="CHG"><ahelp hid=".">Deletes the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
- </body>
+<paragraph role="heading" id="par_idN1062B" xml-lang="en-US" level="3" l10n="CHG">Delete</paragraph>
+<paragraph role="paragraph" id="par_idN1062F" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Deletes the selected item (element, attribute, submission, or binding).</ahelp></paragraph>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01170000.xhp b/helpcontent2/source/text/shared/02/01170000.xhp
index 346111a830..12c4979e14 100644
--- a/helpcontent2/source/text/shared/02/01170000.xhp
+++ b/helpcontent2/source/text/shared/02/01170000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170000.xhp,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,21 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0201170000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0201170000xml" indexer="include">
<title id="tit" xml-lang="en-US">Form Controls</title>
<filename>/text/shared/02/01170000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-09T15:17:05">UFI: adding new controls, several dba specs
-YJ:checked
-UFI: added dba.features: Form Navigation bar
-dedr:reviewed
-UFI: I did not separate Controls and More Controls toolbars, because FS told me they look different according to doc type</lastedited>
-</history>
</meta>
<body>
<section id="formularfunktionen">
@@ -72,20 +64,21 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<bookmark xml-lang="en-US" branch="hid/SID_FM_CONFIG" id="bm_id4029443" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Config" id="bm_id3153252" localize="false"/>
<paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/02/01170000.xhp" name="Form Controls">Form Controls</link></paragraph>
-<paragraph role="paragraph" id="par_id3151378" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="formulartext"><ahelp hid=".uno:Config">The Form Controls icon opens a toolbar with the tools that you need to create an interactive form.</ahelp>
+<paragraph role="paragraph" id="par_id3151378" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="formulartext"><ahelp hid=".uno:Config">The Form Controls toolbar contains tools that you need to create an interactive form.</ahelp>
</variable> You can use the toolbar to add controls to a form in a text, spreadsheet, presentation, or HTML document, for example a button that runs a macro.</paragraph>
</section>
<section id="howtoget">
-<paragraph role="paragraph" id="par_id3147336" xml-lang="en-US" l10n="CHG" oldref="68">Icon on the <emph>Insert</emph> toolbar:</paragraph>
+<paragraph role="paragraph" id="par_id1027200809391346" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">View - Toolbars - Form Controls</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3147336" xml-lang="en-US" l10n="CHG" oldref="68">Icon on the <emph>Insert</emph> toolbar (you may need to enable this initially invisible icon):</paragraph>
<section id="syformular">
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="E">
-<image id="img_id3150943" src="res/commandimagelist/sc_config.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150943" xml-lang="en-US">Icon</alt>
+<image id="img_id3150943" src="res/commandimagelist/sc_config.png" width="0.1665in" height="0.1665in"><alt id="alt_id3150943" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="CHG" oldref="3">Form Controls</paragraph>
</tablecell>
</tablerow>
@@ -104,13 +97,13 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN10C4D" xml-lang="en-US" l10n="NEW">In the document, drag to create the control. </paragraph>
-<paragraph role="paragraph" id="par_idN10C50" xml-lang="en-US" l10n="NEW">To create a square control field, hold down the <item type="keycode">Shift</item> key while you drag.</paragraph>
+<paragraph role="paragraph" id="par_idN10C50" xml-lang="en-US" l10n="NEW">To create a square control field, hold down the Shift key while you drag.</paragraph>
</listitem>
</list>
-<paragraph role="tip" id="par_id3154127" xml-lang="en-US" l10n="U" oldref="78">To add a field from the field list of a table or query to a form, drag a cell into the form. In a text document, you can also drag a column header to add a field to a form. To include a label for the field, hold down the <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="tip" id="par_id3154127" xml-lang="en-US" l10n="U" oldref="78">To add a field from the field list of a table or query to a form, drag a cell into the form. In a text document, you can also drag a column header to add a field to a form. To include a label for the field, hold down the <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift key down when you drag a column head.</paragraph>
<paragraph role="heading" id="par_idN10C87" xml-lang="en-US" level="2" l10n="NEW">Modifying a Control</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id3148645" xml-lang="en-US" l10n="U" oldref="5">Right-click the control and choose <emph>Control</emph>. A dialog opens where you can define the properties of the control.</paragraph>
</listitem>
@@ -125,12 +118,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3154411" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Select<comment>controls and design bars</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156106" xml-lang="en-US" l10n="E">
-<image id="img_id3153516" src="res/commandimagelist/sc_drawselect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153516" xml-lang="en-US">Icon</alt>
+<image id="img_id3153516" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153516" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150470" xml-lang="en-US" l10n="U" oldref="25">This icon switches the mouse pointer to the select mode, or deactivates this mode. The select mode is used to select the controls of the current form.</paragraph>
</tablecell>
</tablerow>
@@ -148,12 +141,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3146914" xml-lang="en-US" level="2" l10n="U" oldref="10">Check Box<comment>controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148483" xml-lang="en-US" l10n="E">
-<image id="img_id3156380" src="res/commandimagelist/sc_checkbox.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3156380" xml-lang="en-US">Icon</alt>
+<image id="img_id3156380" src="res/commandimagelist/sc_checkbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156380" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153927" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid=".uno:CheckBox">Creates a check box.</ahelp> Check boxes allow you to activate or deactivate a function in a form.</paragraph>
</tablecell>
</tablerow>
@@ -166,12 +159,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3153794" xml-lang="en-US" level="2" l10n="U" oldref="16">Text Box<comment>controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3163665" xml-lang="en-US" l10n="E">
-<image id="img_id3153266" src="res/commandimagelist/sc_edit.png" width="0.0874inch" height="0.0874inch"><alt id="alt_id3153266" xml-lang="en-US">Icon</alt>
+<image id="img_id3153266" src="res/commandimagelist/sc_edit.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153266" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3158444" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".uno:Edit">Creates a text box.</ahelp> Text boxes are fields in which the user can enter text. In a form, text boxes display data or allow for new data input.</paragraph>
</tablecell>
</tablerow>
@@ -184,12 +177,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3151218" xml-lang="en-US" level="2" l10n="U" oldref="124">Formatted Field<comment>controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154836" xml-lang="en-US" l10n="E">
-<image id="img_id3143277" src="res/commandimagelist/sc_formattedfield.png" width="0.222inch" height="0.222inch"><alt id="alt_id3143277" xml-lang="en-US">Icon</alt>
+<image id="img_id3143277" src="res/commandimagelist/sc_formattedfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3143277" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147547" xml-lang="en-US" l10n="U" oldref="125"><ahelp hid=".uno:FormattedField">Creates a formatted field.</ahelp> A formatted field is a text box in which you can define how the inputs and outputs are formatted, and which limiting values apply.</paragraph>
</tablecell>
</tablerow>
@@ -203,12 +196,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3148774" xml-lang="en-US" level="2" l10n="U" oldref="6">Push Button<comment>controls bar</comment></paragraph>
<table id="tbl_id3154501">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145801" xml-lang="en-US" l10n="E">
-<image id="img_id3151073" src="res/commandimagelist/sc_insertpushbutton.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151073" xml-lang="en-US">Icon</alt>
+<image id="img_id3151073" src="res/commandimagelist/sc_insertpushbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151073" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147046" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid=".uno:Pushbutton">Creates a push button.</ahelp> This function can be used to execute a command for a defined event, such as a mouse click.</paragraph>
<paragraph role="paragraph" id="par_id3154731" xml-lang="en-US" l10n="U" oldref="138">You can apply text and graphics to these buttons.</paragraph>
</tablecell>
@@ -222,12 +215,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3157844" xml-lang="en-US" level="2" l10n="U" oldref="8">Option Button<comment>controls bar</comment></paragraph>
<table id="tbl_id3151318">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152971" xml-lang="en-US" l10n="E">
-<image id="img_id3152999" src="res/commandimagelist/sc_radiobutton.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152999" xml-lang="en-US">Icon</alt>
+<image id="img_id3152999" src="res/commandimagelist/sc_radiobutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152999" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149123" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid=".uno:RadioButton">Creates an option button.</ahelp> Option buttons enable the user to choose one of several options. Option buttons with the same functionality are given the same name (<link href="text/shared/02/01170101.xhp" name="Name"><emph>Name</emph></link>
<emph>property</emph>). Normally, they are given a <link href="text/shared/02/01170000.xhp" name="group box">group box</link>.</paragraph>
</tablecell>
@@ -241,12 +234,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3156064" xml-lang="en-US" level="2" l10n="U" oldref="18">List Box<comment>controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154326" xml-lang="en-US" l10n="E">
-<image id="img_id3154135" src="res/commandimagelist/sc_listbox.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3154135" xml-lang="en-US">Icon</alt>
+<image id="img_id3154135" src="res/commandimagelist/sc_listbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154135" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3166428" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid=".uno:ListBox">Creates a list box.</ahelp> A list box lets users select an entry from a list. If the form is linked to a database and the database connection is active, the<link href="text/shared/02/01170900.xhp" name="List Box Wizard"><emph>List Box Wizard</emph></link> will automatically appear after the list box is inserted in the document. This wizard helps you create the list box.</paragraph>
</tablecell>
</tablerow>
@@ -259,12 +252,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="2" l10n="U" oldref="20">Combo Box<comment>controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149981" xml-lang="en-US" l10n="E">
-<image id="img_id3148817" src="res/commandimagelist/sc_combobox.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3148817" xml-lang="en-US">Icon</alt>
+<image id="img_id3148817" src="res/commandimagelist/sc_combobox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148817" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149407" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid=".uno:ComboBox">Creates a combo box.</ahelp> A combo box is a single-line list box with a drop-down list from which users choose an option. You can assign the "read-only" property to the combo box so that users cannot enter other entries than those found in the list. If the form is bound to a database and the database connection is active, the <link href="text/shared/02/01170900.xhp" name="Combo Box Wizard"><emph>Combo Box Wizard</emph></link> will automatically appear after you insert the combo box in the document.</paragraph>
</tablecell>
</tablerow>
@@ -277,12 +270,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3145618" xml-lang="en-US" level="2" l10n="U" oldref="12">Label Field<comment>controls bar</comment></paragraph>
<table id="tbl_id3156712">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145295" xml-lang="en-US" l10n="E">
-<image id="img_id3151017" src="res/commandimagelist/sc_insertfixedtext.png" width="0.0874inch" height="0.0874inch"><alt id="alt_id3151017" xml-lang="en-US">Icon</alt>
+<image id="img_id3151017" src="res/commandimagelist/sc_insertfixedtext.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151017" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148534" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid=".uno:Label">Creates a field for displaying text.</ahelp> These labels are only for displaying predefined text. Entries cannot be made in these fields.</paragraph>
</tablecell>
</tablerow>
@@ -301,12 +294,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="par_idN11B57" xml-lang="en-US" level="2" l10n="NEW">Wizards On/Off<comment>Controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11B65" xml-lang="en-US" l10n="NEW">
-<image id="img_id6128727" src="res/commandimagelist/sc_usewizards.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id6128727" xml-lang="en-US">wizards on off control</alt>
+<image id="img_id6128727" src="res/commandimagelist/sc_usewizards.png" width="0.2228in" height="0.2228in"><alt id="alt_id6128727" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11B76" xml-lang="en-US" l10n="CHG">Turns on and turns off the automatic form controls wizards.</paragraph>
<paragraph role="paragraph" id="par_id6403088" xml-lang="en-US" l10n="NEW">These wizards help you to enter the properties of list boxes, table controls, and other controls.</paragraph>
</tablecell>
@@ -324,12 +317,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="par_idN11A56" xml-lang="en-US" level="2" l10n="NEW">Spin Button<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11A64" xml-lang="en-US" l10n="NEW">
-<image id="img_id7816400" src="res/commandimagelist/sc_spinbutton.png" width="0.222inch" height="0.222inch"><alt id="alt_id7816400" xml-lang="en-US">spin button control</alt>
+<image id="img_id7816400" src="res/commandimagelist/sc_spinbutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id7816400" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11A75" xml-lang="en-US" l10n="NEW"><ahelp hid=".uno:SpinButton">Creates a spin button.</ahelp></paragraph>
</tablecell>
</tablerow>
@@ -343,12 +336,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="par_idN11ABC" xml-lang="en-US" level="2" l10n="NEW">Scrollbar<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11ACA" xml-lang="en-US" l10n="NEW">
-<image id="img_id8203985" src="res/commandimagelist/sc_scrollbar.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id8203985" xml-lang="en-US">scrollbar control</alt>
+<image id="img_id8203985" src="res/commandimagelist/sc_scrollbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id8203985" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11ADB" xml-lang="en-US" l10n="NEW"><ahelp hid=".uno:ScrollBar">Creates a scrollbar.</ahelp></paragraph>
</tablecell>
</tablerow>
@@ -357,82 +350,82 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="paragraph" id="par_idN11CA3" xml-lang="en-US" l10n="NEW">You can specify the following properties for a scrollbar:</paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN11CDA" xml-lang="en-US" l10n="NEW">UI name</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN11CE0" xml-lang="en-US" l10n="NEW">Semantics</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11CE7" xml-lang="en-US" l10n="NEW">Scroll value min</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11CED" xml-lang="en-US" l10n="NEW">Specifies the minimum height or the minimum width of a scrollbar.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11CF4" xml-lang="en-US" l10n="NEW">Scroll value max</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11CFA" xml-lang="en-US" l10n="NEW">Specifies the maximum height or the maximum width of a scrollbar.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D01" xml-lang="en-US" l10n="NEW">Default scroll value</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D07" xml-lang="en-US" l10n="CHG">Specifies the default value of a scrollbar, used when the form is reset.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D0E" xml-lang="en-US" l10n="NEW">Orientation</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D14" xml-lang="en-US" l10n="NEW">Specifies the orientation of a scrollbar, that is, horizontal or vertical.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D1B" xml-lang="en-US" l10n="CHG">Small change</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D21" xml-lang="en-US" l10n="NEW">Specifies the minimum amount by which you can scroll a scrollbar, for example, by clicking an arrow.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D28" xml-lang="en-US" l10n="CHG">Large change</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D2E" xml-lang="en-US" l10n="NEW">Specifies the amount that a large step scrolls a scrollbar, for example, when you click between the scrollbar thumb and a scrollbar arrow.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D35" xml-lang="en-US" l10n="NEW">Delay</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D3B" xml-lang="en-US" l10n="NEW">Specifies the delay in milliseconds between scrollbar trigger events. For example, the delay that occurs when you click an arrow button on the scrollbar and hold down the mouse button.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D42" xml-lang="en-US" l10n="NEW">Symbol color</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D48" xml-lang="en-US" l10n="NEW">Specifies the color of the arrows on the scrollbar.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D4F" xml-lang="en-US" l10n="NEW">Visible Size</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11D55" xml-lang="en-US" l10n="NEW">Specifies the size of the scrollbar thumb in "value units". For example, a value of ("Scroll value max." minus "Scroll value min.") / 2 results in a scrollbar thumb that occupies half of the scrollbar.</paragraph>
<paragraph role="tablecontent" id="par_idN11D58" xml-lang="en-US" l10n="NEW">To make the width of the scrollbar equal to the height of the scrollbar, set the Visible Size to zero.</paragraph>
</tablecell>
@@ -447,12 +440,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3153316" xml-lang="en-US" level="2" l10n="U" oldref="22">Image Button<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159622" xml-lang="en-US" l10n="E">
-<image id="img_id3154378" src="res/commandimagelist/sc_imagebutton.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3154378" xml-lang="en-US">Icon</alt>
+<image id="img_id3154378" src="res/commandimagelist/sc_imagebutton.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154378" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148601" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid=".uno:Imagebutton">Creates a button displayed as an image.</ahelp> Aside from the graphic representation, an image button has the same properties as a "normal" button.</paragraph>
</tablecell>
</tablerow>
@@ -465,12 +458,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3159171" xml-lang="en-US" level="2" l10n="U" oldref="49">Image Control<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155869" xml-lang="en-US" l10n="E">
-<image id="img_id3152381" src="res/commandimagelist/sc_objectcatalog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152381" xml-lang="en-US">Icon</alt>
+<image id="img_id3152381" src="res/commandimagelist/sc_objectcatalog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152381" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149596" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid=".uno:ImageControl">Creates an image control. It can only be used to add images from a database.</ahelp> In the form document, double-click one of these controls to open the <emph>Insert Graphic</emph> dialog to insert the image. There is also a context menu (not in design mode) with commands for inserting and deleting the image.</paragraph>
<paragraph role="paragraph" id="par_id3150318" xml-lang="en-US" l10n="U" oldref="70">Images from a database can be displayed in a form, and new images can be inserted in the database as long as the image control is not write-protected. The control must refer to a database field of the image type. Therefore, enter the data field into the properties window on the <emph>Data</emph> tab page.</paragraph>
</tablecell>
@@ -484,12 +477,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3156040" xml-lang="en-US" level="2" l10n="U" oldref="29">Date Field<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149423" xml-lang="en-US" l10n="E">
-<image id="img_id3150096" src="res/commandimagelist/sc_adddatefield.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150096" xml-lang="en-US">Icon</alt>
+<image id="img_id3150096" src="res/commandimagelist/sc_adddatefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150096" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151312" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid=".uno:DateField">Creates a date field.</ahelp> If the form is linked to a database, the date values can be adopted from the database.</paragraph>
</tablecell>
</tablerow>
@@ -505,12 +498,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3152369" xml-lang="en-US" level="2" l10n="U" oldref="31">Time Field<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153687" xml-lang="en-US" l10n="E">
-<image id="img_id3155949" src="res/commandimagelist/sc_timefield.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3155949" xml-lang="en-US">Icon</alt>
+<image id="img_id3155949" src="res/commandimagelist/sc_timefield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155949" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155399" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid=".uno:TimeField">Creates a time field.</ahelp> If the form is linked to a database, the time values for the form can be adopted from the database.</paragraph>
</tablecell>
</tablerow>
@@ -524,12 +517,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3156186" xml-lang="en-US" level="2" l10n="U" oldref="27">File Selection<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150531" xml-lang="en-US" l10n="E">
-<image id="img_id3154344" src="res/commandimagelist/sc_filecontrol.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154344" xml-lang="en-US">Icon</alt>
+<image id="img_id3154344" src="res/commandimagelist/sc_filecontrol.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154344" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149438" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid=".uno:FileControl">Creates a button that enables file selection.</ahelp></paragraph>
</tablecell>
</tablerow>
@@ -542,12 +535,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3154652" xml-lang="en-US" level="2" l10n="U" oldref="33">Numerical Field<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149396" xml-lang="en-US" l10n="E">
-<image id="img_id3153012" src="res/commandimagelist/sc_insertnumericfield.png" width="0.0874inch" height="0.0874inch"><alt id="alt_id3153012" xml-lang="en-US">Icon</alt>
+<image id="img_id3153012" src="res/commandimagelist/sc_insertnumericfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153012" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145601" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid=".uno:NumericField">Creates a numerical field.</ahelp> If the form is linked to a database, the numerical values in the form can be adopted from the database.</paragraph>
</tablecell>
</tablerow>
@@ -560,12 +553,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3153612" xml-lang="en-US" level="2" l10n="U" oldref="35">Currency Field<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145324" xml-lang="en-US" l10n="E">
-<image id="img_id3152866" src="res/commandimagelist/sc_currencyfield.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3152866" xml-lang="en-US">Icon</alt>
+<image id="img_id3152866" src="res/commandimagelist/sc_currencyfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152866" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145115" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".uno:CurrencyField">Creates a currency field.</ahelp> If the form is linked to a database, the currency field contents for in the form can be adopted from the database.</paragraph>
</tablecell>
</tablerow>
@@ -578,12 +571,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3148825" xml-lang="en-US" level="2" l10n="U" oldref="37">Pattern Field<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149742" xml-lang="en-US" l10n="E">
-<image id="img_id3148924" src="res/commandimagelist/sc_insertpatternfield.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3148924" xml-lang="en-US">Icon</alt>
+<image id="img_id3148924" src="res/commandimagelist/sc_insertpatternfield.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148924" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150122" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid=".uno:PatternField">Creates a pattern field.</ahelp> Pattern fields consist of an edit mask and a literal mask. The edit mask determines which data can be entered. The literal mask determines the contents of the pattern field when loading the form.</paragraph>
</tablecell>
</tablerow>
@@ -597,12 +590,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3145147" xml-lang="en-US" level="2" l10n="U" oldref="14">Group Box<comment>more controls bar</comment></paragraph>
<table id="tbl_id3154020">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159334" xml-lang="en-US" l10n="E">
-<image id="img_id3153790" src="res/commandimagelist/sc_groupbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153790" xml-lang="en-US">Icon</alt>
+<image id="img_id3153790" src="res/commandimagelist/sc_groupbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153790" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154572" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid=".uno:GroupBox">Creates a frame to visually group several controls.</ahelp> Group boxes allow you to group option buttons in a frame.</paragraph>
<paragraph role="paragraph" id="par_id3148394" xml-lang="en-US" l10n="U" oldref="72">If you insert a group frame into the document, the <link href="text/shared/autopi/01120000.xhp" name="Group Element Wizard">Group Element Wizard</link> starts, which allows you to easily create an option group.</paragraph>
</tablecell>
@@ -610,7 +603,7 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
</table>
<paragraph role="paragraph" id="par_id3150567" xml-lang="en-US" l10n="U" oldref="65">
-<emph>Note:</emph> When you drag a group box over already existing controls and then want to select a control, you have to first open the context menu of the group box and choose <emph>Arrange - Send to Back</emph>. Then select the control while pressing <switchinline select="sys"><caseinline select="MAC">Command
+<emph>Note:</emph> When you drag a group box over already existing controls and then want to select a control, you have to first open the context menu of the group box and choose <emph>Arrange - Send to Back</emph>. Then select the control while pressing <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>.</paragraph>
<paragraph role="note" id="par_id3145615" xml-lang="en-US" l10n="U" oldref="66">Group boxes are used only for a visual effect. A functional grouping of option fields can be made through the name definition: under the <link href="text/shared/02/01170101.xhp" name="Name"><emph>Name</emph></link> properties of all option fields, enter the same name in order to group them.</paragraph>
</section>
@@ -620,12 +613,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3157996" xml-lang="en-US" level="2" l10n="U" oldref="39">Table Control<comment>more controls bar</comment></paragraph>
<table id="tbl_id3153023">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156402" xml-lang="en-US" l10n="E">
-<image id="img_id3146324" src="res/commandimagelist/sc_grid.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146324" xml-lang="en-US">Icon</alt>
+<image id="img_id3146324" src="res/commandimagelist/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3146324" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154579" xml-lang="en-US" l10n="CHG" oldref="40"><ahelp hid=".">Creates a table control to display a database table.</ahelp> If you create a new table control, the <link href="text/shared/02/01170800.xhp" name="Table Element Wizard">Table Element Wizard</link> appears.</paragraph>
</tablecell>
</tablerow>
@@ -639,12 +632,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="par_idN11B1E" xml-lang="en-US" level="2" l10n="NEW">Navigation bar<comment>more controls bar</comment></paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11B2C" xml-lang="en-US" l10n="NEW">
-<image id="img_id5074922" src="res/commandimagelist/sc_navigationbar.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id5074922" xml-lang="en-US">navigation bar control</alt>
+<image id="img_id5074922" src="res/commandimagelist/sc_navigationbar.png" width="0.2228in" height="0.2228in"><alt id="alt_id5074922" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN11B3D" xml-lang="en-US" l10n="NEW"><ahelp hid="SID_FM_NAVIGATIONBAR">Creates a navigation bar.</ahelp></paragraph>
</tablecell>
</tablerow>
@@ -663,12 +656,12 @@ UFI: I did not separate Controls and More Controls toolbars, because FS told me
<paragraph role="heading" id="hd_id3146815" xml-lang="en-US" level="2" l10n="U" oldref="136">Automatic Control Focus<comment>design bar</comment></paragraph>
<table id="tbl_id3154633">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150261" xml-lang="en-US" l10n="E">
-<image id="img_id3149351" src="res/commandimagelist/sc_autocontrolfocus.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149351" xml-lang="en-US">Icon</alt>
+<image id="img_id3149351" src="res/commandimagelist/sc_autocontrolfocus.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149351" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3109848" xml-lang="en-US" l10n="U" oldref="137"><ahelp hid=".uno:AutoControlFocus">If<emph> Automatic Control Focus </emph>is activated, the first form control will be selected when you open the document. If the button is not activated, the text will be selected after opening. The <link href="text/shared/02/01170300.xhp" name="Tab Order">Tab Order</link> that you have specified determines which is the first form control.</ahelp></paragraph>
</tablecell>
</tablerow>
diff --git a/helpcontent2/source/text/shared/02/01170004.xhp b/helpcontent2/source/text/shared/02/01170004.xhp
index 84ea4a4879..a0a842c439 100755
--- a/helpcontent2/source/text/shared/02/01170004.xhp
+++ b/helpcontent2/source/text/shared/02/01170004.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170004.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -67,16 +67,16 @@
<paragraph role="paragraph" id="par_id3159400" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SID_FM_SHOWCOLS">Calls a submenu where you can select the columns to show again.</ahelp> To show only one column, click the column name. You see only the first 16 hidden columns. If there are more hidden columns, choose the <emph>More</emph> command to call the <emph>Show Columns</emph> dialog.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_FM_SHOWCOLS_MORE" id="bm_id3150669" localize="false"/><paragraph role="heading" id="hd_id3156193" xml-lang="en-US" level="3" l10n="U" oldref="83">More</paragraph>
<paragraph role="paragraph" id="par_id3159269" xml-lang="en-US" l10n="U" oldref="84"><ahelp hid="SID_FM_SHOWCOLS_MORE">Calls the <emph>Show Columns</emph> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVX_DLG_SHOWGRIDCOLUMNS:1" id="bm_id3159148" localize="false"/><paragraph role="paragraph" id="par_id3149763" xml-lang="en-US" l10n="U" oldref="85"><ahelp hid="SVX:LISTBOX:RID_SVX_DLG_SHOWGRIDCOLUMNS:1">In the <emph>Show Columns</emph> dialog you can select the columns to be shown. Hold down the Shift or Ctrl key to select multiple entries.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVX_DLG_SHOWGRIDCOLUMNS:1" id="bm_id3159148" localize="false"/><paragraph role="paragraph" id="par_id3149763" xml-lang="en-US" l10n="U" oldref="85"><ahelp hid="SVX:LISTBOX:RID_SVX_DLG_SHOWGRIDCOLUMNS:1">In the <emph>Show Columns</emph> dialog you can select the columns to be shown. Hold down the Shift or Ctrl (Mac: Command) key to select multiple entries.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_FM_SHOWALLCOLS" id="bm_id3145119" localize="false"/><paragraph role="heading" id="hd_id3153561" xml-lang="en-US" level="3" l10n="U" oldref="86">All</paragraph>
<paragraph role="paragraph" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="87"><ahelp hid="SID_FM_SHOWALLCOLS">Click <emph>All </emph>if you want to show all columns.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="2" l10n="U" oldref="127">Keyboard-only control of Table Controls</paragraph>
-<paragraph role="paragraph" id="par_id3149416" xml-lang="en-US" l10n="U" oldref="126">If you use the keyboard only to travel through controls in your document, you will find one difference to the other types of controls: the Tab key does not move the cursor to the next control, but moves to the next column inside the table control. Press Ctrl+Tab to move to the next control, or press Shift+Ctrl+Tab to move to the previous control.</paragraph>
+<paragraph role="paragraph" id="par_id3149416" xml-lang="en-US" l10n="U" oldref="126">If you use the keyboard only to travel through controls in your document, you will find one difference to the other types of controls: the Tab key does not move the cursor to the next control, but moves to the next column inside the table control. Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to move to the next control, or press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to move to the previous control.</paragraph>
<paragraph role="heading" id="hd_id3153062" xml-lang="en-US" level="3" l10n="U" oldref="128">To enter the special keyboard-only edit mode for Table Controls:</paragraph>
<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="U" oldref="129">The form document must be in <link href="text/shared/02/01170500.xhp" name="design mode">design mode</link>.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="130">Press Ctrl+F6 to select the document. </paragraph>
+<paragraph role="listitem" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="130">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to select the document.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3161657" xml-lang="en-US" l10n="CHG" oldref="131">Press Shift+F4 to select the first control. If the Table Control is not the first control, press Tab until it is selected.</paragraph>
@@ -88,7 +88,7 @@
<paragraph role="listitem" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="133">In the edit mode, you can open the edit mode context menu by pressing Shift+F10.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="134">If you want to edit columns, press Shift+Space to enter column edit mode. Now you can rearrange the order of columns with Ctrl+Arrow keys. The Delete key deletes the current column.</paragraph>
+<paragraph role="listitem" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="134">If you want to edit columns, press Shift+Space to enter column edit mode. Now you can rearrange the order of columns with <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow keys. The Delete key deletes the current column.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145419" xml-lang="en-US" l10n="U" oldref="135">Press the Escape key to exit the edit mode.</paragraph>
diff --git a/helpcontent2/source/text/shared/02/01170100.xhp b/helpcontent2/source/text/shared/02/01170100.xhp
index e28cdb9e08..8ce33995dc 100644
--- a/helpcontent2/source/text/shared/02/01170100.xhp
+++ b/helpcontent2/source/text/shared/02/01170100.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170100.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -74,7 +74,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="4">Alt+Down Arrow</paragraph>
+<paragraph role="tablecontent" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="4"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3150944" xml-lang="en-US" l10n="U" oldref="5">Opens the combo box</paragraph>
@@ -82,7 +82,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153627" xml-lang="en-US" l10n="U" oldref="6">Alt+Up Arrow</paragraph>
+<paragraph role="tablecontent" id="par_id3153627" xml-lang="en-US" l10n="U" oldref="6"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3153063" xml-lang="en-US" l10n="U" oldref="7">Closes the combo box</paragraph>
diff --git a/helpcontent2/source/text/shared/02/01170101.xhp b/helpcontent2/source/text/shared/02/01170101.xhp
index 589ae3a2b0..34d06943ec 100644
--- a/helpcontent2/source/text/shared/02/01170101.xhp
+++ b/helpcontent2/source/text/shared/02/01170101.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170101.xhp,v $
- * $Revision: 1.19 $
+ * $Revision: 1.19.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -629,7 +629,7 @@
<bookmark_value>names; multi-line titles</bookmark_value>
<bookmark_value>controls; multi-line titles</bookmark_value>
</bookmark>
-<paragraph role="paragraph" id="par_id3163820" xml-lang="en-US" l10n="U" oldref="223">To create a multi-line title, open the combo box using the arrow button. You can enter a line break by pressing Shift+Ctrl+Enter.</paragraph>
+<paragraph role="paragraph" id="par_id3163820" xml-lang="en-US" l10n="U" oldref="223">To create a multi-line title, open the combo box using the arrow button. You can enter a line break by pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
<paragraph role="note" id="par_id3159407" xml-lang="en-US" l10n="U" oldref="55">The <emph>Title</emph> property is only used for labeling a form element in the interface visible to the user. If you work with macros, note that at runtime, a control is always addressed through the <emph>Name</emph> property.</paragraph>
</section>
<section id="Section11">
diff --git a/helpcontent2/source/text/shared/02/01170102.xhp b/helpcontent2/source/text/shared/02/01170102.xhp
index d2a3995655..4343301582 100644
--- a/helpcontent2/source/text/shared/02/01170102.xhp
+++ b/helpcontent2/source/text/shared/02/01170102.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170102.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0201170102xml" indexer="include" status="PUBLISH">
+<topic id="textshared0201170102xml" indexer="include">
<title id="tit" xml-lang="en-US">Data</title>
<filename>/text/shared/02/01170102.xhp</filename>
</topic>
@@ -51,20 +49,24 @@
<bookmark_value>cells;linked to controls</bookmark_value>
<bookmark_value>links;between cells and controls</bookmark_value>
<bookmark_value>controls;assigning data sources</bookmark_value>
-</bookmark><comment>MW made "cells..." a two level entry, changed "linked cells;" to "links;" and "list contents" to "lists;"</comment><paragraph role="heading" id="hd_id3155413" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170102.xhp" name="Data">Data</link></paragraph>
+</bookmark><comment>MW made "cells..." a two level entry, changed "linked cells;" to "links;" and "list contents" to "lists;"</comment>
+<paragraph role="heading" id="hd_id3155413" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170102.xhp" name="Data">Data</link></paragraph>
<paragraph role="paragraph" id="par_id3155306" xml-lang="en-US" l10n="U" oldref="2">The<emph> Data </emph>tab page allows you to assign a data source to the selected control.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#controleigenschaftendaten"/>
+<embed href="text/shared/00/00040501.xhp#controleigenschaftendaten"/>
</section>
<paragraph role="note" id="par_id3148773" xml-lang="en-US" l10n="U" oldref="64">For forms with database links, the associated database is defined in the <link href="text/shared/02/01170200.xhp" name="Form Properties">Form Properties</link>. You will find the functions for this on the <link href="text/shared/02/01170203.xhp" name="Data"><emph>Data</emph></link> tab page.</paragraph>
<paragraph role="paragraph" id="par_id3149377" xml-lang="en-US" l10n="U" oldref="65">The possible settings of the <emph>Data</emph> tab page of a control depend on the respective control. You will only see the options that are available for the current control and context. The following fields are available:</paragraph>
-<sort order="asc"><section id="Section10">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_UNCHECKEDREFVALUE" id="bm_id7939695" localize="false"/><paragraph role="heading" id="par_idN108B4" xml-lang="en-US" level="2" l10n="NEW">Reference value (off)</paragraph>
+<sort order="asc">
+<section id="Section10">
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_UNCHECKEDREFVALUE" id="bm_id7939695" localize="false"/>
+<paragraph role="heading" id="par_idN108B4" xml-lang="en-US" level="2" l10n="NEW">Reference value (off)</paragraph>
<paragraph role="paragraph" id="par_idN108B8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Check boxes and radio buttons in spreadsheets can be bound to cells in the current document. If the control is enabled, the value you enter in Reference value (on) is copied to the cell. If the control is disabled, the value from Reference value (off) is copied to the cell.</ahelp></paragraph>
</section>
<section id="Section23">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_REFVALUE" id="bm_id3147327" localize="false"/><paragraph role="heading" id="hd_id3159121" xml-lang="en-US" level="2" l10n="CHG" oldref="71">Reference value (on)<comment>UFI: moved section from 01170101, changed name</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_REFVALUE" id="bm_id3147327" localize="false"/>
+<paragraph role="heading" id="hd_id3159121" xml-lang="en-US" level="2" l10n="CHG" oldref="71">Reference value (on)<comment>UFI: moved section from 01170101, changed name</comment></paragraph>
<paragraph role="paragraph" id="par_id3163812" xml-lang="en-US" l10n="U" oldref="141"><ahelp hid="HID_PROP_REFVALUE" visibility="hidden">You can enter a reference value for the web form, which will be remitted to a server when sending the form. With database forms, the value entered is written in the database field, assigned to the control field.</ahelp>You can assign a reference value to option buttons and check boxes. The reference value will be remitted to a server when sending the web form. With database forms the value entered here will be written in the database assigned to the control field.</paragraph>
<paragraph role="paragraph" id="par_id3150225" xml-lang="en-US" l10n="U" oldref="204">
<emph>Reference values for web forms</emph>
@@ -77,10 +79,11 @@
<paragraph role="paragraph" id="par_id3150654" xml-lang="en-US" l10n="U" oldref="207">For database forms, you can also characterize the status of an option or a check box by a reference value, storing it in the database. If you have a set of three options, for example "in progress", "completed", and "resubmission", with the respective reference values, "ToDo", "OK", and "RS", these reference values appear in the database if the respective option is clicked.</paragraph>
</section>
<section id="Section1">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_CONTROLSOURCE" id="bm_id3157976" localize="false"/><paragraph role="heading" id="hd_id3148455" xml-lang="en-US" level="2" l10n="U" oldref="5">Data field</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_CONTROLSOURCE" id="bm_id3157976" localize="false"/>
+<paragraph role="heading" id="hd_id3148455" xml-lang="en-US" level="2" l10n="U" oldref="5">Data field</paragraph>
<paragraph role="paragraph" id="par_id3155852" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_PROP_CONTROLSOURCE" visibility="hidden">Specifies the field of the data source table to which the control refers.</ahelp>With database forms, you can link controls with the data fields.</paragraph>
<paragraph role="paragraph" id="par_id3153224" xml-lang="en-US" l10n="U" oldref="75">You have several possibilities:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3159110" xml-lang="en-US" l10n="U" oldref="66">First case: There is only one table in the form.</paragraph>
<paragraph role="listitem" id="par_id3156356" xml-lang="en-US" l10n="U" oldref="67">Under <emph>Data field</emph>, specify the field of the data source table whose contents you want to be displayed.</paragraph>
@@ -90,7 +93,7 @@
<paragraph role="listitem" id="par_id3154273" xml-lang="en-US" l10n="U" oldref="77">Under <emph>Data field</emph>, specify the field of the SQL statement whose contents you want to be displayed.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3153949" xml-lang="en-US" l10n="U" oldref="78">Third case: <link href="text/shared/02/01170900.xhp" name="Combo Boxes">Combo Boxes</link></paragraph>
<paragraph role="listitem" id="par_id3147494" xml-lang="en-US" l10n="U" oldref="79">For combo boxes, the field of the data source table in which the values entered or selected by the user should be stored is specified under <emph>Data field</emph>. The values displayed in the list of the combo box are based on an SQL statement, which is entered under <emph>List content</emph>.</paragraph>
@@ -116,7 +119,8 @@
<paragraph role="paragraph" id="par_id3151186" xml-lang="en-US" l10n="U" oldref="57">If you work with reference values of a value list, the contents of the data field that you specified under <emph>Data Field</emph> in the form are not visible, but rather the assigned values. If you chose "Valuelist" on the <emph>Data</emph> tab under <emph>Type of list contents</emph> and assigned a reference value to the visible list entries in the form under <emph>List entries</emph> (entered in the <link href="text/shared/02/01170101.xhp" name="General"><emph>General</emph></link> tab), then the reference values are compared with the data content of the given data field. If a reference value corresponds to the content of a data field, the associated list entries are displayed in the form.</paragraph>
</section>
<section id="Section2">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_BOUNDCOLUMN" id="bm_id3150297" localize="false"/><paragraph role="heading" id="hd_id3154664" xml-lang="en-US" level="2" l10n="U" oldref="3">Bound field</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_BOUNDCOLUMN" id="bm_id3150297" localize="false"/>
+<paragraph role="heading" id="hd_id3154664" xml-lang="en-US" level="2" l10n="U" oldref="3">Bound field</paragraph>
<paragraph role="paragraph" id="par_id3148475" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="HID_PROP_BOUNDCOLUMN" visibility="hidden">Use an index to specify the table field or table SQL query to link to the field that is provided under <emph>Data field</emph>. Valid values for this property are 1, 2, 3, and so on.</ahelp><comment>UFI: issue #i32749#</comment></paragraph>
<paragraph role="note" id="par_idN10AD2" xml-lang="en-US" l10n="NEW">If you delete the contents of the <emph>Bound field</emph> cell in the property browser, the first field of the result set is used to display and to exchange data.<comment>UFI: issue #i32749#</comment></paragraph>
<paragraph role="paragraph" id="par_id3154588" xml-lang="en-US" l10n="U" oldref="72">This property for list boxes defines which data field of a linked table is displayed in the form.</paragraph>
@@ -125,74 +129,78 @@
<paragraph role="paragraph" id="par_id3150365" xml-lang="en-US" l10n="U" oldref="39">If you selected "SQL" under <emph>Type of list contents</emph>, the SQL command determines the index to be specified. Example: If you specify an SQL command such as "SELECT Field1, Field2 FROM tablename" under <emph>List content</emph>, refer to the following table:</paragraph>
<table id="tbl_id3151070">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154716" xml-lang="en-US" l10n="U" oldref="40">Bound field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150666" xml-lang="en-US" l10n="U" oldref="41">Link</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154206" xml-lang="en-US" l10n="CHG" oldref="42">{empty}<comment>FS told me this</comment></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145257" xml-lang="en-US" l10n="U" oldref="43">The database field "Field1" is linked to the field specified under <emph>Data field</emph>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3150887" xml-lang="en-US" l10n="U" oldref="44">1</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156064" xml-lang="en-US" l10n="U" oldref="45">The database field "Field2" is linked to the field specified under <emph>Data field</emph>.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3154134" xml-lang="en-US" l10n="U" oldref="46">If you selected "Table" under <emph>Type of list contents</emph>, the table structure defines the index to be specified. Example: If a database table is selected under <emph>List content</emph>, refer to the following table:</paragraph>
<table id="tbl_id3150426">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155379" xml-lang="en-US" l10n="U" oldref="47">Bound field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155529" xml-lang="en-US" l10n="U" oldref="48">Link</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155373" xml-lang="en-US" l10n="CHG" oldref="49">{empty}<comment>FS told me this</comment></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154260" xml-lang="en-US" l10n="U" oldref="50">The 1st column of the table is linked to the field specified under <emph>Data field</emph>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3156448" xml-lang="en-US" l10n="U" oldref="51">1</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154486" xml-lang="en-US" l10n="U" oldref="52">The 2nd column of the table is linked to the field specified under <emph>Data field</emph>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3149949" xml-lang="en-US" l10n="U" oldref="53">2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146767" xml-lang="en-US" l10n="U" oldref="54">The 3rd column of the table is linked to the field specified under <emph>Data field</emph>.</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="Section3">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LISTSOURCETYPE" id="bm_id3153316" localize="false"/><paragraph role="heading" id="hd_id3149772" xml-lang="en-US" level="2" l10n="U" oldref="9">Type of list contents</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LISTSOURCETYPE" id="bm_id3153316" localize="false"/>
+<paragraph role="heading" id="hd_id3149772" xml-lang="en-US" level="2" l10n="U" oldref="9">Type of list contents</paragraph>
<paragraph role="paragraph" id="par_id3154419" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_PROP_LISTSOURCETYPE" visibility="hidden">Determines the data to fill the lists in list and combo boxes.</ahelp>Determines the data to fill the lists in list and combo boxes.</paragraph>
<paragraph role="paragraph" id="par_id3153326" xml-lang="en-US" l10n="U" oldref="13">With the "Valuelist" option, all entries entered in the <emph>List entries</emph> field of the <link href="text/shared/02/01170101.xhp" name="General"><emph>General</emph></link> tab appear in the control. For database forms, you can use reference values (see the <link href="text/shared/02/01170102.xhp" name=" References Using Value Lists"><emph>References Using Value Lists</emph></link> section).</paragraph>
<paragraph role="paragraph" id="par_id3153067" xml-lang="en-US" l10n="U" oldref="14">If the content of the control is read from a database, you can determine the type of the data source with the other options. For example, you can choose between tables and queries.</paragraph>
</section>
<section id="Section4">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LISTSOURCE" id="bm_id3148839" localize="false"/><paragraph role="heading" id="hd_id3153820" xml-lang="en-US" level="2" l10n="U" oldref="7">List content</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LISTSOURCE" id="bm_id3148839" localize="false"/>
+<paragraph role="heading" id="hd_id3153820" xml-lang="en-US" level="2" l10n="U" oldref="7">List content</paragraph>
<paragraph role="paragraph" id="par_id3159171" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_PROP_LISTSOURCE">With database forms, specifies the data source for the list content of the form-element. This field can be used to define a value list for documents without a database connection.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3168456" xml-lang="en-US" l10n="U" oldref="15">In the case of database forms, the data source determines the entries of the list or combo box. Depending on the selected type, you have a choice between different data sources under <emph>List content</emph>, provided that these objects exist in your database. All available database objects of the type selected under <emph>Type of list contents</emph> are offered here. If you have selected the "Value List" option as the type, you can use references for database forms. If the display of the control is controlled by an SQL command, the SQL statement is entered here.</paragraph>
<paragraph role="paragraph" id="par_id3155870" xml-lang="en-US" l10n="U" oldref="81">Examples of SQL statements:</paragraph>
@@ -211,338 +219,348 @@
<paragraph role="paragraph" id="par_id3156309" xml-lang="en-US" l10n="U" oldref="19">The following table shows the connections between HTML, JavaScript, and the $[officename] field <emph>List content</emph> using an example list box named "ListBox1". In this case, "Item" designates a list entry visible in the form:</paragraph>
<table id="tbl_id3145656">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159204" xml-lang="en-US" l10n="U" oldref="20">
<emph>HTML Tag</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152539" xml-lang="en-US" l10n="U" oldref="21">
<emph>JavaScript</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3158404" xml-lang="en-US" l10n="U" oldref="22">
<emph>Entry in value list of the control (List content)</emph>
</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151198" xml-lang="en-US" l10n="U" oldref="23">
<emph>Transmitted data</emph>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154668" xml-lang="en-US" l10n="U" oldref="24">&lt;OPTION&gt;Item</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154269" xml-lang="en-US" l10n="U" oldref="25">Not possible</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153109" xml-lang="en-US" l10n="U" oldref="26">""</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154596" xml-lang="en-US" l10n="U" oldref="27">the visible list entry ("ListBox1=Item")</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3146892" xml-lang="en-US" l10n="U" oldref="28">&lt;OPTION VALUE="Value"&gt;Item</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154604" xml-lang="en-US" l10n="U" oldref="29">ListBox1.options[0].value="Value"</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3153689" xml-lang="en-US" l10n="U" oldref="30">"Value"</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159226" xml-lang="en-US" l10n="U" oldref="31">The value assigned to the list entry ("ListBox1=Value")</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155944" xml-lang="en-US" l10n="U" oldref="32">&lt;OPTION VALUE=""&gt;Item</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3155147" xml-lang="en-US" l10n="U" oldref="33">ListBox1.options[0].value=""</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="code" id="par_id3154763" xml-lang="en-US" l10n="U" oldref="34">"$$$empty$$$"</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151012" xml-lang="en-US" l10n="U" oldref="35">An empty string ("ListBox1=")</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="Section5">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_EMPTY_IS_NULL" id="bm_id3150628" localize="false"/><paragraph role="heading" id="hd_id3148901" xml-lang="en-US" level="2" l10n="U" oldref="11">Empty string is NULL</paragraph>
-<paragraph role="paragraph" id="par_id3145357" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_PROP_EMPTY_IS_NULL">Defines how an empty string input should be handled.</ahelp> If this property is set (Yes), a string with only one or more spaces will be interpreted as a NULL value and stored in the database. If this property is not set (No), the string will be treated as an empty value.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_EMPTY_IS_NULL" id="bm_id3150628" localize="false"/>
+<paragraph role="heading" id="hd_id3148901" xml-lang="en-US" level="2" l10n="U" oldref="11">Empty string is NULL</paragraph>
+<paragraph role="paragraph" id="par_id3145357" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="HID_PROP_EMPTY_IS_NULL">Defines how an empty string input should be handled. If set to Yes, an input string of length zero will be treated as a value NULL. If set to No, any input will be treated as-is without any conversion.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id0820200812403467" xml-lang="en-US" l10n="NEW">An empty string is a string of length zero (""). Normally, a value NULL is not the same as an empty string. In general, a term NULL is used to denote an undefined value, an unknown value, or "no value has been entered yet."</paragraph>
+<paragraph role="paragraph" id="par_id0820200812403455" xml-lang="en-US" l10n="NEW">Database systems vary and they might handle a value NULL differently. Refer to documentations of the database that you are using.</paragraph>
</section>
<section id="Section6">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_FILTERPROPOSAL" id="bm_id3149393" localize="false"/><paragraph role="heading" id="hd_id3161653" xml-lang="en-US" level="2" l10n="U" oldref="88">Filter proposal</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_FILTERPROPOSAL" id="bm_id3149393" localize="false"/>
+<paragraph role="heading" id="hd_id3161653" xml-lang="en-US" level="2" l10n="U" oldref="88">Filter proposal</paragraph>
<paragraph role="paragraph" id="par_id3151221" xml-lang="en-US" l10n="U" oldref="89"><variable id="filtervorschlag"><ahelp hid="HID_PROP_FILTERPROPOSAL">While designing your form, you can set the "Filter proposal" property for each text box in the <emph>Data</emph> tab of the corresponding <emph>Properties</emph> dialog. In subsequent searches in the filter mode, you can select from all information contained in these fields.</ahelp> The field content can then be selected using the AutoComplete function. Note, however, that this function requires a greater amount of memory space and time, especially when used in large databases and should therefore be used sparingly.
</variable></paragraph>
</section>
<section id="Section9">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_BOUND_CELL" id="bm_id4214300" localize="false"/><paragraph role="heading" id="par_idN10EE3" xml-lang="en-US" level="2" l10n="NEW">Linked cell</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_BOUND_CELL" id="bm_id4214300" localize="false"/>
+<paragraph role="heading" id="par_idN10EE3" xml-lang="en-US" level="2" l10n="NEW">Linked cell</paragraph>
<paragraph role="paragraph" id="par_idN10EE7" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_PROP_BOUND_CELL">Specifies the reference to a linked cell on a spreadsheet. The live state or contents of the control are linked to the cell contents.</ahelp> The following tables list the controls and their corresponding link type:</paragraph>
<paragraph role="heading" id="par_idN10EF7" xml-lang="en-US" level="3" l10n="NEW">Check box with linked cell</paragraph>
<table id="tbl_id4947965">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10F04" xml-lang="en-US" l10n="NEW">Action</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10F0A" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F11" xml-lang="en-US" l10n="NEW">Select the check box</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F17" xml-lang="en-US" l10n="NEW">TRUE is entered into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F1E" xml-lang="en-US" l10n="NEW">Deselect the check box</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F24" xml-lang="en-US" l10n="NEW">FALSE is entered into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F2B" xml-lang="en-US" l10n="NEW">Tri-state check box is set to "undetermined" state</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F31" xml-lang="en-US" l10n="NEW">#NV is entered into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F38" xml-lang="en-US" l10n="NEW">Enter a number or a formula that returns a number in the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F3E" xml-lang="en-US" l10n="NEW">If entered value is TRUE or not 0: Check box is selected<br/>If entered value is FALSE or 0: Check box is deselected</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F47" xml-lang="en-US" l10n="NEW">Clear the linked cell, or enter text, or enter a formula that returns text or an error</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F4D" xml-lang="en-US" l10n="NEW">Check box is set to "undetermined" state if it is a tri-state check box, else check box is deselected.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11023" xml-lang="en-US" l10n="NEW">Select the box. The Reference value box contains text.<comment>UFI: sc.features "eforms2 option buttons check boxes now also exchanging text"</comment></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1103A" xml-lang="en-US" l10n="NEW">The text from the Reference value box is copied to the cell.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11040" xml-lang="en-US" l10n="NEW">Deselect the box. The Reference value box contains text.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11008" xml-lang="en-US" l10n="NEW">An empty string is copied to the cell.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1104B" xml-lang="en-US" l10n="NEW">The Reference value box contains text. Enter the same text into the cell.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11050" xml-lang="en-US" l10n="NEW">The check box is selected.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11056" xml-lang="en-US" l10n="NEW">The Reference value box contains text. Enter another text into the cell.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1105B" xml-lang="en-US" l10n="NEW">The check box is deselected.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="par_idN10F58" xml-lang="en-US" level="3" l10n="NEW">Option button (radio button) with linked cell</paragraph>
<table id="tbl_id9255348">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10F65" xml-lang="en-US" l10n="NEW">Action</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10F6B" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F72" xml-lang="en-US" l10n="NEW">Select the option button</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F78" xml-lang="en-US" l10n="NEW">TRUE is entered into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F7F" xml-lang="en-US" l10n="NEW">Option button is deselected by selecting another option button</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F85" xml-lang="en-US" l10n="NEW">FALSE is entered into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F8C" xml-lang="en-US" l10n="NEW">Enter a number or a formula that returns a number in the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F92" xml-lang="en-US" l10n="NEW">If entered value is TRUE or not 0: Option button is selected<br/>If entered value is FALSE or 0: Option button is deselected</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F9B" xml-lang="en-US" l10n="NEW">Clear the linked cell, or enter text, or enter a formula that returns text or an error</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FA1" xml-lang="en-US" l10n="NEW">Option button is deselected</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110EF" xml-lang="en-US" l10n="NEW">Click the option button. The Reference value box contains text.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110F4" xml-lang="en-US" l10n="NEW">The text from the Reference value box is copied to the cell.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110FA" xml-lang="en-US" l10n="NEW">Click another option button of the same group. The Reference value box contains text.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110EA" xml-lang="en-US" l10n="NEW">An empty string is copied to the cell.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11105" xml-lang="en-US" l10n="NEW">The Reference value box contains text. Enter the same text into the cell.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1110A" xml-lang="en-US" l10n="NEW">The option button is selected.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11110" xml-lang="en-US" l10n="NEW">The Reference value box contains text. Enter another text into the cell.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11115" xml-lang="en-US" l10n="NEW">The option button is cleared.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="par_idN10FAC" xml-lang="en-US" level="3" l10n="NEW">Text box with linked cell</paragraph>
<table id="tbl_id6909695">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10FB9" xml-lang="en-US" l10n="NEW">Action</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10FBF" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FC6" xml-lang="en-US" l10n="NEW">Enter text into the text box</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FCC" xml-lang="en-US" l10n="NEW">Text is copied into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FD3" xml-lang="en-US" l10n="NEW">Clear the text box</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FD9" xml-lang="en-US" l10n="NEW">Linked cell is cleared</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FE0" xml-lang="en-US" l10n="NEW">Enter text or a number in the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FE6" xml-lang="en-US" l10n="NEW">Text or number is copied into the text box</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FED" xml-lang="en-US" l10n="NEW">Enter a formula into the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FF3" xml-lang="en-US" l10n="NEW">Formula result is copied into the text box</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10FFA" xml-lang="en-US" l10n="NEW">Clear the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11000" xml-lang="en-US" l10n="NEW">Text box is cleared</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="par_idN1100B" xml-lang="en-US" level="3" l10n="NEW">Numerical field and formatted field with linked cell</paragraph>
<table id="tbl_id2086550">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN11018" xml-lang="en-US" l10n="NEW">Action</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN1101E" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11025" xml-lang="en-US" l10n="NEW">Enter a number into the field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1102B" xml-lang="en-US" l10n="NEW">Number is copied into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11032" xml-lang="en-US" l10n="NEW">Clear the field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11038" xml-lang="en-US" l10n="NEW">Value 0 is set in the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1103F" xml-lang="en-US" l10n="NEW">Enter a number or a formula that returns a number in the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11045" xml-lang="en-US" l10n="NEW">Number is copied into the field</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1104C" xml-lang="en-US" l10n="NEW">Clear the linked cell, or enter text, or enter a formula that returns text or an error</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11052" xml-lang="en-US" l10n="NEW">Value 0 is set in the field</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="par_idN1105D" xml-lang="en-US" level="3" l10n="NEW">List box with linked cell</paragraph>
<paragraph role="paragraph" id="par_idN11060" xml-lang="en-US" l10n="NEW">List boxes support two different linking modes, see the property "Contents of the linked cell".</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN11066" xml-lang="en-US" l10n="NEW">Linked contents: Synchronize the text contents of the selected list box entry with the cell contents.</paragraph>
</listitem>
@@ -552,137 +570,140 @@
</list>
<table id="tbl_id5350505">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN11077" xml-lang="en-US" l10n="NEW">Action</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN1107D" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11084" xml-lang="en-US" l10n="NEW">Select a single list item</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1108A" xml-lang="en-US" l10n="NEW">Contents are linked: Text of the item is copied into the linked cell.</paragraph>
<paragraph role="tablecontent" id="par_idN1108D" xml-lang="en-US" l10n="NEW">Selection is linked: Position of the selected item is copied into the linked cell. For example, if the third item is selected, the number 3 will be copied.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11094" xml-lang="en-US" l10n="NEW">Select several list items</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1109A" xml-lang="en-US" l10n="NEW">#NV is entered into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110A1" xml-lang="en-US" l10n="NEW">Deselect all list items</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110A7" xml-lang="en-US" l10n="NEW">Contents are linked: Linked cell is cleared</paragraph>
<paragraph role="tablecontent" id="par_idN110AA" xml-lang="en-US" l10n="NEW">Selection is linked: Value 0 is entered in the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110B1" xml-lang="en-US" l10n="NEW">Enter text or a number into the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110B7" xml-lang="en-US" l10n="NEW">Contents are linked: Find and select an equal list item</paragraph>
<paragraph role="tablecontent" id="par_idN110BA" xml-lang="en-US" l10n="NEW">Selection is linked: The list item at the specified position (starting with 1 for the first item) is selected. If not found, all items are deselected.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110C1" xml-lang="en-US" l10n="NEW">Enter a formula into the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110C7" xml-lang="en-US" l10n="NEW">Find and select a list item that matches the formula result and link mode</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110CE" xml-lang="en-US" l10n="NEW">Clear the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110D4" xml-lang="en-US" l10n="NEW">Deselect all items in the list box</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110DB" xml-lang="en-US" l10n="NEW">Change the contents of the list source range</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN110E1" xml-lang="en-US" l10n="NEW">List box items are updated according to the change. The selection is preserved. This may cause an update to the linked cell.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="par_idN110EC" xml-lang="en-US" level="3" l10n="NEW">Combo box with linked cell</paragraph>
<table id="tbl_id3521225">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN110F9" xml-lang="en-US" l10n="NEW">Action</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN110FF" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11106" xml-lang="en-US" l10n="NEW">Enter text into the edit field of the combo box, or select an entry from the drop-down list</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1110C" xml-lang="en-US" l10n="NEW">Text is copied into the linked cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11113" xml-lang="en-US" l10n="NEW">Clear the edit field of the combo box</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11119" xml-lang="en-US" l10n="NEW">Linked cell is cleared</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11120" xml-lang="en-US" l10n="NEW">Enter text or a number into the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11126" xml-lang="en-US" l10n="NEW">Text or number is copied into the edit field of the combo box</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1112D" xml-lang="en-US" l10n="NEW">Enter a formula into the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11133" xml-lang="en-US" l10n="NEW">Formula result is copied into the edit field of the combo box</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1113A" xml-lang="en-US" l10n="NEW">Clear the linked cell</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11140" xml-lang="en-US" l10n="NEW">Edit field of the combo box is cleared</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN11147" xml-lang="en-US" l10n="NEW">Change the contents of the list source range</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1114D" xml-lang="en-US" l10n="NEW">Drop-down list items are updated according to the change. The edit field of the combo box and the linked cell are not changed.</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="Section8">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_CELL_EXCHANGE_TYPE" id="bm_id5563219" localize="false"/><paragraph role="heading" id="par_idN11163" xml-lang="en-US" level="2" l10n="NEW">Contents of the linked cell</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_CELL_EXCHANGE_TYPE" id="bm_id5563219" localize="false"/>
+<paragraph role="heading" id="par_idN11163" xml-lang="en-US" level="2" l10n="NEW">Contents of the linked cell</paragraph>
<paragraph role="paragraph" id="par_idN11167" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_PROP_CELL_EXCHANGE_TYPE">Select the mode of linking a list box with a linked cell on a spreadsheet.</ahelp></paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN11179" xml-lang="en-US" l10n="NEW">Linked contents: Synchronize the text contents of the selected list box entry with the cell contents. Select "The selected entry"</paragraph>
</listitem>
@@ -692,8 +713,10 @@
</list>
</section>
<section id="Section7">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_LIST_CELL_RANGE" id="bm_id9886165" localize="false"/><paragraph role="heading" id="par_idN1118B" xml-lang="en-US" level="2" l10n="NEW">Source cell range<comment>UFI: in the spec, this is "Source range of the list". Named it as seen in 680m38</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_LIST_CELL_RANGE" id="bm_id9886165" localize="false"/>
+<paragraph role="heading" id="par_idN1118B" xml-lang="en-US" level="2" l10n="NEW">Source cell range<comment>UFI: in the spec, this is "Source range of the list". Named it as seen in 680m38</comment></paragraph>
<paragraph role="paragraph" id="par_idN111A1" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_PROP_LIST_CELL_RANGE">Enter a cell range that contains the entries for a list box or combo box on a spreadsheet.</ahelp> If you enter a multi-column range, only the contents of the leftmost column are used to fill the control.</paragraph>
</section>
-</sort></body>
+</sort>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01170600.xhp b/helpcontent2/source/text/shared/02/01170600.xhp
index c30e49deaa..1ac56f776a 100644
--- a/helpcontent2/source/text/shared/02/01170600.xhp
+++ b/helpcontent2/source/text/shared/02/01170600.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170600.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -60,7 +60,7 @@
<embed href="text/shared/00/00040501.xhp#formex"/>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_FORM_NAVIGATOR" id="bm_id3153748" localize="false"/><paragraph role="paragraph" id="par_id3155552" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_FORM_NAVIGATOR">The <emph>Form Navigator</emph> contains a list of all created (logical) forms with the corresponding control fields.</ahelp> You can see whether a form contains control fields by the plus sign displayed before the entry. Click the plus sign to open the list of the form elements.</paragraph>
-<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="4">You can change how the different controls are arranged by dragging and dropping them in the <emph>Form Navigator</emph>. Select one or more controls and drag them into another form. Alternatively use Ctrl+X or the context menu command <emph>Cut</emph> to move a control to the clipboard and Ctrl+V or the command <emph>Insert</emph> to insert the control into another position.</paragraph>
+<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="4">You can change how the different controls are arranged by dragging and dropping them in the <emph>Form Navigator</emph>. Select one or more controls and drag them into another form. Alternatively use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+X or the context menu command <emph>Cut</emph> to move a control to the clipboard and <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V or the command <emph>Insert</emph> to insert the control into another position.</paragraph>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="22">To edit the name in the <emph>Form Navigator</emph>, click on the name and enter a new name, or use the command in the context menu.</paragraph>
<paragraph role="paragraph" id="par_id3156347" xml-lang="en-US" l10n="U" oldref="5">If you select a control in the <emph>Form Navigator</emph>, the corresponding element is selected in the document.</paragraph>
<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="6">If you call the context menu of a selected entry, the <emph>Form Navigator</emph> offers the following functions:</paragraph>
@@ -70,11 +70,8 @@
<paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SID_FM_NEW_FORM">Creates a new form in the document. </ahelp> To create a <link href="text/shared/02/01170203.xhp" name="subform">subform</link>, add the new form under the desired parent form.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_FM_NEW_HIDDEN" id="bm_id3147618" localize="false"/><paragraph role="heading" id="hd_id3155342" xml-lang="en-US" level="3" l10n="CHG" oldref="11">Hidden Control</paragraph>
<paragraph role="paragraph" id="par_id3158430" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SID_FM_NEW_HIDDEN">Creates a hidden control in the selected form that is not displayed on the screen. A hidden control serves to include data that is transmitted together with the form.</ahelp> It contains additional information or clarifying text that you can specify when creating the form through the <link href="text/shared/02/01170101.xhp" name="Special Properties">Special Properties</link> of the control. Select the entry of the hidden control in the <emph>Form Navigator</emph> and select the <emph>Properties</emph> command.</paragraph>
-<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="19">You can copy controls in the document through the clipboard (shortcut keys <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C for copying and <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V for inserting). You can copy hidden controls in the <emph>Form Navigator</emph> by using drag-and-drop while keeping the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key pressed.</paragraph>
-<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="U" oldref="20">Drag and drop to copy controls within the same document or between documents. Open another form document and drag the hidden control from the <emph>Form Navigator</emph> into the <emph>Form Navigator</emph> of the target document. Click a visible control directly in the document, rest the mouse for a moment so that a copy of the control is added to the drag-and-drop clipboard, then drag the copy into the other document. If you want a copy in the same document, press Ctrl while dragging.</paragraph>
+<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="19">You can copy controls in the document through the clipboard (shortcut keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C for copying and <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V for inserting). You can copy hidden controls in the <emph>Form Navigator</emph> by using drag-and-drop while keeping the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key pressed.</paragraph>
+<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="U" oldref="20">Drag and drop to copy controls within the same document or between documents. Open another form document and drag the hidden control from the <emph>Form Navigator</emph> into the <emph>Form Navigator</emph> of the target document. Click a visible control directly in the document, rest the mouse for a moment so that a copy of the control is added to the drag-and-drop clipboard, then drag the copy into the other document. If you want a copy in the same document, press <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>while dragging.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_FM_DELETE" id="bm_id3154073" localize="false"/><paragraph role="heading" id="hd_id3152812" xml-lang="en-US" level="2" l10n="U" oldref="13">Delete</paragraph>
<paragraph role="paragraph" id="par_id3154938" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SID_FM_DELETE">Deletes the selected entry.</ahelp> This allows you to delete individual form components as well as whole forms with one mouse click.</paragraph>
<paragraph role="heading" id="hd_id3153799" xml-lang="en-US" level="2" l10n="U" oldref="15">Tab order</paragraph>
diff --git a/helpcontent2/source/text/shared/02/01170802.xhp b/helpcontent2/source/text/shared/02/01170802.xhp
index 2ad2f23dbe..f39cf41664 100755
--- a/helpcontent2/source/text/shared/02/01170802.xhp
+++ b/helpcontent2/source/text/shared/02/01170802.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170802.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0201170802xml" indexer="include" status="PUBLISH">
+<topic id="textshared0201170802xml" indexer="include">
<title id="tit" xml-lang="en-US">Table Element Wizard: Field Selection</title>
<filename>/text/shared/02/01170802.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-05-03T12:09:29">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="seite2">
@@ -48,13 +46,13 @@
<paragraph role="paragraph" id="par_id3150476" xml-lang="en-US" l10n="U" oldref="10">Specifies which fields in the table control field should be displayed.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#aupitab2"/>
+<embed href="text/shared/00/00040501.xhp#aupitab2"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_EXISTING_FIELDS" id="bm_id3149283" localize="false"/><embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
-<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_FIELDRIGHT" id="bm_id3159201" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
-<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSRIGHT" id="bm_id3150178" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
-<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_FIELDLEFT" id="bm_id3147043" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernen"/>
-<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSLEFT" id="bm_id3156136" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
+<embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernen"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_SELECTED_FIELDS" id="bm_id3157958" localize="false"/>
<paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="2" l10n="U" oldref="11">Selected Fields</paragraph>
<paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_SELECTED_FIELDS">Displays the data fields that are accepted into the form field.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/02/01170900.xhp b/helpcontent2/source/text/shared/02/01170900.xhp
index 52ad6b4c01..7affd3f45b 100644
--- a/helpcontent2/source/text/shared/02/01170900.xhp
+++ b/helpcontent2/source/text/shared/02/01170900.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170900.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0201170900xml" indexer="include" status="PUBLISH">
+<topic id="textshared0201170900xml" indexer="include">
<title id="tit" xml-lang="en-US">Combo Box/List Box Wizard</title>
<filename>/text/shared/02/01170900.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-13T11:14:23">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3159233"><bookmark_value>forms; Combo Box/List Box Wizard</bookmark_value>
@@ -50,7 +46,7 @@
<paragraph role="heading" id="hd_id3154094" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01170900.xhp" name="Combo Box/List Box Wizard">Combo Box/List Box Wizard</link></paragraph>
<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="2">If you insert a combo box or a list box in a document, a wizard starts automatically. This wizard allows you to interactively specify which information is shown.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00040501.xhp#aupikomli"/>
+<embed href="text/shared/00/00040501.xhp#aupikomli"/>
</section>
<paragraph role="note" id="par_id3145211" xml-lang="en-US" l10n="CHG" oldref="21">You can use the <link href="text/shared/02/01171100.xhp" name="Wizards On/Off"><emph>Wizards On/Off</emph></link> icon to keep the wizard from starting automatically.</paragraph>
<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="22">The wizards for combo boxes and list boxes differ from each other in their final step. This is because the nature of control fields:</paragraph>
@@ -72,8 +68,8 @@
<embed href="text/shared/02/01170902.xhp#seite2"/>
<embed href="text/shared/02/01170903.xhp#seite3a"/>
<embed href="text/shared/02/01170904.xhp#seite3b"/>
-<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_CANCEL" id="bm_id3145416" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_PREVIOUS" id="bm_id3156155" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_NEXT" id="bm_id3155135" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01230000.xhp b/helpcontent2/source/text/shared/02/01230000.xhp
index 95113cd691..e063651fbd 100644
--- a/helpcontent2/source/text/shared/02/01230000.xhp
+++ b/helpcontent2/source/text/shared/02/01230000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01230000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -59,7 +59,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="E">
-<image id="img_id3149999" src="res/sc05539.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149999" xml-lang="en-US">Icon</alt>
+<image id="img_id3149999" src="res/commandimagelist/sc_designerdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149999" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/02/02130000.xhp b/helpcontent2/source/text/shared/02/02130000.xhp
index 478015a736..9bd966ebbb 100644
--- a/helpcontent2/source/text/shared/02/02130000.xhp
+++ b/helpcontent2/source/text/shared/02/02130000.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02130000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -65,7 +65,7 @@
</tablerow>
</table>
</section>
-<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="6"><switchinline select="appl"><caseinline select="WRITER">If you click the<emph> Decrease Indent</emph> icon while holding down the Ctrl key, the indent for the selected paragraph is moved by the default tab stop that has been set under <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General"><emph>Tools - Options - %PRODUCTNAME Writer - General</emph></link>.
+<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="6"><switchinline select="appl"><caseinline select="WRITER">If you click the <emph>Decrease Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key, the indent for the selected paragraph is moved by the default tab stop that has been set under <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General"><emph>Tools - Options - %PRODUCTNAME Writer - General</emph></link>.
</caseinline></switchinline></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/02140000.xhp b/helpcontent2/source/text/shared/02/02140000.xhp
index a1f2a678d3..18f60c0ecb 100644
--- a/helpcontent2/source/text/shared/02/02140000.xhp
+++ b/helpcontent2/source/text/shared/02/02140000.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02140000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -69,7 +69,7 @@
</tablerow>
</table>
</section>
-<paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="CHG" oldref="5"><switchinline select="appl"><caseinline select="WRITER">Click the <emph>Increase Indent</emph> icon while holding down the Ctrl key to move the indenting of the selected paragraph by the default tab distance set under <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General"><emph>Tools - Options - %PRODUCTNAME Writer - General</emph></link>.
+<paragraph role="paragraph" id="par_id3152996" xml-lang="en-US" l10n="CHG" oldref="5"><switchinline select="appl"><caseinline select="WRITER">Click the <emph>Increase Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key to move the indenting of the selected paragraph by the default tab distance set under <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General"><emph>Tools - Options - %PRODUCTNAME Writer - General</emph></link>.
</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3157910" xml-lang="en-US" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="WRITER">Example:
</caseinline></switchinline></paragraph>
@@ -85,8 +85,7 @@
<paragraph role="paragraph" id="par_id3148492" xml-lang="en-US" l10n="U" oldref="9">Indent increased</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="10">Indent increased by the amount with the <switchinline select="sys"><caseinline select="MAC">Command key
-</caseinline><defaultinline>Ctrl key</defaultinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="10">Indent increased by the amount with the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key</defaultinline></switchinline></paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/shared/02/03200000.xhp b/helpcontent2/source/text/shared/02/03200000.xhp
index a0b8b2668e..5c87ff4b70 100644
--- a/helpcontent2/source/text/shared/02/03200000.xhp
+++ b/helpcontent2/source/text/shared/02/03200000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 03200000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,22 +32,20 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0203200000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0203200000xml" indexer="include">
<title id="tit" xml-lang="en-US">Change Anchor</title>
<filename>/text/shared/02/03200000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-24T11:31:09">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="verankerung">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153323"><bookmark_value>anchors; changing</bookmark_value>
-</bookmark><comment>UFI: removed help ids</comment>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/SID_ANCHOR_TOGGLE" id="bm_id571270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ToggleAnchorType" id="bm_id3147399" localize="false"/>
<paragraph role="heading" id="hd_id3153323" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/03200000.xhp" name="Change Anchor">Change Anchor</link></paragraph>
</section>
<paragraph role="paragraph" id="par_id3150499" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="verankerungtext"><ahelp hid=".uno:ToggleAnchorType">Allows you to switch between anchoring options.</ahelp>
diff --git a/helpcontent2/source/text/shared/02/04210000.xhp b/helpcontent2/source/text/shared/02/04210000.xhp
new file mode 100644
index 0000000000..00ea6c78bc
--- /dev/null
+++ b/helpcontent2/source/text/shared/02/04210000.xhp
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 04210000.xhp,v $
+ * $Revision: 1.1.2.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textshared0204210000xhp" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">Optimize</title>
+<filename>/text/shared/02/04210000.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="optimieren">
+<bookmark xml-lang="en-US" branch="hid/FN_OPTIMIZE_TABLE" id="bm_id6810577" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:OptimizeTable" id="bm_id3149292" localize="false"/>
+<paragraph role="heading" id="hd_id3151185" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/04210000.xhp" name="Optimize">Optimize</link></paragraph>
+<paragraph role="paragraph" id="par_id3145412" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:OptimizeTable">Opens a toolbar that contains functions for optimizing the rows and columns in a table.</ahelp></paragraph>
+</section>
+<section id="syoptimieren">
+<table id="tbl_id3145760">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3155899" xml-lang="en-US" l10n="E">
+<image id="img_id3149684" src="res/commandimagelist/sc_optimizetable.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149684" xml-lang="en-US">Icon</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="4">Optimize</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+<paragraph role="paragraph" id="par_id3149485" xml-lang="en-US" l10n="U" oldref="5">You can select from the following functions:</paragraph>
+<embed href="text/shared/01/05120600.xhp#gleichverteilen"/>
+<embed href="text/shared/01/05120600.xhp#syverteilentext"/>
+<embed href="text/shared/01/05110600m.xhp#gleichverteilen"/>
+<embed href="text/shared/01/05110600m.xhp#syverteilenzeile"/>
+<switch select="appl">
+<case select="WRITER">
+<paragraph role="heading" id="hd_id3153631" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/swriter/01/05110200.xhp" name="Optimal Height">Optimal Height</link></paragraph>
+<embed href="text/swriter/01/05110200.xhp#zeilenhoehetext"/>
+<embed href="text/swriter/00/00000405.xhp#syoptimalzeile"/>
+<paragraph role="heading" id="hd_id3145772" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/swriter/01/05120200.xhp" name="Optimal Column Width">Optimal Column Width</link></paragraph>
+<embed href="text/swriter/01/05120200.xhp#spaltenbreitetext"/>
+<embed href="text/swriter/00/00000405.xhp#syoptimalspalte"/>
+</case>
+</switch>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/06100000.xhp b/helpcontent2/source/text/shared/02/06100000.xhp
index 96b7f192ff..e1331c755b 100644
--- a/helpcontent2/source/text/shared/02/06100000.xhp
+++ b/helpcontent2/source/text/shared/02/06100000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06100000.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,8 +54,7 @@
<paragraph role="paragraph" id="par_id3149283" xml-lang="en-US" l10n="CHG" oldref="5">If you have numbered paragraphs and click the<emph> Move Up </emph>icon, the numbers will be adjusted to the current order. <switchinline select="appl"><caseinline select="WRITER">The <emph>Move Up </emph>icon is only visible when the cursor is positioned in a bulleted or numbered list.
</caseinline></switchinline><switchinline select="appl"><caseinline select="IMPRESS">The <emph>Move Up </emph>icon appears on the <emph>Text Formatting</emph> Bar when you use the outline view.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="4">This function can be called by pressing <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Up Arrow.</paragraph>
+<paragraph role="paragraph" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="4">This function can be called by pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Up Arrow.</paragraph>
<section id="syhochschieben">
<table id="tbl_id3155535">
<tablerow>
diff --git a/helpcontent2/source/text/shared/02/06110000.xhp b/helpcontent2/source/text/shared/02/06110000.xhp
index 0569ab9028..d4bb49c6b2 100644
--- a/helpcontent2/source/text/shared/02/06110000.xhp
+++ b/helpcontent2/source/text/shared/02/06110000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06110000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,8 +54,7 @@
<paragraph role="paragraph" id="par_id3158405" xml-lang="en-US" l10n="CHG" oldref="5">If you have numbered paragraphs and click the<emph> Move Down </emph>icon, the numbers will be adjusted to the current order. <switchinline select="appl"><caseinline select="WRITER">The <emph>Move Down </emph>icon is only visible when the cursor is positioned in a bulleted or numbered list.
</caseinline></switchinline><switchinline select="appl"><caseinline select="IMPRESS">The <emph>Move Down </emph>icon appears on the <emph>Text Formatting</emph> Bar when you use the outline view.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149751" xml-lang="en-US" l10n="U" oldref="4">This function can be called by pressing <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Down Arrow.</paragraph>
+<paragraph role="paragraph" id="par_id3149751" xml-lang="en-US" l10n="U" oldref="4">This function can be called by pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Down Arrow.</paragraph>
<section id="syhinunterschieben">
<table id="tbl_id3155535">
<tablerow>
diff --git a/helpcontent2/source/text/shared/02/07080000.xhp b/helpcontent2/source/text/shared/02/07080000.xhp
index 60c1a326d3..34375cc137 100644
--- a/helpcontent2/source/text/shared/02/07080000.xhp
+++ b/helpcontent2/source/text/shared/02/07080000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 07080000.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,40 +30,22 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0207080000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0207080000xml" indexer="include">
<title id="tit" xml-lang="en-US">Stop Loading</title>
<filename>/text/shared/02/07080000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-17T16:24:28">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="stop">
<bookmark xml-lang="en-US" branch="hid/SID_BROWSE_STOP" id="bm_id1158113" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Stop" id="bm_id3148520" localize="false"/>
<paragraph role="heading" id="hd_id3154228" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/07080000.xhp" name="Stop Loading">Stop Loading</link></paragraph>
-<paragraph role="paragraph" id="par_id3149495" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Stop">Click to interrupt the current loading process, Ctrl-click to interrupt all loading processes.</ahelp></paragraph>
-</section>
-<section id="systop">
-<table id="tbl_id3149180">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="E">
-<image id="img_id3147399" src="res/sc06302.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3147399" xml-lang="en-US">Icon</alt>
- </image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145211" xml-lang="en-US" l10n="U" oldref="3">Stop Loading</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
+<paragraph role="paragraph" id="par_id3149495" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Stop">Click to interrupt the current loading process, Ctrl-click (Mac: Command-click) to interrupt all loading processes.</ahelp></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/10100000.xhp b/helpcontent2/source/text/shared/02/10100000.xhp
index aaa7b5f0ec..79a756ebfa 100644
--- a/helpcontent2/source/text/shared/02/10100000.xhp
+++ b/helpcontent2/source/text/shared/02/10100000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 10100000.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -47,7 +47,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_CLOSEWIN" id="bm_id8159155" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:CloseWin" id="bm_id3148520" localize="false"/>
<paragraph role="heading" id="hd_id3152895" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/10100000.xhp" name="Close">Close</link></paragraph>
-<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CloseWin">Closes the current window.</ahelp> Choose <emph>Window - Close</emph>, or press Ctrl+F4. In the page preview of $[officename] Writer and Calc, you can close the current window by clicking the <emph>Close Preview</emph> button.</paragraph>
+<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CloseWin">Closes the current window.</ahelp> Choose <emph>Window - Close</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F4. In the page preview of $[officename] Writer and Calc, you can close the current window by clicking the <emph>Close Preview</emph> button.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3147143" xml-lang="en-US" l10n="U" oldref="5">If additional views of the current document were opened by <emph>Window - New Window</emph>, this command will close only the current view.</paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/02/12100200.xhp b/helpcontent2/source/text/shared/02/12100200.xhp
index 277c226856..82159826fd 100644
--- a/helpcontent2/source/text/shared/02/12100200.xhp
+++ b/helpcontent2/source/text/shared/02/12100200.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 12100200.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0212100200xml" indexer="include" status="PUBLISH">
+<topic id="textshared0212100200xml" indexer="include">
<title id="tit" xml-lang="en-US">Find Record</title>
<filename>/text/shared/02/12100200.xhp</filename>
</topic>
@@ -50,14 +48,15 @@
<bookmark_value>databases; searching records</bookmark_value>
</bookmark><comment>mw changed" database tables;" to "tables in databases;"</comment>
<bookmark xml-lang="en-US" branch="hid/SID_FM_SEARCH" id="bm_id9750501" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:RecSearch" id="bm_id3154812" localize="false"/><section id="findrecord">
+<bookmark xml-lang="en-US" branch="hid/.uno:RecSearch" id="bm_id3154812" localize="false"/>
+<section id="findrecord">
<paragraph role="heading" id="hd_id3146936" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="datensatzsuche"><link href="text/shared/02/12100200.xhp" name="Find Record">Find Record</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3147588" xml-lang="en-US" l10n="U" oldref="2"><variable id="suchentext"><ahelp hid=".uno:RecSearch" visibility="hidden">Searches database tables and forms.</ahelp>In forms or database tables, you can search through data fields, list boxes, and check boxes for specific values.
</variable></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000450.xhp#datensuchen"/>
+<embed href="text/shared/00/00000450.xhp#datensuchen"/>
</section>
<paragraph role="paragraph" id="par_id3149355" xml-lang="en-US" l10n="U" oldref="3">When searching a table, the data fields of the current table are searched. When searching in a form, the data fields of the table linked with the form are searched.</paragraph>
<paragraph role="tip" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="111">The search described here is carried out by <item type="productname">%PRODUCTNAME</item>. If you want to use the SQL server to search in a database, then you should use the <link href="text/shared/02/12110000.xhp" name="Form-based Filters">Form-based Filters</link> icon on the <link href="text/shared/main0213.xhp" name="Form Bar">Form Bar</link>.</paragraph>
@@ -65,68 +64,77 @@
<paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="2" l10n="U" oldref="112">Search for</paragraph>
<paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="113">Specifies the type of search.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_TEXT" id="bm_id3154317" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORTEXT" id="bm_id3147577" localize="false"/><paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="3" l10n="U" oldref="6">Text:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORTEXT" id="bm_id3147577" localize="false"/>
+<paragraph role="heading" id="hd_id3153683" xml-lang="en-US" level="3" l10n="U" oldref="6">Text:</paragraph>
<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORTEXT">Enter the search term in the box or select it from the list.</ahelp> The text under the cursor is already copied into the <emph>Text</emph> combo box. Note that while running a search in a form, tabs and line breaks cannot be processed.</paragraph>
<paragraph role="paragraph" id="par_id3148539" xml-lang="en-US" l10n="U" oldref="8">Your search terms will be saved as long as the table or the formula document is open. If you are running more than one search and you would like to repeat the search term, you can select a previously used search term from the combo box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNULL" id="bm_id3145316" localize="false"/><paragraph role="heading" id="hd_id3153662" xml-lang="en-US" level="3" l10n="U" oldref="114">Field content is NULL</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNULL" id="bm_id3145316" localize="false"/>
+<paragraph role="heading" id="hd_id3153662" xml-lang="en-US" level="3" l10n="U" oldref="114">Field content is NULL</paragraph>
<paragraph role="paragraph" id="par_id3153543" xml-lang="en-US" l10n="U" oldref="115"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNULL">Specifies that fields will be found that contain no data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNOTNULL" id="bm_id3155388" localize="false"/><paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="3" l10n="U" oldref="116">Field content is not NULL</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNOTNULL" id="bm_id3155388" localize="false"/>
+<paragraph role="heading" id="hd_id3153717" xml-lang="en-US" level="3" l10n="U" oldref="116">Field content is not NULL</paragraph>
<paragraph role="paragraph" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="117"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORNOTNULL">Specifies that fields will be found that contain data.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156153" xml-lang="en-US" level="2" l10n="U" oldref="9">Where to search</paragraph>
<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="10">Specifies the fields for the search.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_SEARCHFORM_LB_FORM" id="bm_id3150670" localize="false"/><paragraph role="heading" id="hd_id3154564" xml-lang="en-US" level="3" l10n="U" oldref="105">Form</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_SEARCHFORM_LB_FORM" id="bm_id3150670" localize="false"/>
+<paragraph role="heading" id="hd_id3154564" xml-lang="en-US" level="3" l10n="U" oldref="105">Form</paragraph>
<paragraph role="paragraph" id="par_id3159176" xml-lang="en-US" l10n="U" oldref="106"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SEARCHFORM_LB_FORM">Specifies the logical form in which you want the search to take place.</ahelp></paragraph>
<paragraph role="note" id="par_id3155434" xml-lang="en-US" l10n="U" oldref="107">The<emph> Form </emph>combo box is only visible if the current document is a form document with more than one logical form. It does not appear during a search in tables or queries.</paragraph>
<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="108">Form documents may contain multiple logical forms. These are individual form components, which are each linked to a table.</paragraph>
<paragraph role="paragraph" id="par_id3145086" xml-lang="en-US" l10n="U" oldref="109">The <emph>Form</emph> combo box contains the names of all logical forms for which controls exist.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_ALLFIELDS" id="bm_id3149047" localize="false"/><paragraph role="heading" id="hd_id3159414" xml-lang="en-US" level="3" l10n="U" oldref="11">All Fields</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_ALLFIELDS" id="bm_id3149047" localize="false"/>
+<paragraph role="heading" id="hd_id3159414" xml-lang="en-US" level="3" l10n="U" oldref="11">All Fields</paragraph>
<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="HID_SEARCH_ALLFIELDS">Searches through all fields.</ahelp> If you are running a search in a table, all fields in the table will be searched. If you are running a search in a form, all fields of the logical form (entered under <emph>Form</emph>) will be searched. If you are running a search in a table control field, all columns that are linked to a valid database table field will be searched.</paragraph>
<paragraph role="paragraph" id="par_id3151054" xml-lang="en-US" l10n="U" oldref="13">Note that the fields of the current logical form do not have to be identical to the fields of the form document. If the form document contains fields that point to multiple data sources (that is, multiple logical forms), the <emph>All Fields</emph> option will only search for the fields linked to data sources in the form document.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_FIELDSELECTION" id="bm_id3153524" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SINGLEFIELD" id="bm_id3150400" localize="false"/><paragraph role="heading" id="hd_id3150865" xml-lang="en-US" level="3" l10n="U" oldref="15">Single field</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SINGLEFIELD" id="bm_id3150400" localize="false"/>
+<paragraph role="heading" id="hd_id3150865" xml-lang="en-US" level="3" l10n="U" oldref="15">Single field</paragraph>
<paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_RADIOBUTTON_RID_SVXDLG_SEARCHFORM_RB_SINGLEFIELD">Searches through a specified data field.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154365" xml-lang="en-US" level="2" l10n="U" oldref="17">Settings</paragraph>
<paragraph role="paragraph" id="par_id3158408" xml-lang="en-US" l10n="U" oldref="18">Defines settings to control the search.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_POSITION" id="bm_id3143233" localize="false"/><paragraph role="heading" id="hd_id3149809" xml-lang="en-US" level="3" l10n="U" oldref="19">Position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_POSITION" id="bm_id3143233" localize="false"/>
+<paragraph role="heading" id="hd_id3149809" xml-lang="en-US" level="3" l10n="U" oldref="19">Position</paragraph>
<paragraph role="paragraph" id="par_id3148673" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_SEARCH_POSITION">Specifies the relationship of the search term and the field contents.</ahelp> The following options are available:</paragraph>
<table id="tbl_id3155994">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156280" xml-lang="en-US" l10n="U" oldref="21">anywhere in the field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145744" xml-lang="en-US" l10n="U" oldref="22">Returns all fields containing the search pattern anywhere in the field.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148451" xml-lang="en-US" l10n="U" oldref="23">beginning of field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155429" xml-lang="en-US" l10n="U" oldref="24">Returns all fields containing the search pattern at the beginning of the field.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155131" xml-lang="en-US" l10n="U" oldref="74">end of field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="75">Returns all fields containing the search pattern at the end of the field.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="25">entire field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154127" xml-lang="en-US" l10n="U" oldref="26">Returns all fields containing the search pattern as an exact match to the contents of the field.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="note" id="par_id3152886" xml-lang="en-US" l10n="U" oldref="27">If the <emph>Wildcard expression</emph> check box is marked, this function is not available.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_FORMATTER" id="bm_id3154147" localize="false"/><paragraph role="heading" id="hd_id3149664" xml-lang="en-US" level="3" l10n="U" oldref="28">Apply field format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_FORMATTER" id="bm_id3154147" localize="false"/>
+<paragraph role="heading" id="hd_id3149664" xml-lang="en-US" level="3" l10n="U" oldref="28">Apply field format</paragraph>
<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_SEARCH_FORMATTER">Specifies that all field formats are considered when searching in the current document.</ahelp> Field formats are all visible formats that are created using the following possibilities:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3150103" xml-lang="en-US" l10n="U" oldref="78">in table design mode for field properties,</paragraph>
</listitem>
@@ -142,159 +150,168 @@
<paragraph role="paragraph" id="par_id3149959" xml-lang="en-US" l10n="U" oldref="83">You have a date field, which is saved in "DD.MM.YY" format in the database (for example, 17.02.65). The format of the entry is changed in the data source view to "DD. MMM YYYY" (17 Feb 1965). Following this example, a record containing February 17 is only found when the <emph>Apply field format</emph> option is on:</paragraph>
<table id="tbl_id3151076">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150593" xml-lang="en-US" l10n="U" oldref="84">Apply field format</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3145253" xml-lang="en-US" l10n="U" oldref="85">Search pattern</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3083279" xml-lang="en-US" l10n="U" oldref="86">on</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155850" xml-lang="en-US" l10n="U" oldref="87">"Feb" is returned, but not "2".</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148590" xml-lang="en-US" l10n="U" oldref="88">off</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153418" xml-lang="en-US" l10n="U" oldref="89">"2" is returned, but not "Feb".</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3151321" xml-lang="en-US" l10n="U" oldref="90">It is recommended that you always search using field formatting.</paragraph>
<paragraph role="paragraph" id="par_id3149401" xml-lang="en-US" l10n="U" oldref="91">The following examples show possible issues when searching without field formatting. These issues depend on the database used and only occur for certain internal default formatting:</paragraph>
<table id="tbl_id3156320">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3152971" xml-lang="en-US" l10n="U" oldref="92">Search results</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154273" xml-lang="en-US" l10n="U" oldref="93">Cause</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153836" xml-lang="en-US" l10n="U" oldref="94">"5" returns "14:00:00" as a time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156332" xml-lang="en-US" l10n="U" oldref="95">Time fields are not defined for dBASE databases and must be simulated. To internally display the time "14:00:00", a 5 is necessary.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3157965" xml-lang="en-US" l10n="U" oldref="96">"00:00:00" returns all records of a standard date field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146081" xml-lang="en-US" l10n="U" oldref="97">The database stores a date value internally using a combined date/time field.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="98">"45.79" does not return "45.79" although the <emph>entire field</emph> option is selected under <emph>Position</emph>.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155518" xml-lang="en-US" l10n="U" oldref="99">The view shown does not match what is stored internally. For example, if value 45.789 is stored in the database as a field of type Number/Double and the shown formatting is set to display only two decimals, "45.79" is only returned in searches with field formatting.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3148481" xml-lang="en-US" l10n="U" oldref="100">In this case, standard formatting is formatting that refers to the internally stored data. It is not always visible to the user, especially if it is used for simulating data types (for example, time fields in dBASE databases). This depends on the database used and the individual data type. Searching with field formatting is appropriate if you only want to find what is actually shown. This includes fields of type Date, Time, Date/Time and Number/Double.</paragraph>
<paragraph role="paragraph" id="par_id3154507" xml-lang="en-US" l10n="U" oldref="31">However, searching without <emph>Apply field format </emph>is appropriate for larger databases with no formatting issues, because it is faster.</paragraph>
<paragraph role="paragraph" id="par_id3153355" xml-lang="en-US" l10n="CHG" oldref="118">If you are searching the values of check boxes, and <emph>Apply field format</emph> is on, then you will receive a "1" for marked check boxes, a "0" for unmarked check boxes, and an empty string for undefined (tristate) check boxes. If the search has been carried out with <emph>Apply field format</emph> set to off, you will see the language-dependent default values "TRUE" or "FALSE".</paragraph>
<paragraph role="paragraph" id="par_id3150995" xml-lang="en-US" l10n="U" oldref="119">If you use <emph>Apply field format</emph> when searching in list boxes, you find the text displayed in list boxes. If you do not use <emph>Apply field format,</emph> you will find the contents corresponding to the standard field format.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_CASE" id="bm_id3156717" localize="false"/><paragraph role="heading" id="hd_id3150387" xml-lang="en-US" level="3" l10n="U" oldref="32">Match case</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_CASE" id="bm_id3156717" localize="false"/>
+<paragraph role="heading" id="hd_id3150387" xml-lang="en-US" level="3" l10n="U" oldref="32">Match case</paragraph>
<paragraph role="paragraph" id="par_id3159267" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="HID_SEARCH_CASE">Specifies that upper and lower case are taken into consideration during the search.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BACKWARD" id="bm_id3151101" localize="false"/><paragraph role="heading" id="hd_id3145297" xml-lang="en-US" level="3" l10n="U" oldref="34">Search backwards</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BACKWARD" id="bm_id3151101" localize="false"/>
+<paragraph role="heading" id="hd_id3145297" xml-lang="en-US" level="3" l10n="U" oldref="34">Search backwards</paragraph>
<paragraph role="paragraph" id="par_id3151249" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_SEARCH_BACKWARD">Specifies that the search process will run in reverse direction, from the last to the first record.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_STARTOVER" id="bm_id3166447" localize="false"/><paragraph role="heading" id="hd_id3152484" xml-lang="en-US" level="3" l10n="U" oldref="36">From top / From bottom</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_STARTOVER" id="bm_id3166447" localize="false"/>
+<paragraph role="heading" id="hd_id3152484" xml-lang="en-US" level="3" l10n="U" oldref="36">From top / From bottom</paragraph>
<paragraph role="paragraph" id="par_id3156316" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="HID_SEARCH_STARTOVER">Restarts the search. A forward search restarts with the first record. A backwards search restarts with the last record.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_WILDCARD" id="bm_id3156713" localize="false"/><paragraph role="heading" id="hd_id3163724" xml-lang="en-US" level="3" l10n="U" oldref="38">Wildcard expression</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_WILDCARD" id="bm_id3156713" localize="false"/>
+<paragraph role="heading" id="hd_id3163724" xml-lang="en-US" level="3" l10n="U" oldref="38">Wildcard expression</paragraph>
<paragraph role="paragraph" id="par_id3149255" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="HID_SEARCH_WILDCARD" visibility="hidden">Allows a search with a * or ? wildcard.</ahelp> You can use the following wildcards:</paragraph>
<table id="tbl_id3151187">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3146317" xml-lang="en-US" l10n="U" oldref="39">Wildcards</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150298" xml-lang="en-US" l10n="U" oldref="40">Meaning</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3153919" xml-lang="en-US" l10n="U" oldref="41">Example</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3158411" xml-lang="en-US" l10n="U" oldref="42">?</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148874" xml-lang="en-US" l10n="U" oldref="43">for exactly one arbitrary character</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150365" xml-lang="en-US" l10n="U" oldref="44">"?loppy" returns "Floppy"</paragraph>
<paragraph role="tablecontent" id="par_id3166426" xml-lang="en-US" l10n="U" oldref="65">"M?ller" returns, for example, Miller and Moller</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148803" xml-lang="en-US" l10n="U" oldref="45">*</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156138" xml-lang="en-US" l10n="U" oldref="46">for 0 or more arbitrary characters</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146135" xml-lang="en-US" l10n="U" oldref="47">"*-*" returns "ZIP-Drive" and "CD-ROM"</paragraph>
<paragraph role="tablecontent" id="par_id3155582" xml-lang="en-US" l10n="U" oldref="66">"M*er" returns all entries starting with an "M" and ending in "er" (for example, Miller, Moller, Mather)</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3145762" xml-lang="en-US" l10n="U" oldref="48">If you want to search for the actual characters ? or *, preface them with a backslash: "\?" or "\*". However, this is only necessary when <emph>Wildcard expression </emph>is enabled. When the option is not enabled, the wildcard characters are processed like normal characters.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_REGULAR" id="bm_id3150663" localize="false"/><paragraph role="heading" id="hd_id3147130" xml-lang="en-US" level="3" l10n="U" oldref="49">Regular expression</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_REGULAR" id="bm_id3150663" localize="false"/>
+<paragraph role="heading" id="hd_id3147130" xml-lang="en-US" level="3" l10n="U" oldref="49">Regular expression</paragraph>
<paragraph role="paragraph" id="par_id3150982" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="HID_SEARCH_REGULAR">Searches with regular expressions.</ahelp> The same regular expressions that are supported here are also supported in the <item type="productname">%PRODUCTNAME</item><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace dialog">Find &amp; Replace dialog</link>.</paragraph>
<paragraph role="paragraph" id="par_id3154718" xml-lang="en-US" l10n="U" oldref="67">Searching with regular expressions offers more options than searching with wildcard expressions. If you search with regular expressions, the following characters correspond to those used in searches with wildcards:</paragraph>
<table id="tbl_id3148682">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3153705" xml-lang="en-US" l10n="U" oldref="68">Search with wildcard expression</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149209" xml-lang="en-US" l10n="U" oldref="69">Search with regular expressions</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151045" xml-lang="en-US" l10n="U" oldref="70">?</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150384" xml-lang="en-US" l10n="U" oldref="71">.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153793" xml-lang="en-US" l10n="U" oldref="72">*</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150428" xml-lang="en-US" l10n="U" oldref="73">.*</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_APPROX" id="bm_id3154814" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_APPROXSETTINGS" id="bm_id3154817" localize="false"/><embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCHFORM_CB_HALFFULLFORMS" id="bm_id3153655" localize="false"/><embed href="text/shared/01/02100000.xhp#halbnormaltitel"/>
+<embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
+<embed href="text/shared/01/02100000.xhp#halbnormaltitel"/>
<embed href="text/shared/01/02100000.xhp#halbnormaltext"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_SEARCHFORM_CB_SOUNDSLIKECJK" id="bm_id3148750" localize="false"/><embed href="text/shared/01/02100000.xhp#aehnlichtitel"/>
+<embed href="text/shared/01/02100000.xhp#aehnlichtitel"/>
<embed href="text/shared/01/02100000.xhp#aehnlichtext"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SEARCHFORM_PB_SOUNDSLIKESETTINGS" id="bm_id3155506" localize="false"/><embed href="text/shared/01/02100000.xhp#aehnlichbutton"/>
+<embed href="text/shared/01/02100000.xhp#aehnlichbutton"/>
<embed href="text/shared/optionen/01150200.xhp#asia"/>
<paragraph role="heading" id="hd_id3150861" xml-lang="en-US" level="2" l10n="U" oldref="101">State</paragraph>
<paragraph role="paragraph" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="102">The <emph>State</emph> line shows the records returned by the search. If the search reaches the end (or the beginning) of a table, the search is automatically continued at the other end.</paragraph>
<paragraph role="paragraph" id="par_id3163720" xml-lang="en-US" l10n="U" oldref="103">In very large databases, finding the record in reverse search order can take some time. In this case, the status bar informs you that the records are still being counted.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BTN_SEARCH" id="bm_id3149494" localize="false"/><paragraph role="heading" id="hd_id3147389" xml-lang="en-US" level="2" l10n="U" oldref="51">Search / Cancel</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BTN_SEARCH" id="bm_id3149494" localize="false"/>
+<paragraph role="heading" id="hd_id3147389" xml-lang="en-US" level="2" l10n="U" oldref="51">Search / Cancel</paragraph>
<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="HID_SEARCH_BTN_SEARCH" visibility="hidden">Starts or cancels the search.</ahelp> If the search is successfully completed, the corresponding field in the table is highlighted. You can continue the search by clicking the <emph>Search</emph> button again. You can cancel a search process by clicking the <emph>Cancel</emph> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BTN_CLOSE" id="bm_id3152453" localize="false"/><paragraph role="heading" id="hd_id3145080" xml-lang="en-US" level="2" l10n="U" oldref="53">Close</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_BTN_CLOSE" id="bm_id3152453" localize="false"/>
+<paragraph role="heading" id="hd_id3145080" xml-lang="en-US" level="2" l10n="U" oldref="53">Close</paragraph>
<paragraph role="paragraph" id="par_id3156166" xml-lang="en-US" l10n="U" oldref="54"><ahelp hid="HID_SEARCH_BTN_CLOSE">Closes the dialog. The settings of the last search will be saved until you quit <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3151183" xml-lang="en-US" l10n="U" oldref="104">If several tables or forms are open, you can set different search options for each document. When you close the documents only the search options of the document last closed are saved.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/02/13020000.xhp b/helpcontent2/source/text/shared/02/13020000.xhp
index 6774c5b635..2bc26884c0 100644
--- a/helpcontent2/source/text/shared/02/13020000.xhp
+++ b/helpcontent2/source/text/shared/02/13020000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 13020000.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -118,8 +118,7 @@
</tablerow>
</table>
-<paragraph role="tip" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="16">In order to change the left indent starting with the second line of a paragraph, hold down the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl </defaultinline></switchinline> key, click the triangle on the bottom left, and drag it to the right.</paragraph>
+<paragraph role="tip" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="16">In order to change the left indent starting with the second line of a paragraph, hold down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl </defaultinline></switchinline> key, click the triangle on the bottom left, and drag it to the right.</paragraph>
<paragraph role="note" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">Tabs that have been set are not changed when indenting a paragraph. If the set tabs end up outside the margins of the paragraph, they are no longer displayed, but they still exist.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/20050000.xhp b/helpcontent2/source/text/shared/02/20050000.xhp
index b513c6819e..397d6b02d4 100644
--- a/helpcontent2/source/text/shared/02/20050000.xhp
+++ b/helpcontent2/source/text/shared/02/20050000.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 20050000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -113,7 +113,7 @@
<paragraph role="paragraph" id="par_id7234717" xml-lang="en-US" l10n="NEW">BLK</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id6971037" xml-lang="en-US" l10n="NEW">Block selection mode (Ctrl+Shift+F8)</paragraph>
+<paragraph role="paragraph" id="par_id6971037" xml-lang="en-US" l10n="NEW">Block selection mode (<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F8)</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id5258644" xml-lang="en-US" l10n="NEW">A block of text can be selected.</paragraph>
diff --git a/helpcontent2/source/text/shared/02/24100000.xhp b/helpcontent2/source/text/shared/02/24100000.xhp
index 6eb9a388e5..1c864313c4 100644
--- a/helpcontent2/source/text/shared/02/24100000.xhp
+++ b/helpcontent2/source/text/shared/02/24100000.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: 24100000.xhp,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +37,7 @@
<meta>
-<topic id="textshared0224100000xml" indexer="include">
+<topic id="textshared0224100000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Crop</title>
<filename>/text/shared/02/24100000.xhp</filename>
</topic>
@@ -49,7 +49,7 @@
<paragraph role="heading" id="hd_id3154044" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/24100000.xhp" name="Crop">Crop</link></paragraph>
<paragraph role="paragraph" id="par_id3154863" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:GrafAttrCrop">Allows to crop the display of an inserted picture. Only the display gets cropped, the inserted picture is not changed.</ahelp> A picture must be selected to enable cropping.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:Crop" id="bm_id0514200804065077" localize="false"/>
-<paragraph role="paragraph" id="par_id0514200804261097" xml-lang="en-US" l10n="NEW">In Impress and Draw no dialog is shown when you click the icon, but you see eight cropping handles. Open the context menu of a selected picture and choose <item type="menuitem">Drop Picture</item>, if you want to use the <link href="text/shared/01/05030800.xhp">dialog</link> for cropping.</paragraph>
+<paragraph role="paragraph" id="par_id0514200804261097" xml-lang="en-US" l10n="NEW">In Impress and Draw no dialog is shown when you click the icon, but you see eight cropping handles. Open the context menu of a selected picture and choose <item type="menuitem">Crop Picture</item>, if you want to use the <link href="text/shared/01/05030800.xhp">dialog</link> for cropping.</paragraph>
<paragraph role="paragraph" id="par_id0514200804261043" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Drag any of the eight cropping handles to crop the picture.</ahelp></paragraph>
</section>
<section id="sycut">
diff --git a/helpcontent2/source/text/shared/02/makefile.mk b/helpcontent2/source/text/shared/02/makefile.mk
index a11060381f..73c361ee7c 100644
--- a/helpcontent2/source/text/shared/02/makefile.mk
+++ b/helpcontent2/source/text/shared/02/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.11 $
+# $Revision: 1.11.4.4 $
#
# This file is part of OpenOffice.org.
#
@@ -98,6 +98,7 @@ XHPFILES = \
03140000.xhp \
03150000.xhp \
03200000.xhp \
+ 04210000.xhp \
05020000.xhp \
05090000.xhp \
05110000.xhp \
diff --git a/helpcontent2/source/text/shared/02/paintbrush.xhp b/helpcontent2/source/text/shared/02/paintbrush.xhp
index b858c21f89..57ac1e1dd8 100755
--- a/helpcontent2/source/text/shared/02/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/02/paintbrush.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: paintbrush.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared02paintbrushxml" indexer="include" status="PUBLISH">
+<topic id="textshared02paintbrushxml" indexer="include">
<title id="tit" xml-lang="en-US">Format Paintbrush</title>
<filename>/text/shared/02/paintbrush.xhp</filename>
</topic>
@@ -45,26 +43,28 @@
<body>
<section id="paintbrush">
<bookmark xml-lang="en-US" branch="hid/SID_FORMATPAINTBRUSH" id="bm_id1629078" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:FormatPaintbrush" id="bm_id3944822" localize="false"/><paragraph role="heading" id="par_idN1056A" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/02/paintbrush.xhp">Format Paintbrush</link></paragraph>
-<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US" l10n="CHG"><ahelp hid=".">First select a text (in Writer) or an object, then click this icon. Now click another text (in Writer) or another object to apply the same formatting.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormatPaintbrush" id="bm_id3944822" localize="false"/>
+<paragraph role="heading" id="par_idN1056A" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/02/paintbrush.xhp">Format Paintbrush</link></paragraph>
+<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US" l10n="CHG"><ahelp hid=".">First select some text or an object, then click this icon. Then click on or drag across other text or click an object to apply the same formatting.</ahelp><comment>i93691</comment></paragraph>
<section id="howtoget">
<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW">Click the <emph>Format Paintbrush</emph> icon
-<image id="img_id3610034" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3610034" xml-lang="en-US">Icon</alt>
- </image> on the <emph>Standard</emph> toolbar.</paragraph>
+<image id="img_id3610034" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id3610034" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image> on the <emph>Standard</emph> toolbar. </paragraph>
</section>
<section id="sypaintbrush">
<table id="tbl_id4703817">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_idN10639" xml-lang="en-US" l10n="NEW">
-<image id="img_id5406964" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id5406964" xml-lang="en-US">Icon</alt>
+<image id="img_id5406964" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.423cm" height="0.423cm"><alt id="alt_id5406964" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10657" xml-lang="en-US" l10n="NEW">Format Paintbrush</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</section>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/04/01010000.xhp b/helpcontent2/source/text/shared/04/01010000.xhp
index e1742aaaec..5f7dfe45ce 100755
--- a/helpcontent2/source/text/shared/04/01010000.xhp
+++ b/helpcontent2/source/text/shared/04/01010000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01010000.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0401010000xml" indexer="include" status="PUBLISH">
+<topic id="textshared0401010000xml" indexer="include">
<title id="tit" xml-lang="en-US">General Shortcut Keys in $[officename]</title>
<filename>/text/shared/04/01010000.xhp</filename>
</topic>
@@ -55,8 +53,8 @@
</section>
<embed href="text/shared/00/00000099.xhp#keys"/>
<paragraph role="heading" id="hd_id3150702" xml-lang="en-US" level="2" l10n="U" oldref="3">Using Shortcut Keys</paragraph>
-<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="U" oldref="4">A great deal of your application's functionality can be called up by using shortcut keys. For example, the <switchinline select="sys"><caseinline select="MAC">Command+O
-</caseinline><defaultinline>Ctrl+O</defaultinline></switchinline> shortcut keys are shown next to the <emph>Open</emph> entry in the <emph>File</emph> menu. If you want to access this function by using the shortcut keys, press and hold down the key <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="U" oldref="4">A great deal of your application's functionality can be called up by using shortcut keys. For example, the <switchinline select="sys"><caseinline select="MAC">Command+O
+</caseinline><defaultinline>Ctrl+O</defaultinline></switchinline> shortcut keys are shown next to the <emph>Open</emph> entry in the <emph>File</emph> menu. If you want to access this function by using the shortcut keys, press and hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and then press the O key. Release both keys after the dialog appears.</paragraph>
<paragraph role="paragraph" id="par_id3153894" xml-lang="en-US" l10n="U" oldref="5">When operating your application, you can choose between using the mouse or the keyboard for almost all of the operations available.</paragraph>
<paragraph role="heading" id="hd_id3154186" xml-lang="en-US" level="2" l10n="U" oldref="6"><switchinline select="sys"><caseinline select="MAC">
@@ -68,21 +66,21 @@
<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="11">Pressing ESC closes the dialog without saving changes. <switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>If you place the focus on a button, not only will you see the dotted line framing the name of the button, but also a thicker shadow under the button selected. This indicates that if you exit the dialog by pressing the Enter key, it is the equivalent of pressing that button itself.</defaultinline></switchinline></paragraph>
<paragraph role="heading" id="hd_id3147209" xml-lang="en-US" level="2" l10n="U" oldref="105">Shortcut Keys for Mouse Actions</paragraph>
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="106">If you are using drag-and-drop, selecting with the mouse or clicking objects and names, you can use the keys Shift, <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and occasionally <switchinline select="sys"><caseinline select="MAC">Option
+<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="106">If you are using drag-and-drop, selecting with the mouse or clicking objects and names, you can use the keys Shift, <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and occasionally <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> to access additional functionality. The modified functions available when holding down keys during drag-and-drop are indicated by the mouse pointer changing form. When selecting files or other objects, the modifier keys can extend the selection - the functions are explained where applicable. <switchinline select="sys"><caseinline select="UNIX"><embedvar href="text/shared/00/00000099.xhp#winmanager"/>
</caseinline></switchinline></paragraph>
<paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="U" oldref="127">Practical Text Input Fields</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="129">You can open a context menu, which contains some of the most often-used commands.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="130">Use the shortcut keys Shift+<switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="listitem" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="130">Use the shortcut keys Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S to open the <emph>Special Characters</emph> dialog to insert one or more special characters.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153088" xml-lang="en-US" l10n="U" oldref="131">Use <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="listitem" id="par_id3153088" xml-lang="en-US" l10n="U" oldref="131">Use <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A to select the entire text. Use the right or left arrow key to remove the selection.</paragraph>
</listitem>
<listitem>
@@ -92,11 +90,11 @@
<paragraph role="listitem" id="par_id3149785" xml-lang="en-US" l10n="CHG" oldref="133">A triple-click in a text input field selects the entire field. A triple-click in a text document selects the current sentence.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="134">Use <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="listitem" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="134">Use <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Del to delete everything from the cursor position to the end of the word.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="135">By using <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="listitem" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="135">By using <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and right or left arrow key, the cursor will jump from word to word; if you also hold down the Shift key, one word after the other is selected.</paragraph>
</listitem>
<listitem>
@@ -106,15 +104,15 @@
<paragraph role="listitem" id="par_id3148757" xml-lang="en-US" l10n="U" oldref="137">Drag-and-drop can be used within and outside of a text box.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="138">The <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="listitem" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="138">The <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z shortcut keys are used to undo modifications one step at a time; the text will then have the status it had before the first change.</paragraph>
</listitem>
</list>
<section id="autocompurl">
-<list type="unordered">
+<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153968" xml-lang="en-US" l10n="CHG" oldref="139"> $[officename] has an AutoComplete function which activates itself in some text and list boxes. For example, enter <switchinline select="sys"><caseinline select="WIN">c:\a
-</caseinline><defaultinline>~/a</defaultinline></switchinline> into the URL field and the AutoComplete function displays the first file or first directory found <switchinline select="sys"><caseinline select="WIN">on the C: drive
+<paragraph role="listitem" id="par_id3153968" xml-lang="en-US" l10n="CHG" oldref="139"> $[officename] has an AutoComplete function which activates itself in some text and list boxes. For example, enter <switchinline select="sys"><caseinline select="WIN">c:\a
+</caseinline><defaultinline>~/a</defaultinline></switchinline> into the URL field and the AutoComplete function displays the first file or first directory found <switchinline select="sys"><caseinline select="WIN">on the C: drive
</caseinline><defaultinline>in your home folder</defaultinline></switchinline> that starts with the letter "a".</paragraph>
</listitem>
<listitem>
@@ -123,819 +121,819 @@
</list>
</section>
<paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="2" l10n="U" oldref="163">Interrupting Macros</paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="164">If you want to terminate a macro that is currently running, press Shift+ <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="164">If you want to terminate a macro that is currently running, press Shift+ <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Q.</paragraph>
<paragraph role="heading" id="hd_id3154123" xml-lang="en-US" level="2" l10n="U" oldref="12">List of General Shortcut Keys in $[officename]</paragraph>
<paragraph role="paragraph" id="par_id3145421" xml-lang="en-US" l10n="U" oldref="13">The shortcut keys are shown on the right hand side of the menu lists next to the corresponding menu command. <switchinline select="sys"><caseinline select="MAC">(Not all of the mentioned keys for controlling dialogs are available on the Macintosh.)
</caseinline></switchinline></paragraph>
<table id="tbl_id3555101">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="hd_id3153367" xml-lang="en-US" l10n="U" oldref="14">Shortcut Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3156060" xml-lang="en-US" l10n="U" oldref="15">
<emph>Effect</emph>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149260" xml-lang="en-US" l10n="U" oldref="16">Enter key</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153727" xml-lang="en-US" l10n="U" oldref="17">Activates the focused button in a dialog</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153142" xml-lang="en-US" l10n="U" oldref="18">Esc</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155412" xml-lang="en-US" l10n="U" oldref="19">Terminates the action or dialog. If in $[officename] Help: goes up one level.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3151118" xml-lang="en-US" l10n="U" oldref="20">Spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147435" xml-lang="en-US" l10n="U" oldref="21">Toggles the focused check box in a dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3152791" xml-lang="en-US" l10n="U" oldref="22">Arrow keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151113" xml-lang="en-US" l10n="U" oldref="23">Changes the active control field in an option section of a dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154188" xml-lang="en-US" l10n="U" oldref="24">Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="25">Advances focus to the next section or element in a dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153363" xml-lang="en-US" l10n="U" oldref="26">Shift + Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149665" xml-lang="en-US" l10n="U" oldref="27">Moves the focus to the previous section or element in a dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147317" xml-lang="en-US" l10n="U" oldref="153"><switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3147317" xml-lang="en-US" l10n="U" oldref="153"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153224" xml-lang="en-US" l10n="U" oldref="154">Opens the list of the control field currently selected in a dialog. These shortcut keys apply not only to combo boxes but also to icon buttons with pop-up menus. Close an opened list by pressing the Escape key.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3159348" xml-lang="en-US" l10n="U" oldref="172">Del</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3144765" xml-lang="en-US" l10n="U" oldref="171">Deletes the selected item(s) into the recycle bin.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149379" xml-lang="en-US" l10n="U" oldref="174">Shift+Del</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149412" xml-lang="en-US" l10n="U" oldref="173">Deletes the selected item(s) without putting them in the recycle bin.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154792" xml-lang="en-US" l10n="U" oldref="176">Backspace</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149582" xml-lang="en-US" l10n="U" oldref="175">When a folder is shown: goes up one level (goes back)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10BC0" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+spacebar</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10BC0" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+M</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10BE8" xml-lang="en-US" l10n="NEW">Removes direct formatting from selected text or objects (as in <emph>Format - Default Formatting</emph>)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149488" xml-lang="en-US" l10n="U" oldref="141"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Tab</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149488" xml-lang="en-US" l10n="U" oldref="141"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149912" xml-lang="en-US" l10n="CHG" oldref="142">When positioned at the start of a header, a tab is inserted.<comment>UFI: fixes #i21687#</comment></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148573" xml-lang="en-US" l10n="U" oldref="289">Enter (if an OLE object is selected)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154162" xml-lang="en-US" l10n="U" oldref="288">Activates the selected OLE object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3146990" xml-lang="en-US" l10n="U" oldref="290">Enter (if a drawing object or text object is selected)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153839" xml-lang="en-US" l10n="U" oldref="291">Activates text input mode.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3156437" xml-lang="en-US" l10n="U" oldref="28"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + O</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3156437" xml-lang="en-US" l10n="U" oldref="28"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+O</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149123" xml-lang="en-US" l10n="U" oldref="29">Opens a document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155064" xml-lang="en-US" l10n="U" oldref="30"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + S</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3155064" xml-lang="en-US" l10n="U" oldref="30"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150749" xml-lang="en-US" l10n="U" oldref="31">Saves the current document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3156377" xml-lang="en-US" l10n="U" oldref="32"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + N</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3156377" xml-lang="en-US" l10n="U" oldref="32"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="33">Creates a new document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151357" xml-lang="en-US" l10n="U" oldref="178">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3151357" xml-lang="en-US" l10n="U" oldref="178">Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148408" xml-lang="en-US" l10n="U" oldref="177">Opens <emph>Templates and Documents</emph> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150043" xml-lang="en-US" l10n="U" oldref="34"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + P</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3150043" xml-lang="en-US" l10n="U" oldref="34"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+P</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147100" xml-lang="en-US" l10n="U" oldref="35">Prints document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149258" xml-lang="en-US" l10n="U" oldref="113"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Q</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149258" xml-lang="en-US" l10n="U" oldref="113"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Q</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153966" xml-lang="en-US" l10n="U" oldref="114">Exits application.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153538" xml-lang="en-US" l10n="U" oldref="36"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + X</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3153538" xml-lang="en-US" l10n="U" oldref="36"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+X</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3166450" xml-lang="en-US" l10n="U" oldref="37">Cuts out the selected elements.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155904" xml-lang="en-US" l10n="U" oldref="38"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + C</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3155904" xml-lang="en-US" l10n="U" oldref="38"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148537" xml-lang="en-US" l10n="U" oldref="39">Copies the selected items.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3156318" xml-lang="en-US" l10n="U" oldref="40"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + V</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3156318" xml-lang="en-US" l10n="U" oldref="40"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147005" xml-lang="en-US" l10n="U" oldref="41">Pastes from the clipboard.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_idN10F47" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + V</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10F47" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+V</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10F4B" xml-lang="en-US" l10n="NEW">Opens the <emph>Paste Special</emph> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153789" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + A</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3153789" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155581" xml-lang="en-US" l10n="U" oldref="43">Selects all.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149738" xml-lang="en-US" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Z</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149738" xml-lang="en-US" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149816" xml-lang="en-US" l10n="U" oldref="45">Undoes last action.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147095" xml-lang="en-US" l10n="U" oldref="351"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Y</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3147095" xml-lang="en-US" l10n="U" oldref="351"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Y</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150345" xml-lang="en-US" l10n="U" oldref="352">Redoes last action.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7297280" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + Y</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id7297280" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Y</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id8709677" xml-lang="en-US" l10n="NEW">Repeats last command.<comment>[framework-features] new/SRC680_m221 : Shortcut for "Repeat"</comment></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3158414" xml-lang="en-US" l10n="U" oldref="165"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3158414" xml-lang="en-US" l10n="U" oldref="165"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150090" xml-lang="en-US" l10n="U" oldref="166">Calls the <emph>Find &amp; Replace</emph> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3148800" xml-lang="en-US" l10n="U" oldref="167"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3148800" xml-lang="en-US" l10n="U" oldref="167"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149527" xml-lang="en-US" l10n="U" oldref="168">Searches for the last entered search term.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154198" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Ctrl+Shift+J</defaultinline></switchinline></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150567" xml-lang="en-US" l10n="CHG" oldref="49"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Toggles the view between fullscreen mode and normal mode in Writer or Calc</defaultinline></switchinline></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151049" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3151049" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+R</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148462" xml-lang="en-US" l10n="U" oldref="51">Redraws the document view.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149035" xml-lang="en-US" l10n="U" oldref="349">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149035" xml-lang="en-US" l10n="U" oldref="349">Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+I</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150665" xml-lang="en-US" l10n="CHG" oldref="350">Enable or disable the selection cursor in read-only text.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145588" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3145588" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+I</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148753" xml-lang="en-US" l10n="U" oldref="91">The <emph>Italic</emph> attribute is applied to the selected area. If the cursor is positioned in a word, this word is also marked in italic.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3166428" xml-lang="en-US" l10n="U" oldref="92"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3166428" xml-lang="en-US" l10n="U" oldref="92"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+B</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150490" xml-lang="en-US" l10n="U" oldref="93">The <emph>Bold</emph> attribute is applied to the selected area. If the cursor is positioned in a word, this word is also put in bold.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154815" xml-lang="en-US" l10n="U" oldref="94"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3154815" xml-lang="en-US" l10n="U" oldref="94"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+U</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153228" xml-lang="en-US" l10n="U" oldref="95">The <emph>Underlined</emph> attribute is applied to the selected area. If the cursor is positioned in a word, this word is also underlined.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3152891" xml-lang="en-US" level="2" l10n="U" oldref="60">Shortcut Keys Using the Function Keys</paragraph>
<paragraph role="paragraph" id="par_id3152457" xml-lang="en-US" l10n="U" oldref="59"><switchinline select="sys"><caseinline select="MAC">Not all of the function shortcut keys are available on the Mac.
</caseinline></switchinline></paragraph>
<table id="tbl_id1489608">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="hd_id3149726" xml-lang="en-US" l10n="U" oldref="183">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3153756" xml-lang="en-US" l10n="U" oldref="184">
<emph>Effect</emph>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149404" xml-lang="en-US" l10n="U" oldref="61"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>F1</defaultinline></switchinline></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145410" xml-lang="en-US" l10n="U" oldref="62"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Starts the $[officename] Help</defaultinline></switchinline></paragraph>
<paragraph role="tablecontent" id="par_id3153697" xml-lang="en-US" l10n="U" oldref="152">In the $[officename] Help: jumps to main help page.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154951" xml-lang="en-US" l10n="U" oldref="63"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Shift + F1</defaultinline></switchinline></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153309" xml-lang="en-US" l10n="U" oldref="64"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Context Help</defaultinline></switchinline></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3159220" xml-lang="en-US" l10n="U" oldref="292">Shift+F2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151241" xml-lang="en-US" l10n="U" oldref="293">Turns on Extended Tips for the currently selected command, icon or control.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3146871" xml-lang="en-US" l10n="U" oldref="68"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F4 or <switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3146871" xml-lang="en-US" l10n="U" oldref="68"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F4 or <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+F4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3157978" xml-lang="en-US" l10n="U" oldref="69">Closes the current document (close $[officename] when the last open document is closed)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154532" xml-lang="en-US" l10n="U" oldref="180">F6</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3144506" xml-lang="en-US" l10n="U" oldref="179">Sets focus in next subwindow (for example, document/data source view)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3144771" xml-lang="en-US" l10n="U" oldref="182">Shift+F6</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147075" xml-lang="en-US" l10n="U" oldref="181">Sets focus in previous subwindow.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3156191" xml-lang="en-US" l10n="U" oldref="294">F10</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156172" xml-lang="en-US" l10n="U" oldref="295">Activates the first menu (File menu)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3159093" xml-lang="en-US" l10n="U" oldref="146">Shift+F10</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148606" xml-lang="en-US" l10n="U" oldref="147">Opens the context menu.</paragraph>
</tablecell>
</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3148822" xml-lang="en-US" l10n="U" oldref="353">Ctrl+F11</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149156" xml-lang="en-US" l10n="U" oldref="354">Opens the Style Catalog.<comment>UFI: may get discarded</comment></paragraph>
-</tablecell>
-</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3153288" xml-lang="en-US" level="2" l10n="U" oldref="287">Shortcut keys in the Gallery</paragraph>
<table id="tbl_id310678">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="hd_id3156308" xml-lang="en-US" l10n="U" oldref="286">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149440" xml-lang="en-US" l10n="U" oldref="285">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149971" xml-lang="en-US" l10n="U" oldref="284">Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153110" xml-lang="en-US" l10n="U" oldref="283">Moves between areas.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148971" xml-lang="en-US" l10n="U" oldref="282">Shift+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154059" xml-lang="en-US" l10n="U" oldref="281">Moves between areas (backwards)</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3152368" xml-lang="en-US" level="3" l10n="U" oldref="280">Shortcut keys in the New Theme area of the Gallery:</paragraph>
<table id="tbl_id8934598">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN11555" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN1155B" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3159192" xml-lang="en-US" l10n="U" oldref="279">Up arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152540" xml-lang="en-US" l10n="U" oldref="278">Moves the selection up one.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150892" xml-lang="en-US" l10n="U" oldref="277">Down arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151004" xml-lang="en-US" l10n="U" oldref="276">Moves the selection down.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153976" xml-lang="en-US" l10n="U" oldref="275"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3153976" xml-lang="en-US" l10n="U" oldref="275"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146894" xml-lang="en-US" l10n="U" oldref="274">Opens the Properties dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148652" xml-lang="en-US" l10n="U" oldref="273">Shift+F10</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153250" xml-lang="en-US" l10n="U" oldref="272">Opens a context menu.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155614" xml-lang="en-US" l10n="U" oldref="271"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3155614" xml-lang="en-US" l10n="U" oldref="271"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+U</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150099" xml-lang="en-US" l10n="U" oldref="270">Refreshes the selected theme.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145755" xml-lang="en-US" l10n="U" oldref="269"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3145755" xml-lang="en-US" l10n="U" oldref="269"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+R</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146776" xml-lang="en-US" l10n="U" oldref="268">Opens the <emph>Enter Title</emph> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154642" xml-lang="en-US" l10n="U" oldref="267"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3154642" xml-lang="en-US" l10n="U" oldref="267"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+D</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153653" xml-lang="en-US" l10n="U" oldref="266">Deletes the selected theme.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3155946" xml-lang="en-US" l10n="U" oldref="265">Insert</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145372" xml-lang="en-US" l10n="U" oldref="264">Inserts a new theme</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3150633" xml-lang="en-US" level="3" l10n="U" oldref="263">Shortcut keys in the Gallery preview area:</paragraph>
<table id="tbl_id9288308">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN116D6" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN116DC" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149343" xml-lang="en-US" l10n="U" oldref="262">Home</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153241" xml-lang="en-US" l10n="U" oldref="261">Jumps to the first entry.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148809" xml-lang="en-US" l10n="U" oldref="260">End</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148902" xml-lang="en-US" l10n="U" oldref="259">Jumps to the last entry.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149382" xml-lang="en-US" l10n="U" oldref="258">Left Arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150048" xml-lang="en-US" l10n="U" oldref="257">Selects the next Gallery element on the left.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3152926" xml-lang="en-US" l10n="U" oldref="256">Right Arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153802" xml-lang="en-US" l10n="U" oldref="255">Selects the next Gallery element on the right.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150776" xml-lang="en-US" l10n="U" oldref="254">Up Arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149800" xml-lang="en-US" l10n="U" oldref="253">Selects the next Gallery element above.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3147517" xml-lang="en-US" l10n="U" oldref="252">Down Arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151223" xml-lang="en-US" l10n="U" oldref="251">Selects the next Gallery element below.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3145602" xml-lang="en-US" l10n="U" oldref="250">Page Up</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147081" xml-lang="en-US" l10n="U" oldref="249">Scroll up one screen.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153045" xml-lang="en-US" l10n="U" oldref="355">Page Down</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150411" xml-lang="en-US" l10n="U" oldref="248">Scroll down one screen.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147278" xml-lang="en-US" l10n="U" oldref="246"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3147278" xml-lang="en-US" l10n="U" oldref="246"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Insert</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153614" xml-lang="en-US" l10n="U" oldref="245">Inserts the selected object as a linked object into the current document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155345" xml-lang="en-US" l10n="U" oldref="244"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3155345" xml-lang="en-US" l10n="U" oldref="244"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+I</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153608" xml-lang="en-US" l10n="U" oldref="243">Inserts a copy of the selected object into the current document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3143278" xml-lang="en-US" l10n="U" oldref="242"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3143278" xml-lang="en-US" l10n="U" oldref="242"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+T</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156370" xml-lang="en-US" l10n="U" oldref="241">Opens the <emph>Enter Title</emph> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145114" xml-lang="en-US" l10n="U" oldref="240"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3145114" xml-lang="en-US" l10n="U" oldref="240"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+P</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146107" xml-lang="en-US" l10n="U" oldref="239">Switches between themes view and object view.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3147552" xml-lang="en-US" l10n="U" oldref="238">Spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145324" xml-lang="en-US" l10n="U" oldref="237">Switches between themes view and object view.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148978" xml-lang="en-US" l10n="U" oldref="236">Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155743" xml-lang="en-US" l10n="U" oldref="235">Switches between themes view and object view.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154108" xml-lang="en-US" l10n="U" oldref="234">Step backward (only in object view)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153294" xml-lang="en-US" l10n="U" oldref="233">Switches back to main overview.</paragraph>
</tablecell>
</tablerow>
</table>
+
<section id="dbtable">
<paragraph role="heading" id="hd_id3149722" xml-lang="en-US" level="2" l10n="CHG" oldref="330">Selecting Rows and Columns in a Database Table (opened by F4)</paragraph>
<table id="tbl_id1178319">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN11906" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN1190C" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150963" xml-lang="en-US" l10n="U" oldref="331">Spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146883" xml-lang="en-US" l10n="U" oldref="332">Toggles row selection, except when the row is in edit mode.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149787" xml-lang="en-US" l10n="U" oldref="333"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149787" xml-lang="en-US" l10n="U" oldref="333"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149028" xml-lang="en-US" l10n="U" oldref="334">Toggles row selection</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3147482" xml-lang="en-US" l10n="U" oldref="335">Shift+spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149319" xml-lang="en-US" l10n="U" oldref="336">Selects the current column</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id1418805" xml-lang="en-US" l10n="NEW">Ctrl+PgUp</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1418805" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PgUp</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id1743522" xml-lang="en-US" l10n="NEW">Moves pointer to the first row</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id5994140" xml-lang="en-US" l10n="NEW">Ctrl+PgDn</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id5994140" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PgDn</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id7870113" xml-lang="en-US" l10n="NEW">Moves pointer to the last row</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="zeichenobjekte">
<paragraph role="heading" id="hd_id3147411" xml-lang="en-US" level="2" l10n="U" oldref="230">Shortcut Keys for Drawing Objects</paragraph>
<table id="tbl_id1152073">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN1199F" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN119A5" xml-lang="en-US" l10n="NEW">Result</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149684" xml-lang="en-US" l10n="U" oldref="229">Select the toolbar with F6. Use the Down Arrow and Right Arrow to select the desired toolbar icon and press <switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149684" xml-lang="en-US" l10n="U" oldref="229">Select the toolbar with F6. Use the Down Arrow and Right Arrow to select the desired toolbar icon and press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155994" xml-lang="en-US" l10n="U" oldref="228">Inserts a Drawing Object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150264" xml-lang="en-US" l10n="U" oldref="227">Select the document with <switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3150264" xml-lang="en-US" l10n="U" oldref="227">Select the document with <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 and press Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154055" xml-lang="en-US" l10n="U" oldref="226">Selects a Drawing Object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149242" xml-lang="en-US" l10n="U" oldref="225">Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3157902" xml-lang="en-US" l10n="U" oldref="224">Selects the next Drawing Object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149349" xml-lang="en-US" l10n="U" oldref="223">Shift+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150836" xml-lang="en-US" l10n="U" oldref="222">Selects the previous Drawing Object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3109846" xml-lang="en-US" l10n="U" oldref="221"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3109846" xml-lang="en-US" l10n="U" oldref="221"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Home</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154276" xml-lang="en-US" l10n="U" oldref="220">Selects the first Drawing Object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145829" xml-lang="en-US" l10n="U" oldref="219"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3145829" xml-lang="en-US" l10n="U" oldref="219"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+End</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3161664" xml-lang="en-US" l10n="U" oldref="218">Selects the last Drawing Object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153099" xml-lang="en-US" l10n="U" oldref="217">Esc</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149009" xml-lang="en-US" l10n="U" oldref="216">Ends Drawing Object selection.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3156271" xml-lang="en-US" l10n="U" oldref="338">Esc (in Handle Selection Mode)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152818" xml-lang="en-US" l10n="U" oldref="339">Exit Handle Selection Mode and return to Object Selection Mode.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3151258" xml-lang="en-US" l10n="U" oldref="192">Up/down/left/right arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159162" xml-lang="en-US" l10n="U" oldref="191">Move the selected point (the snap-to-grid functions are temporarily disabled, but end points still snap to each other).</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3146874" xml-lang="en-US" l10n="U" oldref="213"><switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3146874" xml-lang="en-US" l10n="U" oldref="213"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up/Down/Left/Right Arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3144422" xml-lang="en-US" l10n="U" oldref="212">Moves the selected Drawing Object one pixel (in Selection Mode)</paragraph>
<paragraph role="tablecontent" id="par_id3153386" xml-lang="en-US" l10n="U" oldref="211">Re-sizes a Drawing Object (in Handle Selection Mode)</paragraph>
<paragraph role="tablecontent" id="par_id3145306" xml-lang="en-US" l10n="U" oldref="210">Rotates a Drawing Object (in Rotation Mode)</paragraph>
@@ -944,93 +942,95 @@
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153580" xml-lang="en-US" l10n="U" oldref="207">Spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153053" xml-lang="en-US" l10n="U" oldref="206">Select a point of a drawing object (in Point Selection mode) / Cancel selection.</paragraph>
<paragraph role="tablecontent" id="par_id3145629" xml-lang="en-US" l10n="U" oldref="205">The selected point blinks once per second.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148624" xml-lang="en-US" l10n="U" oldref="204">Shift+spacebar</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154842" xml-lang="en-US" l10n="U" oldref="203">Select an additional point in Point Selection mode.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147424" xml-lang="en-US" l10n="U" oldref="202"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3147424" xml-lang="en-US" l10n="U" oldref="202"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152955" xml-lang="en-US" l10n="U" oldref="201">Select the next point of the drawing object (Point Selection mode)</paragraph>
<paragraph role="tablecontent" id="par_id3149753" xml-lang="en-US" l10n="U" oldref="200">In Rotation mode, the center of rotation can also be selected.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147233" xml-lang="en-US" l10n="U" oldref="199">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3147233" xml-lang="en-US" l10n="U" oldref="199">Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151296" xml-lang="en-US" l10n="U" oldref="198">Select the previous point of the drawing object (Point Selection mode)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150933" xml-lang="en-US" l10n="U" oldref="340"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3150933" xml-lang="en-US" l10n="U" oldref="340"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145662" xml-lang="en-US" l10n="U" oldref="341">A new drawing object with default size is placed in the center of the current view.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147563" xml-lang="en-US" l10n="U" oldref="342"><switchinline select="sys"><caseinline select="MAC">Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3147563" xml-lang="en-US" l10n="U" oldref="342"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter at the Selection icon</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150860" xml-lang="en-US" l10n="U" oldref="343">Activates the first drawing object in the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154569" xml-lang="en-US" l10n="U" oldref="196">Esc</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149994" xml-lang="en-US" l10n="U" oldref="195">Leave the Point Selection mode. The drawing object is selected afterwards.</paragraph>
<paragraph role="tablecontent" id="par_id3155512" xml-lang="en-US" l10n="U" oldref="193">Edit a point of a drawing object (Point Edit mode)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148580" xml-lang="en-US" l10n="U" oldref="344">Any text or numerical key</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152918" xml-lang="en-US" l10n="U" oldref="345">If a drawing object is selected, switches to edit mode and places the cursor at the end of the text in the drawing object. A printable character is inserted.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id2693563" xml-lang="en-US" l10n="NEW">Alt key while creating or scaling a graphic object</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id2693563" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline> key while creating or scaling a graphic object</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id8308969" xml-lang="en-US" l10n="NEW">The position of the object's center is fixed.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id526444" xml-lang="en-US" l10n="NEW">Shift key while creating or scaling a graphic object</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id4939725" xml-lang="en-US" l10n="NEW">The ratio of the object's width to height is fixed.</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
<section id="relatedtopics">
<embed href="text/shared/04/01020000.xhp#DB_keys"/>
diff --git a/helpcontent2/source/text/shared/04/01020000.xhp b/helpcontent2/source/text/shared/04/01020000.xhp
index 4fb8f95b55..aff765f66c 100755
--- a/helpcontent2/source/text/shared/04/01020000.xhp
+++ b/helpcontent2/source/text/shared/04/01020000.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01020000.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -134,8 +134,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153510" xml-lang="en-US" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow</paragraph>
+<paragraph role="tablecontent" id="hd_id3153510" xml-lang="en-US" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3148572" xml-lang="en-US" l10n="U" oldref="21">Opens the combo box.</paragraph>
@@ -143,8 +142,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151205" xml-lang="en-US" l10n="U" oldref="22"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up Arrow</paragraph>
+<paragraph role="tablecontent" id="hd_id3151205" xml-lang="en-US" l10n="U" oldref="22"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up Arrow</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3145302" xml-lang="en-US" l10n="U" oldref="23">Closes the combo box.</paragraph>
@@ -184,8 +182,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155766" xml-lang="en-US" l10n="U" oldref="57"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6</paragraph>
+<paragraph role="tablecontent" id="hd_id3155766" xml-lang="en-US" l10n="U" oldref="57"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3149018" xml-lang="en-US" l10n="U" oldref="58">Sets the focus (if not in design mode) to the first control. The first control is the first one listed in the Form Navigator.</paragraph>
@@ -204,8 +201,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3156054" xml-lang="en-US" l10n="U" oldref="33"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PageUp</paragraph>
+<paragraph role="tablecontent" id="hd_id3156054" xml-lang="en-US" l10n="U" oldref="33"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PgUp</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3150389" xml-lang="en-US" l10n="U" oldref="34">Jumps between tabs.</paragraph>
@@ -213,8 +209,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3156384" xml-lang="en-US" l10n="U" oldref="35"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PageDown</paragraph>
+<paragraph role="tablecontent" id="hd_id3156384" xml-lang="en-US" l10n="U" oldref="35"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PgDn</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3151251" xml-lang="en-US" l10n="U" oldref="36">Jumps between tabs.</paragraph>
@@ -246,8 +241,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154967" xml-lang="en-US" l10n="U" oldref="43"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
+<paragraph role="tablecontent" id="hd_id3154967" xml-lang="en-US" l10n="U" oldref="43"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3147255" xml-lang="en-US" l10n="U" oldref="44">Inserts the selected control.</paragraph>
@@ -256,7 +250,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="hd_id3163726" xml-lang="en-US" l10n="U" oldref="45">Arrow key</paragraph>
-<paragraph role="tablecontent" id="par_idN109BA" xml-lang="en-US" l10n="NEW">Ctrl + arrow key</paragraph>
+<paragraph role="tablecontent" id="par_idN109BA" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+arrow key</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3145791" xml-lang="en-US" l10n="U" oldref="46">Moves the selected control in steps of 1 mm in the respective direction. In point edit mode, it changes the size of the selected control.</paragraph>
@@ -264,8 +258,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154665" xml-lang="en-US" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
+<paragraph role="tablecontent" id="hd_id3154665" xml-lang="en-US" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3155581" xml-lang="en-US" l10n="U" oldref="50">In point edit mode, jumps to next handle.</paragraph>
@@ -273,8 +266,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150208" xml-lang="en-US" l10n="U" oldref="51">Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
+<paragraph role="tablecontent" id="hd_id3150208" xml-lang="en-US" l10n="U" oldref="51">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3147506" xml-lang="en-US" l10n="U" oldref="52">In point edit mode, jumps to previous handle.</paragraph>
diff --git a/helpcontent2/source/text/shared/04/makefile.mk b/helpcontent2/source/text/shared/04/makefile.mk
index 5f46044bd4..59727b800e 100644
--- a/helpcontent2/source/text/shared/04/makefile.mk
+++ b/helpcontent2/source/text/shared/04/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/05/00000001.xhp b/helpcontent2/source/text/shared/05/00000001.xhp
index b2fbc034ae..b4028ba58e 100755
--- a/helpcontent2/source/text/shared/05/00000001.xhp
+++ b/helpcontent2/source/text/shared/05/00000001.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000001.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0500000001xml" indexer="include" status="PUBLISH">
+<topic id="textshared0500000001xml" indexer="include">
<title id="tit" xml-lang="en-US">Getting Support</title>
<filename>/text/shared/05/00000001.xhp</filename>
</topic>
@@ -54,10 +52,15 @@
<paragraph role="paragraph" id="par_id9173253" xml-lang="en-US" l10n="NEW">Many questions and answers are the same for OpenOffice.org software and for the commercial StarOffice or StarSuite software by Sun Microsystems, Inc. </paragraph>
<paragraph role="paragraph" id="par_id3150667" xml-lang="en-US" l10n="CHG" oldref="8">You can find support on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="CHG" oldref="4">Visit <link href="http://www.sun.com/star/support">www.sun.com/star/support</link> to get an overview of additional support offerings by Sun Microsystems and other parties.</paragraph>
-<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph><comment>some new paras from i61933</comment><paragraph role="heading" id="hd_id26327" xml-lang="en-US" level="2" l10n="NEW">Local language support pages</paragraph>
+<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph><comment>some new paras from i61933</comment>
+<paragraph role="heading" id="hd_id26327" xml-lang="en-US" level="2" l10n="NEW">Local language support pages</paragraph>
<paragraph role="paragraph" id="par_id1318380" xml-lang="en-US" l10n="CHG">The OpenOffice.org localization projects offer support pages in local languages. Find an overview of the native language projects at <link href="http://projects.openoffice.org/native-lang.html">projects.openoffice.org/native-lang.html</link>. You can find help and support in English language on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
<paragraph role="heading" id="hd_id2611386" xml-lang="en-US" level="2" l10n="NEW">Mailing lists</paragraph>
-<paragraph role="paragraph" id="par_id3166335" xml-lang="en-US" l10n="NEW">Ask about OpenOffice.org, find help by volunteers, and discuss topics on the mailing lists. You can find many general and specialized mailing lists on the OpenOffice.org website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3166335" xml-lang="en-US" l10n="NEW">Ask about OpenOffice.org, find help by volunteers, and discuss topics on the public mailing lists. You can find many general and specialized mailing lists on the OpenOffice.org website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
+<paragraph role="heading" id="hd_id0915200811081722" xml-lang="en-US" level="2" l10n="NEW">Forum</paragraph>
+<paragraph role="paragraph" id="par_id0915200811081778" xml-lang="en-US" l10n="NEW">You can access web forums to ask and answer questions about OpenOffice.org. A list of web forums hosted by Sun Microsystems can be found at <link href="http://user.services.openoffice.org/en/forum/listforums.php">http://user.services.openoffice.org/en/forum/listforums.php</link>.</paragraph>
+<paragraph role="heading" id="hd_id0804200803314150" xml-lang="en-US" level="2" l10n="NEW">Security</paragraph>
+<paragraph role="paragraph" id="par_id0804200803314235" xml-lang="en-US" l10n="NEW">In case you are concerned about any security issue with using this software, you can contact the developers on the public mail list dev@openoffice.org. If you want to discuss any issue with other users, send an email to the public mail list discuss@openoffice.org.</paragraph>
<paragraph role="heading" id="hd_id3168534" xml-lang="en-US" level="2" l10n="NEW">Downloads</paragraph>
<paragraph role="paragraph" id="par_id3028143" xml-lang="en-US" l10n="CHG">You can download the latest version of OpenOffice.org at <link href="http://download.openoffice.org/">download.openoffice.org</link>.</paragraph>
<paragraph role="heading" id="hd_id2602967" xml-lang="en-US" level="2" l10n="NEW">Documentation</paragraph>
diff --git a/helpcontent2/source/text/shared/05/00000110.xhp b/helpcontent2/source/text/shared/05/00000110.xhp
index e19c2b646b..55d77ffb7f 100644
--- a/helpcontent2/source/text/shared/05/00000110.xhp
+++ b/helpcontent2/source/text/shared/05/00000110.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000110.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -129,7 +129,7 @@
<paragraph role="paragraph" id="par_idN1092C" xml-lang="en-US" l10n="NEW">On a Help page, select the text that you want to copy.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_idN10930" xml-lang="en-US" l10n="NEW">Press Ctrl+C.</paragraph>
+<paragraph role="paragraph" id="par_idN10930" xml-lang="en-US" l10n="NEW">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_idN10933" xml-lang="en-US" l10n="NEW">To search the current Help page:</paragraph>
@@ -137,7 +137,7 @@
<listitem>
<paragraph role="paragraph" id="par_idN10939" xml-lang="en-US" l10n="NEW">Click the <emph>Find on this Page</emph> icon.</paragraph>
<paragraph role="paragraph" id="par_idN10940" xml-lang="en-US" l10n="NEW">The <emph>Find on this Page</emph> dialog opens.</paragraph>
-<paragraph role="note" id="par_idN10A36" xml-lang="en-US" l10n="NEW">You can also click in the Help page and press Ctrl+F.</paragraph>
+<paragraph role="note" id="par_idN10A36" xml-lang="en-US" l10n="NEW">You can also click in the Help page and press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN10A22" xml-lang="en-US" l10n="NEW">In the <emph>Search for</emph> box, enter the text that you want to find.</paragraph>
diff --git a/helpcontent2/source/text/shared/05/makefile.mk b/helpcontent2/source/text/shared/05/makefile.mk
index a1e2e634e0..b53847959e 100644
--- a/helpcontent2/source/text/shared/05/makefile.mk
+++ b/helpcontent2/source/text/shared/05/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/07/makefile.mk b/helpcontent2/source/text/shared/07/makefile.mk
index 8c344b9784..c080f0760b 100644
--- a/helpcontent2/source/text/shared/07/makefile.mk
+++ b/helpcontent2/source/text/shared/07/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/autokorr/makefile.mk b/helpcontent2/source/text/shared/autokorr/makefile.mk
index d1798fb4c2..1f89e18dc9 100644
--- a/helpcontent2/source/text/shared/autokorr/makefile.mk
+++ b/helpcontent2/source/text/shared/autokorr/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/autopi/01010000.xhp b/helpcontent2/source/text/shared/autopi/01010000.xhp
index 2f7abebf88..32930bf472 100644
--- a/helpcontent2/source/text/shared/autopi/01010000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01010000.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedautopi01010000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01010000xml" indexer="include">
<title id="tit" xml-lang="en-US">Letter Wizard</title>
<filename>/text/shared/autopi/01010000.xhp</filename>
</topic>
@@ -48,11 +46,12 @@
<bookmark_value>templates;letters</bookmark_value>
</bookmark><comment>mw made "letters;..." a one level entry</comment>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotLetter" id="bm_id3157898" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.wizards.letter.CallWizard?start" id="bm_id6131473" localize="false"/><paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="1" l10n="U" oldref="1">Letter Wizard</paragraph>
+<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.wizards.letter.CallWizard?start" id="bm_id6131473" localize="false"/>
+<paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="1" l10n="U" oldref="1">Letter Wizard</paragraph>
<paragraph role="paragraph" id="par_id3093440" xml-lang="en-US" l10n="U" oldref="2"><variable id="brief"><ahelp hid=".uno:AutoPilotLetter">Starts the wizard for a letter template.</ahelp>
</variable> You can use this template for both business and personal correspondence.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#autopilotbrief"/>
+<embed href="text/shared/00/00000401.xhp#autopilotbrief"/>
</section>
<paragraph role="paragraph" id="par_id3149178" xml-lang="en-US" l10n="U" oldref="3">$[officename] comes with sample templates for personal or business letters, which you can customize to your own needs with the help of the wizard. The wizard leads you step-by-step in creating a document template and offers numerous layout and design options. The preview gives you an impression of how the finished letter will appear according to the settings you choose.</paragraph>
<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="4">Within the wizard, you can modify your entries and options at any time. You may also skip an entire page or even all the wizard pages, in which case the current (or default) settings will remain in effect.</paragraph>
@@ -64,15 +63,23 @@
<embed href="text/shared/autopi/01010500.xhp#seite5"/>
<embed href="text/shared/autopi/01010600.xhp#seite6"/>
<section id="zurueck">
-<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_BACK" id="bm_id264595" localize="false"/><paragraph role="heading" id="hd_id3159176" xml-lang="en-US" level="2" l10n="U" oldref="6">Back</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_BACK" id="bm_id264595" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_PREVIOUS" id="bm_id3156024" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDPREV" id="bm_id3156347" localize="false"/>
+<paragraph role="heading" id="hd_id3159176" xml-lang="en-US" level="2" l10n="U" oldref="6">Back</paragraph>
<paragraph role="paragraph" id="par_id3153543" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp hid="HID_LTRWIZARD_BACK">Allows you to view the selections that you made on the previous steps.</ahelp> The current settings will be saved. </paragraph>
</section>
<section id="weiter">
-<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_NEXT" id="bm_id6038392" localize="false"/><paragraph role="heading" id="hd_id3150254" xml-lang="en-US" level="2" l10n="U" oldref="8">Next</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_NEXT" id="bm_id6038392" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_NEXT" id="bm_id3154346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDNEXT" id="bm_id3145382" localize="false"/>
+<paragraph role="heading" id="hd_id3150254" xml-lang="en-US" level="2" l10n="U" oldref="8">Next</paragraph>
<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="CHG" oldref="9"><ahelp hid="HID_LTRWIZARD_NEXT">Saves the current settings and continues to the next page.</ahelp></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_CREATE" id="bm_id2346873" localize="false"/><paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="2" l10n="CHG" oldref="10">Finish</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD_CREATE" id="bm_id2346873" localize="false"/>
+<paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="2" l10n="CHG" oldref="10">Finish</paragraph>
<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_LTRWIZARD_CREATE">According to your selections, the wizard creates a new document template and saves it on your hard disk.</ahelp> $[officename] creates a new document based on the existing templates with the "Untitled X" name (X stands for the consecutive numbering) and displays it on the work area.</paragraph>
<paragraph role="note" id="par_id3144433" xml-lang="en-US" l10n="U" oldref="16">$[officename] saves the current settings in the wizard according to the chosen template. These settings are used as the default settings the next time you activate the wizard.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD" id="bm_id9510177" localize="false"/></body>
+<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZARD" id="bm_id9510177" localize="false"/>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01020000.xhp b/helpcontent2/source/text/shared/autopi/01020000.xhp
index c69724477d..86ef883c14 100644
--- a/helpcontent2/source/text/shared/autopi/01020000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01020000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01020000.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedautopi01020000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01020000xml" indexer="include">
<title id="tit" xml-lang="en-US">Fax Wizard</title>
<filename>/text/shared/autopi/01020000.xhp</filename>
</topic>
@@ -48,11 +46,12 @@
<bookmark_value>templates;faxes</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotFax" id="bm_id3143281" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.wizards.fax.CallWizard?start" id="bm_id559709" localize="false"/><paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1">Fax Wizard</paragraph>
+<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.wizards.fax.CallWizard?start" id="bm_id559709" localize="false"/>
+<paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1">Fax Wizard</paragraph>
<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="fax"><ahelp hid=".uno:AutoPilotFax">Opens the wizard for faxes.</ahelp> The wizard can help you create document templates for fax documents. You can then print the fax documents to a printer or to a fax machine, if fax driver software is available.
</variable></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#autopilotfax"/>
+<embed href="text/shared/00/00000401.xhp#autopilotfax"/>
</section>
<paragraph role="paragraph" id="par_id3154824" xml-lang="en-US" l10n="CHG" oldref="3">$[officename] comes with a template for fax documents, which you can modify with the wizard to suit your own needs. The wizard leads you step-by-step in creating a document template, and offers numerous layout and design options. The document preview gives you an impression of how the finished fax will appear.</paragraph>
<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="4">Within the dialog you can modify your entries and options at any time. You can also skip an entire page or even all the wizard pages, in which case the current (or default) settings will remain in effect.</paragraph>
@@ -61,12 +60,16 @@
<embed href="text/shared/autopi/01020300.xhp#seite3"/>
<embed href="text/shared/autopi/01020400.xhp#seite4"/>
<embed href="text/shared/autopi/01020500.xhp#seite5"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_BACK" id="bm_id2001709" localize="false"/><paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2" l10n="U" oldref="5">Back</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_BACK" id="bm_id2001709" localize="false"/>
+<paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2" l10n="U" oldref="5">Back</paragraph>
<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Click the<emph> Back </emph>button to view the settings chosen on the previous page. The current settings will not be modified or deleted if you click this button.<emph> Back </emph>will be active from the second page onwards.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_NEXT" id="bm_id9227271" localize="false"/><paragraph role="heading" id="hd_id3147335" xml-lang="en-US" level="2" l10n="U" oldref="7">Next</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_NEXT" id="bm_id9227271" localize="false"/>
+<paragraph role="heading" id="hd_id3147335" xml-lang="en-US" level="2" l10n="U" oldref="7">Next</paragraph>
<paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid=".">The wizard saves the current settings and goes to the next page. The<emph> Next </emph>button will become inactive once you have reached the last page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_CREATE" id="bm_id2856532" localize="false"/><paragraph role="heading" id="hd_id3152350" xml-lang="en-US" level="2" l10n="CHG" oldref="9">Finish</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_CREATE" id="bm_id2856532" localize="false"/>
+<paragraph role="heading" id="hd_id3152350" xml-lang="en-US" level="2" l10n="CHG" oldref="9">Finish</paragraph>
<paragraph role="paragraph" id="par_id3146948" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid=".">According to your selections, the wizard creates a document template and saves it. A new document based on the template appears in the work area, with the filename "UntitledX".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD_CANCEL" id="bm_id833765" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD" id="bm_id4632404" localize="false"/><comment>Dialog ID must be below any &lt;avis&gt; tag</comment></body>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FAXWIZARD" id="bm_id4632404" localize="false"/><comment>Dialog ID must be below any &lt;avis&gt; tag</comment>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01090000.xhp b/helpcontent2/source/text/shared/autopi/01090000.xhp
index a6771245f8..a8f6b09f17 100755
--- a/helpcontent2/source/text/shared/autopi/01090000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01090000.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedautopi01090000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01090000xml" indexer="include">
<title id="tit" xml-lang="en-US">Form Wizard</title>
<filename>/text/shared/autopi/01090000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-14T12:46:21">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_DIALOG" id="bm_id3156211" localize="false"/>
@@ -53,7 +49,7 @@
<paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="U" oldref="2"><variable id="formular"><ahelp hid="HID_DLGFORM_DIALOG">Activates the Wizard for creating forms.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#autopilotformular"/>
+<embed href="text/shared/00/00000401.xhp#autopilotformular"/>
</section>
<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="3">Select the form properties using the following steps:</paragraph>
<embed href="text/shared/autopi/01090100.xhp#fieldselection"/>
@@ -64,10 +60,10 @@
<embed href="text/shared/autopi/01090400.xhp#setdataentry"/>
<embed href="text/shared/autopi/01090500.xhp#applystyles"/>
<embed href="text/shared/autopi/01090600.xhp#setname"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDPREV" id="bm_id3145346" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDNEXT" id="bm_id3147576" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDFINISH" id="bm_id6868800" localize="false"/>
<paragraph role="paragraph" id="par_idN10686" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to create the form without answering further pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDCANCEL" id="bm_id3149177" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01090100.xhp b/helpcontent2/source/text/shared/autopi/01090100.xhp
index 20604181db..92c026a80a 100755
--- a/helpcontent2/source/text/shared/autopi/01090100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090100.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01090100.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedautopi01090100xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01090100xml" indexer="include">
<title id="tit" xml-lang="en-US">Form Wizard - Field Selection</title>
<filename>/text/shared/autopi/01090100.xhp</filename>
</topic>
@@ -48,51 +46,90 @@
<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">On this page of the <link href="text/shared/autopi/01090000.xhp">Form Wizard</link>, you can specify the table or query that you need to create the form as well as the fields that you want to include in the form.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#autopilotformular"/>
+<embed href="text/shared/00/00000401.xhp#autopilotformular"/>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_LBTABLES" id="bm_id3154751" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_LBTABLES" id="bm_id4652241" localize="false"/><paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Tables or queries</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_LBTABLES" id="bm_id4652241" localize="false"/>
+<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Tables or queries</paragraph>
<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_DLGFORM_LBTABLES">Specifies the table or query that you want to create the form for.</ahelp></paragraph>
<section id="vorhandenefelder">
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_FIELDSAVAILABLE" id="bm_id3149177" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_FIELDSAVAILABLE" id="bm_id3552354" localize="false"/><paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="CHG" oldref="8">Available fields</paragraph>
-<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DLGFORM_FIELDSAVAILABLE">Lists the names of the data base fields in the selected table or query.</ahelp> Click to select a field or hold down the Shift or the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while you click to select more than one field.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_FIELDSAVAILABLE" id="bm_id3552354" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_FIELDSAVAILABLE" id="bm_id560014" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFILTERFIELDS" id="bm_id2533341" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFIELDS" id="bm_id4751121" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_FIELDSAVAILABLE" id="bm_id4880825" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_LISTBOX_RID_PAGE_GW_FIELDSELECTION_LB_EXISTING_FIELDS" id="bm_id3149283" localize="false"/>
+<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="CHG" oldref="8">Available fields</paragraph>
+<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DLGFORM_FIELDSAVAILABLE">Lists the names of the data base fields in the selected table or query.</ahelp> Click to select a field or hold down the Shift or the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while you click to select more than one field.</paragraph>
</section>
<section id="uebernehmen">
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDMOVESELECTED" id="bm_id3152996" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVESELECTED" id="bm_id5681936" localize="false"/><paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="2" l10n="U" oldref="10">&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVESELECTED" id="bm_id5681936" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVESELECTED" id="bm_id5441755" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVESELECTED" id="bm_id4933927" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVESELECTED" id="bm_id9028595" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVESELECTED" id="bm_id2095095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_FIELDRIGHT" id="bm_id3159201" localize="false"/>
+<paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="2" l10n="U" oldref="10">&gt;</paragraph>
<paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="CHG" oldref="11"><ahelp hid="HID_DLGFORM_CMDMOVESELECTED">Click to move the selected field(s) to the box that the arrow is pointing to.</ahelp><comment>i73704</comment></paragraph>
</section>
<section id="uebernehmealle">
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDMOVEALL" id="bm_id3156326" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVEALL" id="bm_id990325" localize="false"/><paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="2" l10n="U" oldref="12">&gt;&gt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVEALL" id="bm_id990325" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEALL" id="bm_id6911221" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEALL" id="bm_id3862117" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEALL" id="bm_id3775444" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSRIGHT" id="bm_id3150178" localize="false"/>
+<paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="2" l10n="U" oldref="12">&gt;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3145121" xml-lang="en-US" l10n="CHG" oldref="13"><ahelp hid="HID_DLGFORM_CMDMOVEALL">Click to move all fields to the box that the arrow is pointing to.</ahelp></paragraph>
</section>
<section id="entfernen">
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDREMOVESELECTED" id="bm_id3150669" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDREMOVESELECTED" id="bm_id9349345" localize="false"/><paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="2" l10n="U" oldref="14">&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDREMOVESELECTED" id="bm_id9349345" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDREMOVESELECTED" id="bm_id3583483" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERREMOVESELECTED" id="bm_id9915768" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDREMOVESELECTED" id="bm_id2427442" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDREMOVESELECTED" id="bm_id7336649" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_FIELDLEFT" id="bm_id3147043" localize="false"/>
+<paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="2" l10n="U" oldref="14">&lt;</paragraph>
<paragraph role="paragraph" id="par_id3149763" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="HID_DLGFORM_CMDREMOVESELECTED">Click to move the selected field(s) to the box that the arrow is pointing to.</ahelp></paragraph>
</section>
<section id="entfernealle">
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDREMOVEALL" id="bm_id3155135" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDREMOVEALL" id="bm_id1483504" localize="false"/><paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="16">&lt;&lt;</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDREMOVEALL" id="bm_id1483504" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDREMOVEALL" id="bm_id86672" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDREMOVEALL" id="bm_id9287697" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDREMOVEALL" id="bm_id4853053" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBP_PUSHBUTTON_RID_PAGE_GW_FIELDSELECTION_PB_ALLFIELDSLEFT" id="bm_id3156136" localize="false"/>
+<paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="16">&lt;&lt;</paragraph>
<paragraph role="paragraph" id="par_id3156329" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_DLGFORM_CMDREMOVEALL">Click to move all fields to the box that the arrow is pointing to.</ahelp></paragraph>
</section>
<section id="updown">
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVEUP" id="bm_id3334452" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID2_BTN_DOC_UP" id="bm_id915860" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEUP" id="bm_id5749382" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEUP" id="bm_id710776" localize="false"/><paragraph role="heading" id="par_idN1074A" xml-lang="en-US" level="2" l10n="NEW">^</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEUP" id="bm_id710776" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEUP_PK_SELECTED" id="bm_id2638019" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVEUP" id="bm_id1707815" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEUP" id="bm_id3135166" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEUP" id="bm_id3982360" localize="false"/>
+<paragraph role="heading" id="par_idN1074A" xml-lang="en-US" level="2" l10n="NEW">^</paragraph>
<paragraph role="paragraph" id="par_idN1074E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to move the selected field up one entry in the list.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_CMDMOVEDOWN" id="bm_id5430463" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID2_BTN_DOC_DOWN" id="bm_id2385937" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEDOWN" id="bm_id1741691" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEDOWN" id="bm_id632038" localize="false"/><paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="2" l10n="NEW">v</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEDOWN" id="bm_id632038" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED" id="bm_id6198309" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVEDOWN" id="bm_id6916714" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEDOWN" id="bm_id5736259" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEDOWN" id="bm_id2286751" localize="false"/>
+<paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="2" l10n="NEW">v</paragraph>
<paragraph role="paragraph" id="par_idN10755" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to move the selected field down one entry in the list.</ahelp></paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_FIELDSSELECTED" id="bm_id3145673" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_FIELDSSELECTED" id="bm_id2010864" localize="false"/><paragraph role="heading" id="hd_id3147618" xml-lang="en-US" level="2" l10n="CHG" oldref="18">Fields in the form</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_MASTER_FIELDSSELECTED" id="bm_id2010864" localize="false"/>
+<paragraph role="heading" id="hd_id3147618" xml-lang="en-US" level="2" l10n="CHG" oldref="18">Fields in the form</paragraph>
<paragraph role="paragraph" id="par_id3156194" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="HID_DLGFORM_FIELDSSELECTED">Displays the fields that are in the new form.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3150398" xml-lang="en-US" l10n="CHG" oldref="7"><link href="text/shared/autopi/01090200.xhp" name="Form Wizard - Set up a subform">Form Wizard - Set up a subform</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/autopi/01090210.xhp b/helpcontent2/source/text/shared/autopi/01090210.xhp
index f5d5997cfc..88f9e1b00e 100755
--- a/helpcontent2/source/text/shared/autopi/01090210.xhp
+++ b/helpcontent2/source/text/shared/autopi/01090210.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01090210.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedautopi01090210xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01090210xml" indexer="include">
<title id="tit" xml-lang="en-US">Form Wizard - Add Subform Fields</title>
<filename>/text/shared/autopi/01090210.xhp</filename>
</topic>
-<history>
-<created date="2004-07-02T12:24:48">UFI: new Form Wizard page 3</created>
-<lastedited date="2005-02-15T14:51:39">YJ: checked</lastedited>
-</history>
</meta>
<body>
<section id="addsubformfields">
@@ -48,18 +46,17 @@
<paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">Specify the table or query you need to create the subform, and which fields you wish to include in the subform.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#autopilotformular"/>
+<embed href="text/shared/00/00000401.xhp#autopilotformular"/>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_LBTABLES" id="bm_id2198553" localize="false"/>
<paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Tables or queries</paragraph>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the table or query for which the subform is to be created.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_FIELDSAVAILABLE" id="bm_id4880825" localize="false"/><embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVESELECTED" id="bm_id2095095" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEALL" id="bm_id3775444" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDREMOVESELECTED" id="bm_id7336649" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDREMOVEALL" id="bm_id4853053" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEUP" id="bm_id3982360" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_CMDMOVEDOWN" id="bm_id2286751" localize="false"/><embed href="text/shared/autopi/01090100.xhp#updown"/>
+<embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernen"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
+<embed href="text/shared/autopi/01090100.xhp#updown"/>
<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_SUB_FIELDSSELECTED" id="bm_id7471541" localize="false"/>
<paragraph role="heading" id="par_idN10590" xml-lang="en-US" level="2" l10n="NEW">Fields in my subform</paragraph>
<paragraph role="paragraph" id="par_idN10594" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all fields that will be included in the new subform.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01100000.xhp b/helpcontent2/source/text/shared/autopi/01100000.xhp
index 29a986805b..d98e06c15c 100755
--- a/helpcontent2/source/text/shared/autopi/01100000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01100000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedautopi01100000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01100000xml" indexer="include">
<title id="tit" xml-lang="en-US">Report Wizard</title>
<filename>/text/shared/autopi/01100000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-04-12T12:49:21">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/HID_DOCUMENT_CREATE_REPWIZ" id="bm_id3153894" localize="false"/>
@@ -50,7 +46,7 @@
<paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U" oldref="1"><variable id="report"><ahelp hid="HID_DOCUMENT_CREATE_REPWIZ">Activates the wizard for creating reports.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#autopilotreport"/>
+<embed href="text/shared/00/00000401.xhp#autopilotreport"/>
</section>
<embed href="text/shared/guide/data_report.xhp#data_report"/><comment>UFI: added Help ID, see #i61571</comment>
<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_DIALOG" id="bm_id6317331" localize="false"/>
@@ -61,8 +57,8 @@
<embed href="text/shared/autopi/01100300.xhp#sortoptions"/>
<embed href="text/shared/autopi/01100400.xhp#chooselayout"/>
<embed href="text/shared/autopi/01100500.xhp#savereport"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDCANCEL" id="bm_id3154142" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDPREV" id="bm_id3150984" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_0_CMDNEXTORREADY" id="bm_id3154860" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01100100.xhp b/helpcontent2/source/text/shared/autopi/01100100.xhp
index d4dfd28038..0dfe78a897 100755
--- a/helpcontent2/source/text/shared/autopi/01100100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01100100.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01100100.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,8 +54,7 @@
<paragraph role="paragraph" id="par_id3147043" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_DLGREPORT_1_LBTABLES">Select the table or query for which the report is to be created.</ahelp></paragraph>
<section id="vorhandenefelder">
<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_1_FIELDSAVAILABLE" id="bm_id3153683" localize="false"/><paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="2" l10n="CHG" oldref="6">Available fields</paragraph>
-<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_DLGREPORT_1_FIELDSAVAILABLE">Displays the names of the data base fields in the selected table or query.</ahelp> Click to select a field or press the Shift or <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while clicking to select multiple fields.</paragraph>
+<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="HID_DLGREPORT_1_FIELDSAVAILABLE">Displays the names of the data base fields in the selected table or query.</ahelp> Click to select a field or press the Shift or <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while clicking to select multiple fields.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/HID_DLGREPORT_1_FIELDSSELECTED" id="bm_id3151110" localize="false"/><paragraph role="heading" id="hd_id3153031" xml-lang="en-US" level="2" l10n="U" oldref="8">Fields in report</paragraph>
<paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DLGREPORT_1_FIELDSSELECTED">Displays all fields that are included in the new report.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01120000.xhp b/helpcontent2/source/text/shared/autopi/01120000.xhp
index 9caf5f7a5a..ecb34db2fb 100755
--- a/helpcontent2/source/text/shared/autopi/01120000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01120000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01120000.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,34 +30,34 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textsharedautopi01120000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Group Element Wizard</title>
+<topic id="textsharedautopi01120000xml" indexer="include">
+<title id="tit" xml-lang="en-US">Group Element Wizard</title>
<filename>/text/shared/autopi/01120000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
- <paragraph role="heading" level="1" id="hd_id3149031" l10n="U" xml-lang="en-US" oldref="1">Group Element Wizard</paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3151097" l10n="U" oldref="2">The Group Element Wizard starts automatically when you insert a <link href="text/shared/02/01170000.xhp" name="Group Box">Group Box</link> into a document.</paragraph>
- <section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#gruppen"/>
+<paragraph role="heading" id="hd_id3149031" xml-lang="en-US" level="1" l10n="U" oldref="1">Group Element Wizard</paragraph>
+<paragraph role="paragraph" id="par_id3151097" xml-lang="en-US" l10n="U" oldref="2">The Group Element Wizard starts automatically when you insert a <link href="text/shared/02/01170000.xhp" name="Group Box">Group Box</link> into a document.</paragraph>
+<section id="howtoget">
+<embed href="text/shared/00/00000401.xhp#gruppen"/>
</section>
- <embed href="text/shared/autopi/01120100.xhp#seite1"/>
- <embed href="text/shared/autopi/01120200.xhp#seite2"/>
- <embed href="text/shared/autopi/01120300.xhp#seite3"/>
- <embed href="text/shared/autopi/01120400.xhp#seite4"/>
- <embed href="text/shared/autopi/01120500.xhp#seite5"/>
- <bookmark branch="hid/HID_GROUPWIZARD_CANCEL" xml-lang="en-US" id="bm_id3149183"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
- <bookmark branch="hid/HID_GROUPWIZARD_PREVIOUS" xml-lang="en-US" id="bm_id3154318"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
- <bookmark branch="hid/HID_GROUPWIZARD_NEXT" xml-lang="en-US" id="bm_id3149095"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
- <bookmark branch="hid/HID_GROUPWIZARD_FINISH" xml-lang="en-US" id="bm_id3155941"/><bookmark branch="hid/HID_GRIDWIZARD_FINISH" xml-lang="en-US" id="bm_id3155391"/><bookmark branch="hid/HID_LISTWIZARD_FINISH" xml-lang="en-US" id="bm_id3153748"/><paragraph role="heading" level="2" id="hd_id3145071" l10n="U" xml-lang="en-US" oldref="5">Create</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3149811" xml-lang="en-US" oldref="6"><ahelp hid="HID_LISTWIZARD_FINISH" visibility="visible">Creates the object.</ahelp></paragraph>
- </body>
+<embed href="text/shared/autopi/01120100.xhp#seite1"/>
+<embed href="text/shared/autopi/01120200.xhp#seite2"/>
+<embed href="text/shared/autopi/01120300.xhp#seite3"/>
+<embed href="text/shared/autopi/01120400.xhp#seite4"/>
+<embed href="text/shared/autopi/01120500.xhp#seite5"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GROUPWIZARD_FINISH" id="bm_id3155941" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_GRIDWIZARD_FINISH" id="bm_id3155391" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_LISTWIZARD_FINISH" id="bm_id3153748" localize="false"/>
+<paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="2" l10n="U" oldref="5">Create</paragraph>
+<paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_LISTWIZARD_FINISH">Creates the object.</ahelp></paragraph>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/01130000.xhp b/helpcontent2/source/text/shared/autopi/01130000.xhp
index dd7992190a..12227de0d4 100755
--- a/helpcontent2/source/text/shared/autopi/01130000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01130000.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,18 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedautopi01130000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01130000xml" indexer="include">
<title id="tit" xml-lang="en-US">Document Converter</title>
<filename>/text/shared/autopi/01130000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-04T15:38:11">converted from old format - fpe
-checked - yj</lastedited>
-</history>
</meta>
<body><comment>mw deleted all index entries because of guide import_ms.xhp</comment>
<paragraph role="paragraph" id="par_id3151097" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
@@ -53,7 +48,7 @@ checked - yj</lastedited>
<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="ms"><ahelp hid=".">Copies and converts documents into the OpenDocument XML format used by $[officename].</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#autopilotmsimport"/>
+<embed href="text/shared/00/00000401.xhp#autopilotmsimport"/>
</section>
<paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="U" oldref="3">The wizard converts documents and templates from the binary format from previous $[officename] versions (StarOffice 5.2 and before), as well as documents from Microsoft Word, Excel and PowerPoint. The source files are only read, not edited. New target files are written with the new file name extension in the same or a new folder.</paragraph>
<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="4">The Document Converter Wizard contains the following pages:</paragraph>
@@ -61,9 +56,8 @@ checked - yj</lastedited>
<embed href="text/shared/autopi/01130200.xhp#seite2"/>
<paragraph role="heading" id="hd_id3154318" xml-lang="en-US" level="2" l10n="U" oldref="7">Document Converter Summary</paragraph>
<paragraph role="paragraph" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="8">Displays a summary which shows what will be converted when you click <emph>Convert</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDCANCEL" id="bm_id3147653" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDPREV" id="bm_id3156347" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDNEXT" id="bm_id3145382" localize="false"/><embed href="text/shared/autopi/01010000.xhp#zurueck"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/autopi/01010000.xhp#zurueck"/>
<embed href="text/shared/autopi/01010000.xhp#weiter"/>
<embed href="text/shared/00/00000001.xhp#import"/>
</body>
diff --git a/helpcontent2/source/text/shared/autopi/01170000.xhp b/helpcontent2/source/text/shared/autopi/01170000.xhp
index 9bf65d6d43..17276999bd 100755
--- a/helpcontent2/source/text/shared/autopi/01170000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01170000.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedautopi01170000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopi01170000xml" indexer="include">
<title id="tit" xml-lang="en-US">Address Data Source</title>
<filename>/text/shared/autopi/01170000.xhp</filename>
</topic>
@@ -46,45 +44,59 @@
<section id="adressdatenquelle">
<bookmark xml-lang="en-US" branch="hid/extensions:TabPage:RID_PAGE_SELECTABTYPE" id="bm_id2237617" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/slot:10934" id="bm_id3581347" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotAddressDataSource" id="bm_id6961272" localize="false"/><paragraph role="heading" id="hd_id3147285" xml-lang="en-US" level="1" l10n="U" oldref="2"><link href="text/shared/autopi/01170000.xhp" name="Address Data Source">Address Data Source</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotAddressDataSource" id="bm_id6961272" localize="false"/>
+<paragraph role="heading" id="hd_id3147285" xml-lang="en-US" level="1" l10n="U" oldref="2"><link href="text/shared/autopi/01170000.xhp" name="Address Data Source">Address Data Source</link></paragraph>
<paragraph role="paragraph" id="par_id3153910" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid=".">This wizard registers an existing address book as a data source in $[officename].</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#addressimport1"/>
+<embed href="text/shared/00/00000401.xhp#addressimport1"/>
</section>
<paragraph role="paragraph" id="par_id3151226" xml-lang="en-US" l10n="CHG" oldref="4">You can register address data and other data sources in $[officename] at any time:</paragraph>
<embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="U" oldref="9">Please select the type of your external address book</paragraph>
<paragraph role="paragraph" id="par_id5782036" xml-lang="en-US" l10n="NEW">Not all types are available on all systems.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK" id="bm_id3149096" localize="false"/><paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="3" l10n="U" oldref="10">Mozilla / Netscape</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK" id="bm_id3149096" localize="false"/>
+<paragraph role="heading" id="hd_id3154288" xml-lang="en-US" level="3" l10n="U" oldref="10">Mozilla / Netscape</paragraph>
<paragraph role="paragraph" id="par_id3145071" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK">Select this option if you already use an address book in Mozilla or Netscape.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_THUNDERBIRD" id="bm_id611896" localize="false"/><paragraph role="heading" id="hd_id3895382" xml-lang="en-US" level="3" l10n="NEW">Thunderbird</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_THUNDERBIRD" id="bm_id611896" localize="false"/>
+<paragraph role="heading" id="hd_id3895382" xml-lang="en-US" level="3" l10n="NEW">Thunderbird</paragraph>
<paragraph role="paragraph" id="par_id6709494" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in Thunderbird.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP" id="bm_id3147654" localize="false"/><paragraph role="heading" id="hd_id3149182" xml-lang="en-US" level="3" l10n="U" oldref="12">LDAP address data</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP" id="bm_id3147654" localize="false"/>
+<paragraph role="heading" id="hd_id3149182" xml-lang="en-US" level="3" l10n="U" oldref="12">LDAP address data</paragraph>
<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP">Select this option if you already have address data on an LDAP server.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK" id="bm_id3155435" localize="false"/><paragraph role="heading" id="hd_id3152780" xml-lang="en-US" level="3" l10n="CHG" oldref="14">Outlook address book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK" id="bm_id3155435" localize="false"/>
+<paragraph role="heading" id="hd_id3152780" xml-lang="en-US" level="3" l10n="CHG" oldref="14">Outlook address book</paragraph>
<paragraph role="paragraph" id="par_id3159176" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK">Select this option if you already use an address book in Microsoft Outlook (not Outlook Express).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OUTLOOKEXPRESS" id="bm_id926847" localize="false"/><paragraph role="heading" id="hd_id3154860" xml-lang="en-US" level="3" l10n="CHG" oldref="16">Windows system address book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OUTLOOKEXPRESS" id="bm_id926847" localize="false"/>
+<paragraph role="heading" id="hd_id3154860" xml-lang="en-US" level="3" l10n="CHG" oldref="16">Windows system address book</paragraph>
<paragraph role="paragraph" id="par_id3150254" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOKEXPRESS">Select this option if you already use an address book in Microsoft Outlook Express.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_KAB" id="bm_id926848" localize="false"/><paragraph role="heading" id="hd_id9215979" xml-lang="en-US" level="3" l10n="NEW">KDE Address book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_KAB" id="bm_id926848" localize="false"/>
+<paragraph role="heading" id="hd_id9215979" xml-lang="en-US" level="3" l10n="NEW">KDE Address book</paragraph>
<paragraph role="paragraph" id="par_id585650" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in KDE Address book.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_MACAB" id="bm_id926849" localize="false"/><paragraph role="heading" id="hd_id4791405" xml-lang="en-US" level="3" l10n="NEW">OS X Address book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_MACAB" id="bm_id926849" localize="false"/>
+<paragraph role="heading" id="hd_id4791405" xml-lang="en-US" level="3" l10n="NEW">OS X Address book</paragraph>
<paragraph role="paragraph" id="par_id6873683" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in OS X Address book.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION" id="bm_id827051" localize="false"/><paragraph role="heading" id="hd_id4517654" xml-lang="en-US" level="3" l10n="NEW">Evolution</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION" id="bm_id827051" localize="false"/>
+<paragraph role="heading" id="hd_id4517654" xml-lang="en-US" level="3" l10n="NEW">Evolution</paragraph>
<paragraph role="paragraph" id="par_id4368724" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in Evolution.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_LDAP" id="bm_id2706076" localize="false"/><paragraph role="heading" id="hd_id4218268" xml-lang="en-US" level="3" l10n="NEW">Evolution LDAP</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_LDAP" id="bm_id2706076" localize="false"/>
+<paragraph role="heading" id="hd_id4218268" xml-lang="en-US" level="3" l10n="NEW">Evolution LDAP</paragraph>
<paragraph role="paragraph" id="par_id6269112" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in Evolution LDAP.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_GROUPWISE" id="bm_id7849360" localize="false"/><paragraph role="heading" id="hd_id8174382" xml-lang="en-US" level="3" l10n="NEW">Groupwise</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_EVOLUTION_GROUPWISE" id="bm_id7849360" localize="false"/>
+<paragraph role="heading" id="hd_id8174382" xml-lang="en-US" level="3" l10n="NEW">Groupwise</paragraph>
<paragraph role="paragraph" id="par_id5294045" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this option if you already use an address book in Groupwise.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OTHER" id="bm_id9591051" localize="false"/><paragraph role="heading" id="hd_id3150976" xml-lang="en-US" level="3" l10n="U" oldref="18">Other external data source</paragraph>
+<bookmark xml-lang="en-US" branch="hid/extensions_RadioButton_RID_PAGE_SELECTABTYPE_RB_OTHER" id="bm_id9591051" localize="false"/>
+<paragraph role="heading" id="hd_id3150976" xml-lang="en-US" level="3" l10n="U" oldref="18">Other external data source</paragraph>
<paragraph role="paragraph" id="par_id3156192" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OTHER">Select this option if you want to register another data source as address book in $[officename].</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_CANCEL" id="bm_id3150771" localize="false"/><paragraph role="heading" id="hd_id3145674" xml-lang="en-US" level="2" l10n="U" oldref="21">Cancel</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_CANCEL" id="bm_id3150771" localize="false"/>
+<paragraph role="heading" id="hd_id3145674" xml-lang="en-US" level="2" l10n="U" oldref="21">Cancel</paragraph>
<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_ABSPILOT_CANCEL">Exits the wizard without implementing any changes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_PREVIOUS" id="bm_id3156024" localize="false"/><embed href="text/shared/autopi/01010000.xhp#zurueck"/>
+<embed href="text/shared/autopi/01010000.xhp#zurueck"/>
<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="HID_ABSPILOT_PREVIOUS" visibility="hidden">Go to previous step.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_NEXT" id="bm_id3154346" localize="false"/><embed href="text/shared/autopi/01010000.xhp#weiter"/>
+<embed href="text/shared/autopi/01010000.xhp#weiter"/>
<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="HID_ABSPILOT_NEXT" visibility="hidden">Go to next step.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_FINISH" id="bm_id3152812" localize="false"/><paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="2" l10n="U" oldref="5">Create</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT_FINISH" id="bm_id3152812" localize="false"/>
+<paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="2" l10n="U" oldref="5">Create</paragraph>
<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_ABSPILOT_FINISH">Establishes the connection to the data source and closes the dialog.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/makefile.mk b/helpcontent2/source/text/shared/autopi/makefile.mk
index 383d0e376c..c0c61ff588 100644
--- a/helpcontent2/source/text/shared/autopi/makefile.mk
+++ b/helpcontent2/source/text/shared/autopi/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/autopi/startup.xhp b/helpcontent2/source/text/shared/autopi/startup.xhp
index c9e138d2e3..579af0f79b 100644
--- a/helpcontent2/source/text/shared/autopi/startup.xhp
+++ b/helpcontent2/source/text/shared/autopi/startup.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: startup.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedautopistartupxhp" indexer="include" status="PUBLISH">
+<topic id="textsharedautopistartupxhp" indexer="include">
<title id="tit" xml-lang="en-US">Start-up Wizard</title>
<filename>/text/shared/autopi/startup.xhp</filename>
</topic>
@@ -47,17 +45,21 @@
<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">The Start-up Wizard opens when you start %PRODUCTNAME for the first time.</paragraph>
<paragraph role="paragraph" id="par_idN1055F" xml-lang="en-US" l10n="NEW">The wizard consists of the following pages:</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_WELCOME" id="bm_id8871120" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_DIALOG" id="bm_id3778496" localize="false"/><paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="2" l10n="NEW">Welcome</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_DIALOG" id="bm_id3778496" localize="false"/>
+<paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="2" l10n="NEW">Welcome</paragraph>
<paragraph role="paragraph" id="par_idN10566" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Start-up Wizard helps you to specify the user settings for %PRODUCTNAME. This wizard only runs once.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_LICENSE" id="bm_id9530930" localize="false"/><paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">License</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_LICENSE" id="bm_id9530930" localize="false"/>
+<paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="2" l10n="NEW">License</paragraph>
<paragraph role="paragraph" id="par_idN10579" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Read and accept the license text to continue. You need to scroll to the end of the license text before you can continue. If you decline the license, the installation is canceled.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_MIGRATION" id="bm_id4303415" localize="false"/><paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Migration</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_MIGRATION" id="bm_id4303415" localize="false"/>
+<paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2" l10n="NEW">Migration</paragraph>
<paragraph role="paragraph" id="par_idN1058C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">You can use this page to import user data from a previously installed version of %PRODUCTNAME.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1059F" xml-lang="en-US" level="3" l10n="NEW">Copy personal data</paragraph>
<paragraph role="paragraph" id="par_idN105A3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Copies the user name and other data from a previous %PRODUCTNAME installation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_USER" id="bm_id9908444" localize="false"/><paragraph role="heading" id="par_idN105B2" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_USER" id="bm_id9908444" localize="false"/>
+<paragraph role="heading" id="par_idN105B2" xml-lang="en-US" level="2" l10n="NEW">User name</paragraph>
<paragraph role="paragraph" id="par_idN105B6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The user name is used for the document properties, templates, and when you record changes made to documents. This page is only displayed if a previous installation of %PRODUCTNAME is not found on your computer.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter your personal data into the text boxes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIRSTSTART_REGISTRATION" id="bm_id2025818" localize="false"/><embed href="text/shared/01/08060100.xhp#registrierung"/>
+<embed href="text/shared/01/08060100.xhp#registrierung"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/autopi/webwizard00.xhp b/helpcontent2/source/text/shared/autopi/webwizard00.xhp
index 4033473bfa..92c2ab8f74 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard00.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard00.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: webwizard00.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedautopiwebwizard00xml" indexer="include" status="PUBLISH">
+<topic id="textsharedautopiwebwizard00xml" indexer="include">
<title id="tit" xml-lang="en-US">Web Wizard</title>
<filename>/text/shared/autopi/webwizard00.xhp</filename>
</topic>
-<history>
-<created date="2004-07-13T13:06:46">UFI: Web Wizard main page</created>
-<lastedited date="2006-02-24T11:06:34">dedr: reviewed</lastedited>
-</history>
</meta>
<body>
<section id="webwizard">
@@ -52,7 +48,7 @@
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid="34200">The Web Wizard helps you to maintain a web site on an Internet server.</ahelp>The Web Wizard converts files in a local folder to a web format and uploads the files to the server. The wizard also uses one of the supplied templates to create an index page that contains hyperlinks to the uploaded files.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#webwizard"/>
+<embed href="text/shared/00/00000401.xhp#webwizard"/>
</section>
<paragraph role="note" id="par_idN105C4" xml-lang="en-US" l10n="NEW">The Web Wizard uses the File Transfer Protocol (FTP) to upload files to a server. You cannot use the wizard to upload the files if you connect to the internet through a proxy server.</paragraph>
<paragraph role="paragraph" id="par_idN10574" xml-lang="en-US" l10n="NEW">The wizard involves the following steps:</paragraph>
@@ -63,8 +59,8 @@
<embed href="text/shared/autopi/webwizard05.xhp#design"/>
<embed href="text/shared/autopi/webwizard06.xhp#websiteinfo"/>
<embed href="text/shared/autopi/webwizard07.xhp#preview"/>
-<bookmark xml-lang="en-US" branch="hid/HID0_CANCEL" id="bm_id7899105" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID0_PREV" id="bm_id1207617" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID0_NEXT" id="bm_id480666" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/><comment>UFI: removed some form help ids</comment>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/02010100.xhp b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
index acde4d61f1..6f8bedd9dd 100755
--- a/helpcontent2/source/text/shared/explorer/database/02010100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02010100.xhp,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -71,7 +71,7 @@
<paragraph role="paragraph" id="par_id8307138" xml-lang="en-US" l10n="NEW">The Query Design window layout is stored with a created query, but cannot be stored with a created view.</paragraph>
<paragraph role="heading" id="hd_id3149233" xml-lang="en-US" level="2" l10n="U" oldref="3">The Design View</paragraph>
<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="CHG" oldref="4">To create a query, click the <emph>Queries</emph> icon in a database document, then click <emph>Create Query in Design View</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3150255" xml-lang="en-US" l10n="U" oldref="5">The lower pane of the Design View is where you <link href="text/shared/explorer/database/02010100.xhp" name="define">define</link> the query. To define a query, specify the database <link href="text/shared/explorer/database/02010100.xhp" name="field names">field names</link> to include and the <link href="text/shared/explorer/database/02010100.xhp" name="criteria">criteria</link> for displaying the fields. To rearrange the columns in the lower pane of the Design View, drag a column header to a new location, or select the column and press Ctrl+arrow key.</paragraph>
+<paragraph role="paragraph" id="par_id3150255" xml-lang="en-US" l10n="U" oldref="5">The lower pane of the Design View is where you <link href="text/shared/explorer/database/02010100.xhp" name="define">define</link> the query. To define a query, specify the database <link href="text/shared/explorer/database/02010100.xhp" name="field names">field names</link> to include and the <link href="text/shared/explorer/database/02010100.xhp" name="criteria">criteria</link> for displaying the fields. To rearrange the columns in the lower pane of the Design View, drag a column header to a new location, or select the column and press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+arrow key.</paragraph>
<paragraph role="paragraph" id="par_id3152474" xml-lang="en-US" l10n="CHG" oldref="6">In the top of the query Design View window, the <link href="text/shared/main0214.xhp" name="icons">icons</link> of the <emph>Query Design</emph> Bar and the <emph>Design</emph> bar are displayed.</paragraph>
<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="CHG" oldref="287">If you want to test a query, double-click the query name in the database document. The query result is displayed in a table similar to the Data Source View. Note: the table displayed is only temporary.</paragraph>
<paragraph role="heading" id="hd_id8226264" xml-lang="en-US" level="3" l10n="NEW">Keys in Query Design View</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/05020000.xhp b/helpcontent2/source/text/shared/explorer/database/05020000.xhp
index a7a72d892d..e648dca7a2 100644
--- a/helpcontent2/source/text/shared/explorer/database/05020000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05020000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05020000.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,19 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedexplorerdatabase05020000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabase05020000xml" indexer="include">
<title id="tit" xml-lang="en-US">Relations</title>
<filename>/text/shared/explorer/database/05020000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-28T10:37:28">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="relationen">
@@ -53,7 +50,7 @@
</section>
<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="HID_CTL_RELATIONTAB">Here you can link together tables from the current database through common data fields.</ahelp> Click the <emph>New Relation</emph> icon to create the relationships, or simply drag-and-drop with the mouse.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000450.xhp#relationen"/>
+<embed href="text/shared/00/00000450.xhp#relationen"/>
</section>
<paragraph role="note" id="par_id3145316" xml-lang="en-US" l10n="U" oldref="3">This function is only available if you are working with a relational database.</paragraph>
<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="CHG" oldref="4">When you choose <emph>Tools - Relationships</emph>, a window opens in which all the existing relationships between the tables of the current database are shown. If no relationships have been defined, or if you want to relate other tables of the database to each other, then click the <emph>Add Tables</emph> icon. The <link href="text/shared/02/14020100.xhp" name="Add Tables">Add Tables</link> dialog opens in which you can select the tables that you want.</paragraph>
@@ -68,9 +65,6 @@
<paragraph role="heading" id="hd_id3148922" xml-lang="en-US" level="2" l10n="U" oldref="6">Primary key and other key</paragraph>
<paragraph role="paragraph" id="par_id3149168" xml-lang="en-US" l10n="U" oldref="7">If you want to define a relation among the different tables, you should enter a <link href="text/shared/00/00000005.xhp#primaerschluessel" name="primary key">primary key</link> that clearly identifies a data field of the existing table. You can refer to the primary key from other tables to access the data of this table. All data fields referring to this primary key will be identified as an external key.</paragraph>
<paragraph role="paragraph" id="par_id3147085" xml-lang="en-US" l10n="U" oldref="8">All data fields referring to a primary key will be identified in the table window by a small key symbol.</paragraph>
-<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="9">For example, consider the "Item" table, where each individual record can be defined by an item number. The "Item-Number" field is a unique key in this table, and is referred to as a "primary key".</paragraph>
-<paragraph role="paragraph" id="par_id3158410" xml-lang="en-US" l10n="U" oldref="10">There is an additional table with the name "Orders" in the database. The number of the ordered item is assigned to each record in this table through an "Item-Number" field. This field is also a key field. It contains a key used to access the records of another table, in this case the "Item" table. For this reason, this field is referred to as the "foreign key".</paragraph>
-<paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="U" oldref="11">A relation is used to relate the primary key of the "Article" sheet and the other key of the "Orders" sheet.</paragraph>
<paragraph role="heading" id="hd_id3153193" xml-lang="en-US" level="2" l10n="U" oldref="12">Define relations</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155430"><bookmark_value>relations; creating and deleting (Base)</bookmark_value>
</bookmark><comment>mw added "(Base)"</comment>
diff --git a/helpcontent2/source/text/shared/explorer/database/11030000.xhp b/helpcontent2/source/text/shared/explorer/database/11030000.xhp
index 67ea120137..069f855c6b 100644
--- a/helpcontent2/source/text/shared/explorer/database/11030000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11030000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 11030000.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,31 +32,35 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabase11030000xml" indexer="exclude" status="PUBLISH">
+<topic id="textsharedexplorerdatabase11030000xml" indexer="exclude">
<title id="tit" xml-lang="en-US">dBASE</title>
<filename>/text/shared/explorer/database/11030000.xhp</filename>
</topic>
</meta>
<body>
-<section id="dbase"><comment>ufi: removed remaining two index entries</comment><comment>mw added "(Base)" to all 4 entries and transferred 2 entries to shared/explorer/database/dabawiz02dbase.xhp</comment><paragraph role="heading" id="hd_id3153539" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/11030000.xhp" name="dBase">dBASE</link><comment>still two Help IDs in this file. Else file can be removed</comment></paragraph>
+<section id="dbase"><comment>ufi: removed remaining two index entries</comment><comment>mw added "(Base)" to all 4 entries and transferred 2 entries to shared/explorer/database/dabawiz02dbase.xhp</comment>
+<paragraph role="heading" id="hd_id3153539" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/11030000.xhp" name="dBase">dBASE</link><comment>still two Help IDs in this file. Else file can be removed</comment></paragraph>
<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="">Specify the settings for a dBASE database.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000450.xhp#dBase"/>
+<embed href="text/shared/00/00000450.xhp#dBase"/>
</section>
<paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U" oldref="18">To be able to define relations between tables, use JDBC or ODBC from within $[officename].</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SHOWDELETED" id="bm_id3154142" localize="false"/><paragraph role="heading" id="hd_id3149233" xml-lang="en-US" level="2" l10n="U" oldref="4">Display inactive records</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SHOWDELETED" id="bm_id3154142" localize="false"/>
+<paragraph role="heading" id="hd_id3149233" xml-lang="en-US" level="2" l10n="U" oldref="4">Display inactive records</paragraph>
<paragraph role="paragraph" id="par_id3153823" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="HID_DSADMIN_SHOWDELETED">Displays all the records in a file, including those marked as deleted. If you select this check box, you cannot delete records.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="17">In dBASE format, deleted records remain in the file. </paragraph>
<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="15">To view any changes that you make to the database, close the connection to the database, and then reconnect the database.</paragraph>
<paragraph role="paragraph" id="par_id6051820" xml-lang="en-US" l10n="NEW"><comment>UFI: deleted note about case sensitivity. Should be not other than for all other files.</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHARSET_DBASE" id="bm_id3154760" localize="false"/><embed href="text/shared/explorer/database/11020000.xhp#zeichensatz"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHARSET_DBASE" id="bm_id3154760" localize="false"/>
+<paragraph role="paragraph" id="par_id0904200811094971" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the code conversion that you want to use to view the database in $[officename]. This does not affect the database.</ahelp></paragraph>
+<embed href="text/shared/explorer/database/11020000.xhp#zeichensatz"/>
<embed href="text/shared/explorer/database/11020000.xhp#sql92"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DBASE_INDICIES" id="bm_id3151056" localize="false"/><paragraph role="heading" id="hd_id3149047" xml-lang="en-US" level="2" l10n="U" oldref="8">Indexes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DBASE_INDICIES" id="bm_id3151056" localize="false"/>
+<paragraph role="heading" id="hd_id3149047" xml-lang="en-US" level="2" l10n="U" oldref="8">Indexes</paragraph>
<paragraph role="paragraph" id="par_id3161656" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_DSADMIN_DBASE_INDICIES">Opens the <link href="text/shared/explorer/database/11030100.xhp" name="Indexes"><emph>Indexes</emph></link> dialog, where you can organize the table indexes in the current dBASE database.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
index 56ecba807b..54d89b3bd9 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dabaadvpropdat.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabasedabaadvpropdatxml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasedabaadvpropdatxml" indexer="include">
<title id="tit" xml-lang="en-US">Special Settings</title>
<filename>/text/shared/explorer/database/dabaadvpropdat.xhp</filename>
</topic>
@@ -54,31 +52,44 @@
<paragraph role="paragraph" id="par_id4572283" xml-lang="en-US" l10n="NEW">The availability of the following controls depends on the type of database:</paragraph>
<paragraph role="heading" id="par_idN10590" xml-lang="en-US" level="2" l10n="NEW">Use SQL92 naming constraints<comment>UFI: found this for dBase and for text file folder</comment></paragraph>
<paragraph role="paragraph" id="par_idN10594" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only allows characters that conform to the SQL92 naming convention in a name in a data source. All other characters are rejected. Each name must begin with a lowercase letter, an uppercase letter, or an underscore ( _ ). The remaining characters can be ASCII letters, numbers, and underscores.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/><paragraph role="heading" id="hd_id3534958" xml-lang="en-US" level="2" l10n="NEW">End text lines with CR + LF<comment>UFI: found for dBase and text file folder</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/>
+<paragraph role="heading" id="hd_id3534958" xml-lang="en-US" level="2" l10n="NEW">End text lines with CR + LF<comment>UFI: found for dBase and text file folder</comment></paragraph>
<paragraph role="paragraph" id="par_id6151921" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to use the CR + LF code pair to end every text line (preferred for DOS and Windows operating systems).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_APPENDTABLEALIAS" id="bm_id9050569" localize="false"/><paragraph role="heading" id="par_idN1059E" xml-lang="en-US" level="2" l10n="NEW">Append the table alias name in SELECT statements</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_APPENDTABLEALIAS" id="bm_id9050569" localize="false"/>
+<paragraph role="heading" id="par_idN1059E" xml-lang="en-US" level="2" l10n="NEW">Append the table alias name in SELECT statements</paragraph>
<paragraph role="paragraph" id="par_idN105A2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Appends the alias to the table name in SELECT statements.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_ENABLEOUTERJOIN" id="bm_id7278664" localize="false"/><paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="2" l10n="NEW">Use Outer Join syntax '{OJ }'</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_ENABLEOUTERJOIN" id="bm_id7278664" localize="false"/>
+<paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="2" l10n="NEW">Use Outer Join syntax '{OJ }'</paragraph>
<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use escape sequences for outer joins. The syntax for this escape sequence is {oj outer-join}</ahelp><comment>copied from shared\explorer\database\02010100.xhp</comment></paragraph>
<paragraph role="paragraph" id="par_idN105BE" xml-lang="en-US" l10n="NEW">Example:</paragraph>
<paragraph role="example" id="par_idN105C1" xml-lang="en-US" l10n="NEW">select Article.* from {oj item LEFT OUTER JOIN orders ON item.no=orders.ANR}</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_IGNOREDRIVER_PRIV" id="bm_id3826715" localize="false"/><paragraph role="heading" id="par_idN105C4" xml-lang="en-US" level="2" l10n="NEW">Ignore the privileges from the database driver</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_IGNOREDRIVER_PRIV" id="bm_id3826715" localize="false"/>
+<paragraph role="heading" id="par_idN105C4" xml-lang="en-US" level="2" l10n="NEW">Ignore the privileges from the database driver</paragraph>
<paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Ignores access privileges that are provided by the database driver.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_PARAMETERNAMESUBST" id="bm_id8939786" localize="false"/><paragraph role="heading" id="par_idN105CB" xml-lang="en-US" level="2" l10n="NEW">Replace named parameters with ?</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_PARAMETERNAMESUBST" id="bm_id8939786" localize="false"/>
+<paragraph role="heading" id="par_idN105CB" xml-lang="en-US" level="2" l10n="NEW">Replace named parameters with ?</paragraph>
<paragraph role="paragraph" id="par_idN105CF" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Replaces named parameters in a data source with a question mark (?).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SUPPRESS_VERSIONCL" id="bm_id6642353" localize="false"/><paragraph role="heading" id="par_idN105D2" xml-lang="en-US" level="2" l10n="NEW">Display version columns (when available)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SUPPRESS_VERSIONCL" id="bm_id6642353" localize="false"/>
+<paragraph role="heading" id="par_idN105D2" xml-lang="en-US" level="2" l10n="NEW">Display version columns (when available)</paragraph>
<paragraph role="paragraph" id="par_idN105D6" xml-lang="en-US" l10n="NEW">Some databases assign version numbers to fields to track changes to records. The version number of a field is incremented by one each time the contents of the field are changed. <ahelp hid="HID_DSADMIN_SUPPRESS_VERSIONCL">Displays the internal version number of the record in the database table.</ahelp><comment>copied from shared\explorer\database\11090000.xhp</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CATALOG" id="bm_id2444532" localize="false"/><paragraph role="heading" id="par_idN105FA" xml-lang="en-US" level="2" l10n="NEW">Use the catalog name in SELECT statements</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CATALOG" id="bm_id2444532" localize="false"/>
+<paragraph role="heading" id="par_idN105FA" xml-lang="en-US" level="2" l10n="NEW">Use the catalog name in SELECT statements</paragraph>
<paragraph role="paragraph" id="par_idN105FE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Uses the current data source of the catalog. This option is useful when the ODBC data source is a database server. Do not select this option if the ODBC data source is a dBASE driver.</ahelp><comment>copie from shared\explorer\database\11020000.xhp</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SCHEMA" id="bm_id7354655" localize="false"/><paragraph role="heading" id="par_idN10613" xml-lang="en-US" level="2" l10n="NEW">Use the schema name in SELECT statements</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_SCHEMA" id="bm_id7354655" localize="false"/>
+<paragraph role="heading" id="par_idN10613" xml-lang="en-US" level="2" l10n="NEW">Use the schema name in SELECT statements</paragraph>
<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Allows you to use the schema name in SELECT statements.</ahelp><comment>UFI: ???</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_IGNOREINDEXAPPENDIX" id="bm_id321665" localize="false"/><paragraph role="heading" id="par_idN1061A" xml-lang="en-US" level="2" l10n="NEW">Create index with ASC or DESC statement</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_IGNOREINDEXAPPENDIX" id="bm_id321665" localize="false"/>
+<paragraph role="heading" id="par_idN1061A" xml-lang="en-US" level="2" l10n="NEW">Create index with ASC or DESC statement</paragraph>
<paragraph role="paragraph" id="par_idN1061E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates an index with ASC or DESC statements.</ahelp><comment>UFI: ???</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_BOOLEANCOMPARISON" id="bm_id5289773" localize="false"/><paragraph role="heading" id="par_idN10621" xml-lang="en-US" level="2" l10n="NEW">Comparison of Boolean values</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_BOOLEANCOMPARISON" id="bm_id5289773" localize="false"/>
+<paragraph role="heading" id="par_idN10621" xml-lang="en-US" level="2" l10n="NEW">Comparison of Boolean values</paragraph>
<paragraph role="paragraph" id="par_idN10625" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the type of Boolean comparison that you want to use.</ahelp><comment>UFI: ???</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHECK_REQUIRED_FIELDS" id="bm_id4741355" localize="false"/><paragraph role="heading" id="hd_id1101718" xml-lang="en-US" level="2" l10n="NEW">Form data input checks for required fields<comment>i82291</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_CHECK_REQUIRED_FIELDS" id="bm_id4741355" localize="false"/>
+<paragraph role="heading" id="hd_id1101718" xml-lang="en-US" level="2" l10n="NEW">Form data input checks for required fields<comment>i82291</comment></paragraph>
<paragraph role="paragraph" id="par_id3783989" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When you enter a new record or update an existing record in a form, and you leave a field empty which is bound to a database column which requires input, then you will see a message complaining about the empty field.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id6684163" xml-lang="en-US" l10n="NEW">If this control box is not enabled, then the forms in the current database will not be checked for required fields.</paragraph>
<paragraph role="paragraph" id="par_id3837397" xml-lang="en-US" l10n="NEW">The control box is available for all data source types which support write access to their data. The control box does not exist for spreadsheets, text, csv, and the various read-only address books.</paragraph>
+<paragraph role="heading" id="hd_id0909200811170166" xml-lang="en-US" level="2" l10n="NEW">Ignore currency field information</paragraph>
+<paragraph role="paragraph" id="par_id0909200811170221" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only for Oracle JDBC connections. When enabled it specifies that no column is treated as a currency field. The field type returned from the database driver is discarded.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
index 2c88ea5ba9..402ffb81e8 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz00.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dabawiz00.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabasedabawiz00xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasedabawiz00xml" indexer="include">
<title id="tit" xml-lang="en-US">Database Wizard</title>
<filename>/text/shared/explorer/database/dabawiz00.xhp</filename>
</topic>
@@ -46,35 +44,38 @@
<section id="dabawiz00">
<bookmark xml-lang="en-US" branch="index" id="bm_id2026429"><bookmark_value>wizards;databases (Base)</bookmark_value>
<bookmark_value>Database Wizard (Base)</bookmark_value>
+<bookmark_value>databases; formats (Base)</bookmark_value>
+<bookmark_value>MySQL databases (Base)</bookmark_value>
+<bookmark_value>dBASE; database settings (Base)</bookmark_value>
+<bookmark_value>spreadsheets;as databases (base)</bookmark_value>
</bookmark><comment>mw added "(Base)" to all entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_DLG_DATABASE_WIZARD" id="bm_id3952452" localize="false"/><comment>UFI: added Help ID, see #i62242</comment><paragraph role="heading" id="par_idN105B4" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_DATABASE_WIZARD" id="bm_id3952452" localize="false"/><comment>UFI: added Help ID, see #i62242</comment>
+<paragraph role="heading" id="par_idN105B4" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
<paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The Database Wizard creates a database file that contains information about a database.</ahelp><comment>UFI: extended help text must no longer contain switches or links</comment></paragraph>
<paragraph role="paragraph" id="par_id9856563" xml-lang="en-US" l10n="NEW">The Database Wizard creates a <link href="text/shared/explorer/database/dabadoc.xhp">database file</link> that contains information about a database.</paragraph>
</section>
<paragraph role="paragraph" id="par_idN105D5" xml-lang="en-US" l10n="NEW">Depending on the type of operation and the type of database, the Database Wizard consists of a varying number of steps.</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US" l10n="NEW">If you create a new database file, the wizard contains two steps.</paragraph>
</listitem>
</list>
<embed href="text/shared/explorer/database/dabawiz01.xhp#dabaselection"/>
<embed href="text/shared/explorer/database/dabawiz02.xhp#nextsteps"/>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US" l10n="NEW">If you open the Database Wizard to create a database file for an existing database connection, there may be more steps to specify paths, authentication information, and more.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_idN105F2" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02text.xhp">Set up text file connection</link></paragraph>
<switch select="sys">
-<case select="WIN"><paragraph role="paragraph" id="par_idN10601" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02access.xhp">Set up Microsoft Access connection</link></paragraph>
+<case select="WIN">
+<paragraph role="paragraph" id="par_idN10601" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02access.xhp">Set up Microsoft Access connection</link></paragraph>
<paragraph role="paragraph" id="par_idN1062E" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02ado.xhp">Set up ADO connection</link></paragraph>
</case>
</switch>
<paragraph role="paragraph" id="par_idN10610" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02ldap.xhp">Set up LDAP connection</link></paragraph>
-<switch select="distrib">
-<case select="COMMERCIAL"><paragraph role="paragraph" id="par_idN1061F" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02adabas.xhp">Set up Adabas D connection</link></paragraph>
-</case>
-</switch>
+<paragraph role="paragraph" id="par_idN1061F" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02adabas.xhp">Set up Adabas D connection</link></paragraph>
<paragraph role="paragraph" id="par_idN1070F" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02dbase.xhp">Set up dBASE connection</link></paragraph>
<paragraph role="paragraph" id="par_idN1063D" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02jdbc.xhp">Set up JDBC connection</link></paragraph>
<paragraph role="paragraph" id="par_idN1064C" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02oracle.xhp">Set up Oracle database connection</link></paragraph>
@@ -82,7 +83,7 @@
<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02odbc.xhp">ODBC settings</link></paragraph>
<paragraph role="paragraph" id="par_idN10679" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz02spreadsheet.xhp">Set up Spreadsheet connection</link></paragraph>
<embed href="text/shared/00/00000001.xhp#abbrechen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DBWIZ_PREVIOUS" id="bm_id5176244" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DBWIZ_NEXT" id="bm_id1058076" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
index 39a181776f..f291ee3af7 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz01.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dabawiz01.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabasedabawiz01xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasedabawiz01xml" indexer="include">
<title id="tit" xml-lang="en-US">Database Selection</title>
<filename>/text/shared/explorer/database/dabawiz01.xhp</filename>
</topic>
@@ -45,25 +43,31 @@
<body>
<section id="dabaselection">
<bookmark xml-lang="en-US" branch="index" id="bm_id2082583"><bookmark_value>databases; connecting (Base)</bookmark_value>
-<bookmark_value>databases; formats (Base)</bookmark_value>
-</bookmark><comment>mw copied two entries from shared/explorer/database/11010000.xhp</comment><paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabawiz01.xhp">Database Selection</link></paragraph>
+</bookmark><comment>mw moved databases;formats (base) to shared/explorer/database/dabawiz00.xhp</comment>
+<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/dabawiz01.xhp">Database Selection</link></paragraph>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Creates a new database, opens a database file, or connects to an existing database.</ahelp></paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE" id="bm_id2482985" localize="false"/><paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Create a new database</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE" id="bm_id2482985" localize="false"/>
+<paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Create a new database</paragraph>
<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to create a new database. </ahelp>This option uses the HSQL database engine with default settings. The final page of the wizard appears next.</paragraph>
<paragraph role="paragraph" id="par_id8584246" xml-lang="en-US" l10n="NEW"><link href="http://hsqldb.org/">External web page about HSQL</link>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_OPENEXISTINGDOC" id="bm_id8278756" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC" id="bm_id2400585" localize="false"/><paragraph role="heading" id="par_idN105F9" xml-lang="en-US" level="2" l10n="NEW">Open an existing database file</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC" id="bm_id2400585" localize="false"/>
+<paragraph role="heading" id="par_idN105F9" xml-lang="en-US" level="2" l10n="NEW">Open an existing database file</paragraph>
<paragraph role="paragraph" id="par_idN105FD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to open a database file from a list of recently used files or from a file selection dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_LB_DOCUMENTLIST" id="bm_id2050538" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST" id="bm_id5958128" localize="false"/><paragraph role="heading" id="par_idN10614" xml-lang="en-US" level="3" l10n="NEW">Recently used</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess_ListBox_PAGE_GENERAL_LB_DOCUMENTLIST" id="bm_id5958128" localize="false"/>
+<paragraph role="heading" id="par_idN10614" xml-lang="en-US" level="3" l10n="NEW">Recently used</paragraph>
<paragraph role="paragraph" id="par_idN10618" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a database file to open from the list of recently used files. Click Finish to open the file immediately and to exit the wizard.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_PB_OPENDOCUMENT" id="bm_id1602832" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_PAGE_GENERAL_PB_OPENDOCUMENT" id="bm_id6427198" localize="false"/><paragraph role="heading" id="par_idN1062F" xml-lang="en-US" level="3" l10n="NEW">Open</paragraph>
+<bookmark xml-lang="en-US" branch="hid/dbaccess_PushButton_PAGE_GENERAL_PB_OPENDOCUMENT" id="bm_id6427198" localize="false"/>
+<paragraph role="heading" id="par_idN1062F" xml-lang="en-US" level="3" l10n="NEW">Open</paragraph>
<paragraph role="paragraph" id="par_idN10633" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a file selection dialog where you can select a database file. Click Open or OK in the file selection dialog to open the file immediately and to exit the wizard.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE" id="bm_id5028229" localize="false"/><paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="2" l10n="NEW">Connect to an existing database</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE" id="bm_id5028229" localize="false"/>
+<paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="2" l10n="NEW">Connect to an existing database</paragraph>
<paragraph role="paragraph" id="par_idN10590" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to create a database document for an existing database connection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DSTYPE" id="bm_id763267" localize="false"/><paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="3" l10n="NEW">Database type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DSTYPE" id="bm_id763267" localize="false"/>
+<paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="3" l10n="NEW">Database type</paragraph>
<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the database type for the existing database connection.</ahelp></paragraph>
<paragraph role="note" id="par_idN1059A" xml-lang="en-US" l10n="NEW">The Outlook, Evolution, KDE Address Book, and Mozilla database types do not need additional information. For other database types, the wizard contains additional pages to specify the required information.</paragraph>
<paragraph role="paragraph" id="par_idN10611" xml-lang="en-US" l10n="NEW">The next wizard page is one of the following pages:</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
index 0ba4510fbe..6ed78e6944 100644
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02dbase.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dabawiz02dbase.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,23 +32,22 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabasedabawiz02dbasexhp" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasedabawiz02dbasexhp" indexer="include">
<title id="tit" xml-lang="en-US">dBASE Connection </title>
<filename>/text/shared/explorer/database/dabawiz02dbase.xhp</filename>
</topic>
</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id8295846"><bookmark_value>dBASE; database settings (Base)</bookmark_value>
-<bookmark_value>databases; dBASE (Base)</bookmark_value>
-</bookmark><comment>mw changed dBase to dBASE</comment><paragraph role="heading" id="par_idN1054A" xml-lang="en-US" level="1" l10n="CHG"><variable id="dbase"><link href="text/shared/explorer/database/dabawiz02dbase.xhp">dBASE Connection</link>
+<body><comment>** Expression is faulty **</comment>
+<paragraph role="heading" id="par_idN1054A" xml-lang="en-US" level="1" l10n="CHG"><variable id="dbase"><link href="text/shared/explorer/database/dabawiz02dbase.xhp">dBASE Connection</link>
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION" id="bm_id2821131" localize="false"/><paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="CHG">Path to the dBASE files</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION" id="bm_id2821131" localize="false"/>
+<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="CHG">Path to the dBASE files</paragraph>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the path to the dBASE *.dbf files.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION" id="bm_id9754631" localize="false"/><paragraph role="heading" id="par_idN10571" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION" id="bm_id9754631" localize="false"/>
+<paragraph role="heading" id="par_idN10571" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
<paragraph role="paragraph" id="par_idN10575" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Open a path selection dialog.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
index 3e19246766..6f5e555579 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02mysql.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dabawiz02mysql.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,22 +32,15 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedexplorerdatabasedabawiz02mysqlxml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasedabawiz02mysqlxml" indexer="include">
<title id="tit" xml-lang="en-US">MySQL Connection</title>
<filename>/text/shared/explorer/database/dabawiz02mysql.xhp</filename>
</topic>
-<history>
-<created date="2004-07-28T16:18:21">UFI: Database Wizard MySQL page</created>
-<lastedited date="2006-04-28T12:52:09">YJ: checked</lastedited>
-</history>
</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id6656086"><bookmark_value>MySQL databases (Base)</bookmark_value>
-<bookmark_value>databases;MySQL (Base)</bookmark_value>
-</bookmark><comment>mw copied two entries from shared/explorer/database/11120000.xhp</comment>
+<body><comment>** Expression is faulty **</comment>
<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><variable id="mysql"><link href="text/shared/explorer/database/dabawiz02mysql.xhp">MySQL Connection</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1054D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the options for MySQL databases.</ahelp><comment>text copied from shared\explorer\database\11120000</comment></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
index 5448c0b08d..1ec3a89afc 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dabawiz02spreadsheet.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,21 +32,15 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedexplorerdatabasedabawiz02spreadsheetxml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasedabawiz02spreadsheetxml" indexer="include">
<title id="tit" xml-lang="en-US">Spreadsheet Database Connection</title>
<filename>/text/shared/explorer/database/dabawiz02spreadsheet.xhp</filename>
</topic>
-<history>
-<created date="2004-07-28T16:35:30">UFI: Database Wizard Spreadsheet page</created>
-<lastedited date="2007-01-16T10:56:10">YJ: checked</lastedited>
-</history>
</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3656727"><bookmark_value>spreadsheets;as databases (base)</bookmark_value>
-</bookmark><comment>mw changed the index entry</comment>
+<body><comment>** Expression is faulty **</comment>
<paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1" l10n="NEW">Spreadsheet Database Connection</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH" id="bm_id5975218" localize="false"/>
<paragraph role="heading" id="par_idN1053E" xml-lang="en-US" level="2" l10n="NEW">Location and file name</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/makefile.mk b/helpcontent2/source/text/shared/explorer/database/makefile.mk
index 99be399975..3492dd4323 100644
--- a/helpcontent2/source/text/shared/explorer/database/makefile.mk
+++ b/helpcontent2/source/text/shared/explorer/database/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.13 $
+# $Revision: 1.13.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
index c3a81a4575..0019cd3083 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard00.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: querywizard00.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,20 +32,17 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedexplorerdatabasequerywizard00xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasequerywizard00xml" indexer="include">
<title id="tit" xml-lang="en-US">Query Wizard</title>
<filename>/text/shared/explorer/database/querywizard00.xhp</filename>
</topic>
-<history>
-<created date="2004-07-05T16:31:02">UFI: new Query Wizard</created>
-<lastedited date="2006-11-28T09:12:38">YJ: checked</lastedited>
-</history>
</meta>
<body>
<section id="querywizard"><comment>mw deleted 2 index entries</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD" id="bm_id1895159" localize="false"/>
<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/querywizard00.xhp">Query Wizard</link></paragraph>
<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Query Wizard helps you to design a database query.</ahelp> The saved query can be called later, either from the graphical user interface, or using the automatically created SQL language command.</paragraph>
</section>
@@ -57,11 +54,10 @@
<embed href="text/shared/explorer/database/querywizard06.xhp#groupingconditions"/>
<embed href="text/shared/explorer/database/querywizard07.xhp#aliases"/>
<embed href="text/shared/explorer/database/querywizard08.xhp#overview"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_BACK" id="bm_id3681447" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDNEXT" id="bm_id3147576" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_NEXT" id="bm_id4154179" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CREATE" id="bm_id189519" localize="false"/><embed href="text/shared/00/00000001.xhp#finish"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CANCEL" id="bm_id7074800" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<embed href="text/shared/00/00000001.xhp#finish"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
<paragraph role="paragraph" id="par_idN105D2" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/querywizard01.xhp" name="Query Wizard - Field Selection">Query Wizard - Field selection</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
index 9f4172f9ee..ea6dd5a01d 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard01.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: querywizard01.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedexplorerdatabasequerywizard01xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasequerywizard01xml" indexer="include">
<title id="tit" xml-lang="en-US">Query Wizard - Field Selection</title>
<filename>/text/shared/explorer/database/querywizard01.xhp</filename>
</topic>
-<history>
-<created date="2004-07-05T16:36:14">UFI: new Query Wizard page 1</created>
-<lastedited date="2006-02-14T13:38:03">YJ: checked</lastedited>
-</history>
</meta>
<body>
<section id="fieldselection">
@@ -52,13 +48,12 @@
<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTTABLES" id="bm_id8819849" localize="false"/>
<paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Tables</paragraph>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the table for which the query is to be created.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFIELDS" id="bm_id4751121" localize="false"/><embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVESELECTED" id="bm_id9028595" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEALL" id="bm_id3862117" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDREMOVESELECTED" id="bm_id2427442" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDREMOVEALL" id="bm_id9287697" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEUP" id="bm_id3135166" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDMOVEDOWN" id="bm_id5736259" localize="false"/><embed href="text/shared/autopi/01090100.xhp#updown"/>
+<embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernen"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
+<embed href="text/shared/autopi/01090100.xhp#updown"/>
<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTSELFIELDS" id="bm_id5718253" localize="false"/>
<paragraph role="heading" id="par_idN10590" xml-lang="en-US" level="2" l10n="NEW">Fields in the Query</paragraph>
<paragraph role="paragraph" id="par_idN10594" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all fields that will be included in the new query.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp b/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
index cea5f798d8..cd5d31bb94 100755
--- a/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/querywizard05.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: querywizard05.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,29 +30,25 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedexplorerdatabasequerywizard05xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasequerywizard05xml" indexer="include">
<title id="tit" xml-lang="en-US">Query Wizard - Grouping</title>
<filename>/text/shared/explorer/database/querywizard05.xhp</filename>
</topic>
-<history>
-<created date="2004-07-06T09:50:03">UFI: new Query Wizard page 5</created>
-<lastedited date="2005-03-02T10:07:06">YJ: checked</lastedited>
-</history>
</meta>
<body>
<section id="grouping">
<paragraph role="heading" id="par_idN10546" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/querywizard05.xhp">Query Wizard - Grouping</link></paragraph>
<paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">Specifies whether to group the query. The data source must support the SQL statement "Order by clauses" to enable this page of the Wizard.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFILTERFIELDS" id="bm_id2533341" localize="false"/><embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVESELECTED" id="bm_id4933927" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERREMOVESELECTED" id="bm_id9915768" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVEUP" id="bm_id1707815" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_CMDFILTERMOVEDOWN" id="bm_id6916714" localize="false"/><embed href="text/shared/autopi/01090100.xhp#updown"/>
+<embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernen"/>
+<embed href="text/shared/autopi/01090100.xhp#updown"/>
<bookmark xml-lang="en-US" branch="hid/HID_QUERYWIZARD_LSTFILTERSELFIELDS" id="bm_id1776482" localize="false"/>
<paragraph role="heading" id="par_idN10589" xml-lang="en-US" level="2" l10n="NEW">Group by</paragraph>
<paragraph role="paragraph" id="par_idN1058D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all fields that are to be used to group the query.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
index 619bf0a815..44889a3944 100755
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard00.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: tablewizard00.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabasetablewizard00xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasetablewizard00xml" indexer="include">
<title id="tit" xml-lang="en-US">Table Wizard</title>
<filename>/text/shared/explorer/database/tablewizard00.xhp</filename>
</topic>
@@ -47,17 +45,18 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id6009094"><bookmark_value>wizards;database tables (Base)</bookmark_value>
<bookmark_value>Table Wizard (Base)</bookmark_value>
</bookmark><comment>mw added "(Base)" to all entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_DIALOG" id="bm_id406201" localize="false"/><paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/tablewizard00.xhp">Table Wizard</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_DIALOG" id="bm_id406201" localize="false"/>
+<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/explorer/database/tablewizard00.xhp">Table Wizard</link></paragraph>
<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Table Wizard helps you to create a database table.</ahelp></paragraph>
</section>
<embed href="text/shared/explorer/database/tablewizard01.xhp#selecttable"/>
<embed href="text/shared/explorer/database/tablewizard02.xhp#settype"/>
<embed href="text/shared/explorer/database/tablewizard03.xhp#setprimary"/>
<embed href="text/shared/explorer/database/tablewizard04.xhp#createtable"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDPREV" id="bm_id1064180" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDNEXT" id="bm_id8281197" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDFINISH" id="bm_id3211157" localize="false"/><embed href="text/shared/00/00000001.xhp#finish"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDCANCEL" id="bm_id4245124" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/>
+<embed href="text/shared/00/00000001.xhp#zurueckautopi"/>
+<embed href="text/shared/00/00000001.xhp#weiterautopi"/>
+<embed href="text/shared/00/00000001.xhp#finish"/>
+<embed href="text/shared/00/00000001.xhp#abbrechen"/>
<paragraph role="paragraph" id="par_idN105AF" xml-lang="en-US" l10n="CHG"><link href="text/shared/explorer/database/tablewizard01.xhp" name="Table Wizard - Select fields">Table Wizard - Select fields</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp b/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
index 909e3ee22f..043f97aefb 100755
--- a/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/tablewizard01.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: tablewizard01.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedexplorerdatabasetablewizard01xml" indexer="include" status="PUBLISH">
+<topic id="textsharedexplorerdatabasetablewizard01xml" indexer="include">
<title id="tit" xml-lang="en-US">Table Wizard - Select Fields</title>
<filename>/text/shared/explorer/database/tablewizard01.xhp</filename>
</topic>
@@ -47,20 +45,23 @@
<paragraph role="heading" id="par_idN10546" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/explorer/database/tablewizard01.xhp">Table Wizard - Select Fields</link></paragraph>
<paragraph role="paragraph" id="par_idN10556" xml-lang="en-US" l10n="NEW">Select fields from the provided sample tables as a starting point to create your own table.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPTBUSINESS" id="bm_id9071932" localize="false"/><paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Business</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPTBUSINESS" id="bm_id9071932" localize="false"/>
+<paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2" l10n="NEW">Business</paragraph>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the business category to see only business sample tables.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPTPRIVATE" id="bm_id5322428" localize="false"/><paragraph role="heading" id="par_idN10560" xml-lang="en-US" level="2" l10n="NEW">Private</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_OPTPRIVATE" id="bm_id5322428" localize="false"/>
+<paragraph role="heading" id="par_idN10560" xml-lang="en-US" level="2" l10n="NEW">Private</paragraph>
<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the private category to see only private sample tables.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_LBTABLES" id="bm_id7499008" localize="false"/><paragraph role="heading" id="par_idN10567" xml-lang="en-US" level="2" l10n="NEW">Sample tables</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_LBTABLES" id="bm_id7499008" localize="false"/>
+<paragraph role="heading" id="par_idN10567" xml-lang="en-US" level="2" l10n="NEW">Sample tables</paragraph>
<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select one of the sample tables. Then select fields from that table from the left list box. Repeat this step until you have selected all the fields that you need.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_FIELDSAVAILABLE" id="bm_id560014" localize="false"/><embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVESELECTED" id="bm_id5441755" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEALL" id="bm_id6911221" localize="false"/><embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDREMOVESELECTED" id="bm_id3583483" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernen"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDREMOVEALL" id="bm_id86672" localize="false"/><embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEUP_PK_SELECTED" id="bm_id2638019" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED" id="bm_id6198309" localize="false"/><embed href="text/shared/autopi/01090100.xhp#updown"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_FIELDSSELECTED" id="bm_id6092104" localize="false"/><paragraph role="heading" id="par_idN1059E" xml-lang="en-US" level="2" l10n="CHG">Selected Fields</paragraph>
+<embed href="text/shared/autopi/01090100.xhp#vorhandenefelder"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmen"/>
+<embed href="text/shared/autopi/01090100.xhp#uebernehmealle"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernen"/>
+<embed href="text/shared/autopi/01090100.xhp#entfernealle"/>
+<embed href="text/shared/autopi/01090100.xhp#updown"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGTABLE_FIELDSSELECTED" id="bm_id6092104" localize="false"/>
+<paragraph role="heading" id="par_idN1059E" xml-lang="en-US" level="2" l10n="CHG">Selected Fields</paragraph>
<paragraph role="paragraph" id="par_idN105A4" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays all fields that will be included in the new table.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US" l10n="CHG"><link href="text/shared/explorer/database/tablewizard02.xhp" name="Table Wizard - Set types and formats">Table Wizard - Set types and formats</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/guide/aaa_start.xhp b/helpcontent2/source/text/shared/guide/aaa_start.xhp
index ef0998315b..186deae3c7 100755
--- a/helpcontent2/source/text/shared/guide/aaa_start.xhp
+++ b/helpcontent2/source/text/shared/guide/aaa_start.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: aaa_start.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguideaaa_startxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguideaaa_startxml" indexer="include">
<title id="tit" xml-lang="en-US">First Steps</title>
<filename>/text/shared/guide/aaa_start.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-11T14:25:22">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3156324"><bookmark_value>samples and templates</bookmark_value>
@@ -51,9 +49,10 @@
</variable></paragraph>
<paragraph role="heading" id="hd_id3156211" xml-lang="en-US" level="3" l10n="U" oldref="2">How to simplify your work using samples and templates</paragraph>
<paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="3">
-<item type="productname">%PRODUCTNAME</item> includes many sample documents and ready-to-use templates. You can access these by choosing <emph>File - New - </emph><link href="text/shared/01/01010100.xhp" name="Templates and Documents"><emph>Templates and Documents</emph></link>, or press Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N.</paragraph>
-<paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="4">When you call up one of the templates, a new document is created based on this template. You can also use the various Wizards (under the <emph>File</emph> menu) to create user-defined templates such as faxes and letters, which you can use as a basis for further documents.</paragraph>
+<item type="productname">%PRODUCTNAME</item> includes many sample documents and ready-to-use templates. You can access these by choosing <emph>File - New - </emph><link href="text/shared/01/01010100.xhp" name="Templates and Documents"><emph>Templates and Documents</emph></link>, or press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N.</paragraph>
+<paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="4">When you open one of the templates, a new document is created based on this template.</paragraph>
+<paragraph role="paragraph" id="par_id0820200803563860" xml-lang="en-US" l10n="NEW">Click the <emph>Get more templates online</emph> link in the dialog to select and download more templates.</paragraph>
+<paragraph role="paragraph" id="par_id0820200803563974" xml-lang="en-US" l10n="NEW">You can also use the various wizards (under the <emph>File - Wizards</emph> menu) to create your own templates, which you can use as a basis for further documents.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="6"><link href="text/shared/guide/main.xhp" name="Working with %PRODUCTNAME">Working with <item type="productname">%PRODUCTNAME</item></link></paragraph>
<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="WRITER"><link href="text/swriter/guide/main.xhp" name="Working with Text Documents">Working with Text Documents</link>
diff --git a/helpcontent2/source/text/shared/guide/autocorr_url.xhp b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
index 8b255c9869..8bbd2ce403 100755
--- a/helpcontent2/source/text/shared/guide/autocorr_url.xhp
+++ b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: autocorr_url.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -60,8 +60,7 @@
<paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="2" l10n="U" oldref="8">Undo URL Recognition</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3149233" xml-lang="en-US" l10n="U" oldref="3">When you are typing and notice that a text has just been automatically converted into a hyperlink, press <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z to undo this formatting.</paragraph>
+<paragraph role="listitem" id="par_id3149233" xml-lang="en-US" l10n="U" oldref="3">When you are typing and notice that a text has just been automatically converted into a hyperlink, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z to undo this formatting.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149235" xml-lang="en-US" l10n="CHG" oldref="4">If you do not notice this conversion until later, select the hyperlink and choose the menu command <emph>Format - Default Formatting</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/autohide.xhp b/helpcontent2/source/text/shared/guide/autohide.xhp
index c02905976d..ba649d369e 100644
--- a/helpcontent2/source/text/shared/guide/autohide.xhp
+++ b/helpcontent2/source/text/shared/guide/autohide.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: autohide.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -64,7 +64,7 @@
<paragraph role="listitem" id="par_id3150503" xml-lang="en-US" l10n="CHG" oldref="67">Drag the window by its title bar to the side, or</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="CHG" oldref="68">Double-click inside a vacant area of the window while holding down the Ctrl key. In the Styles and Formatting window, double-click a gray part of the window next to the icons while holding down the Ctrl key. Alternatively, press <item type="keycode">Ctrl+Shift+F10</item>.</paragraph>
+<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="CHG" oldref="68">Double-click inside a vacant area of the window while holding down the Ctrl key. In the Styles and Formatting window, double-click a gray part of the window next to the icons while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key. Alternatively, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10</item>.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="69">These methods can also be used to undock a currently docked window.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/breaking_lines.xhp b/helpcontent2/source/text/shared/guide/breaking_lines.xhp
index cd6ef63d76..943d1988b5 100755
--- a/helpcontent2/source/text/shared/guide/breaking_lines.xhp
+++ b/helpcontent2/source/text/shared/guide/breaking_lines.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: breaking_lines.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -62,7 +62,7 @@ YJ: checked</lastedited>
<paragraph role="heading" id="par_idN106D9" xml-lang="en-US" level="2" l10n="NEW">Inserting line breaks in $[officename] Calc spreadsheet cells</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="paragraph" id="par_idN106E0" xml-lang="en-US" l10n="NEW">To insert a line break in a spreadsheet cell, press the Ctrl+Enter keys. </paragraph>
+<paragraph role="paragraph" id="par_idN106E0" xml-lang="en-US" l10n="NEW">To insert a line break in a spreadsheet cell, press the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter keys. </paragraph>
<paragraph role="paragraph" id="par_idN106E3" xml-lang="en-US" l10n="NEW">This will work only with the text edit cursor inside the cell, not at the input line. So first double-click the cell, then single-click at the text position where you want the line break.</paragraph>
</listitem>
</list>
diff --git a/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp b/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
index a6bc31daa0..b685a7bf2c 100644
--- a/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
+++ b/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: copy_drawfunctions.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -56,15 +56,13 @@
<paragraph role="listitem" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="29">Select the drawing object or objects.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="31">Copy the drawing object to the clipboard, for example, by using <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C.</paragraph>
+<paragraph role="listitem" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="31">Copy the drawing object to the clipboard, for example, by using <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3152996" xml-lang="en-US" l10n="U" oldref="32">Switch to the other document and place the cursor where the drawing object is to be inserted.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149234" xml-lang="en-US" l10n="U" oldref="33">Insert the drawing object, for example, by using <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V.</paragraph>
+<paragraph role="listitem" id="par_id3149234" xml-lang="en-US" l10n="U" oldref="33">Insert the drawing object, for example, by using <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3147573" xml-lang="en-US" level="2" l10n="U" oldref="34">Inserting into a text document</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/copytext2application.xhp b/helpcontent2/source/text/shared/guide/copytext2application.xhp
index 52c824932b..f8cca36797 100644
--- a/helpcontent2/source/text/shared/guide/copytext2application.xhp
+++ b/helpcontent2/source/text/shared/guide/copytext2application.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: copytext2application.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -59,9 +59,7 @@
<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="4">You can insert text into other document types, such as spreadsheets and presentations. Note that there is a difference between whether the text is inserted into a text frame, a spreadsheet cell, or into the outline view of a presentation.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="5">If you copy text to the clipboard, you can paste it with or without text attributes. Use the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C to copy and <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V to paste.</paragraph>
+<paragraph role="listitem" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="5">If you copy text to the clipboard, you can paste it with or without text attributes. Use the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C to copy and <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V to paste.</paragraph>
</listitem>
</list>
<table id="tbl_id3166460">
diff --git a/helpcontent2/source/text/shared/guide/ctl.xhp b/helpcontent2/source/text/shared/guide/ctl.xhp
index 1c596e5d16..a539c61509 100755
--- a/helpcontent2/source/text/shared/guide/ctl.xhp
+++ b/helpcontent2/source/text/shared/guide/ctl.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ctl.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -64,10 +64,10 @@
<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="1">You can change the text writing direction directly be pressing one of the following keys:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="2">Ctrl+Shift+D or Ctrl+Right Shift Key - switch to right-to-left text entry</paragraph>
+<paragraph role="listitem" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="2"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+D or <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Right Shift Key - switch to right-to-left text entry</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149047" xml-lang="en-US" l10n="U" oldref="3">Ctrl+Shift+A or Ctrl+Left Shift Key - switch to left-to-right text entry</paragraph>
+<paragraph role="listitem" id="par_id3149047" xml-lang="en-US" l10n="U" oldref="3"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+A or <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Left Shift Key - switch to left-to-right text entry</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149656" xml-lang="en-US" l10n="U" oldref="4">The modifier-only key combinations only work when CTL support is enabled.</paragraph>
@@ -83,8 +83,7 @@
<paragraph role="listitem" id="par_id3154909" xml-lang="en-US" l10n="U" oldref="8">Use the Delete key to delete a whole composite character. Use the Backspace key to delete the last part of the previous composite character.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149809" xml-lang="en-US" l10n="U" oldref="9">Use the Right or Left Arrow key to jump to the next or previous whole composite character. To position the cursor into a composite character, use <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Arrow key.</paragraph>
+<paragraph role="listitem" id="par_id3149809" xml-lang="en-US" l10n="U" oldref="9">Use the Right or Left Arrow key to jump to the next or previous whole composite character. To position the cursor into a composite character, use <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Arrow key.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/shared/guide/data_addressbook.xhp b/helpcontent2/source/text/shared/guide/data_addressbook.xhp
index 46de798f29..21fa70e963 100755
--- a/helpcontent2/source/text/shared/guide/data_addressbook.xhp
+++ b/helpcontent2/source/text/shared/guide/data_addressbook.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: data_addressbook.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -71,7 +71,7 @@
<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="10">In the <emph>Data source</emph> combo box, select the system address book or the data source you want to use as an address book.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="CHG" oldref="11">If you have not yet registered the system address book in <item type="productname">%PRODUCTNAME</item> as the data source, click the <emph>Administrate</emph> button. This takes you to the <emph>Address Book Data Source Wizard</emph>, in which you can register your address book as a new data source in <item type="productname">%PRODUCTNAME</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="CHG" oldref="11">If you have not yet registered the system address book in <item type="productname">%PRODUCTNAME</item> as the data source, click the <emph>Configure</emph> button. This takes you to the <emph>Address Book Data Source Wizard</emph>, in which you can register your address book as a new data source in <item type="productname">%PRODUCTNAME</item>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="13">In the <emph>Table</emph> combo box, select the database table you want to use as the address book.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/data_search2.xhp b/helpcontent2/source/text/shared/guide/data_search2.xhp
index d5c09a54da..05a10019eb 100644
--- a/helpcontent2/source/text/shared/guide/data_search2.xhp
+++ b/helpcontent2/source/text/shared/guide/data_search2.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: data_search2.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -56,7 +56,7 @@
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id3149182" xml-lang="en-US" l10n="CHG" oldref="17">Open a form document that contains database fields.</paragraph>
-<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="18">As an example, open an empty text document and press F4. Open the bibliography database table <emph>biblio</emph> in the data source view. While pressing Shift+Ctrl, drag a few column headers into the document so that the form fields are created.</paragraph>
+<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="18">As an example, open an empty text document and press F4. Open the bibliography database table <emph>biblio</emph> in the data source view. While pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, drag a few column headers into the document so that the form fields are created.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="CHG" oldref="19">On the <emph>Form Controls</emph> toolbar, click the <emph>Design Mode On/Off</emph> icon
diff --git a/helpcontent2/source/text/shared/guide/digital_signatures.xhp b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
index 664f8ccfeb..f1369473ab 100755
--- a/helpcontent2/source/text/shared/guide/digital_signatures.xhp
+++ b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: digital_signatures.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,48 +32,41 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidedigital_signaturesxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">About Digital Signatures</title>
+<topic id="textsharedguidedigital_signaturesxhp" indexer="include">
+<title id="tit" xml-lang="en-US">About Digital Signatures</title>
<filename>/text/shared/guide/digital_signatures.xhp</filename>
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id7430951"><bookmark_value>certificates</bookmark_value>
<bookmark_value>digital signatures;overview</bookmark_value>
<bookmark_value>security;digital signatures</bookmark_value>
-</bookmark>
- <comment>mw moved 1 entry to digitalsign_send.xhp and made "digital signatures" a two level entry and added a new entry</comment>
- <paragraph xml-lang="en-US" id="hd_id2767418" role="heading" level="1" l10n="NEW"><variable id="digital_signatures"><link href="text/shared/guide/digital_signatures.xhp">About Digital Signatures</link>
+</bookmark><comment>mw moved 1 entry to digitalsign_send.xhp and made "digital signatures" a two level entry and added a new entry</comment>
+<paragraph role="heading" id="hd_id2767418" xml-lang="en-US" level="1" l10n="NEW"><variable id="digital_signatures"><link href="text/shared/guide/digital_signatures.xhp">About Digital Signatures</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10632" role="paragraph" l10n="NEW">In %PRODUCTNAME, you can digitally sign your documents and macros. </paragraph>
- <paragraph xml-lang="en-US" id="hd_id6564531" role="heading" level="2" l10n="NEW">Certificates</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10639" role="paragraph" l10n="NEW">To sign a document digitally, you need a personal key, the certificate. A personal key is stored on your computer as a combination of a private key, which must be kept secret, and a public key, which you add to your documents when you sign them.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1066D" role="heading" level="2" l10n="NEW">Save and sign the document</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10671" role="paragraph" l10n="NEW">When you apply a digital signature to a document, a kind of checksum is computed from the document's content plus your personal key. The checksum and your public key are stored together with the document.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10674" role="heading" level="2" l10n="NEW">Open a signed document</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10678" role="paragraph" l10n="NEW">When someone later opens the document on any computer with a recent version of %PRODUCTNAME, the program will compute the checksum again and compare it with the stored checksum. If both are the same, the program will signal that you see the original, unchanged document. In addition, the program can show you the public key information from the certificate.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1067B" role="paragraph" l10n="NEW">You can compare the public key with the public key that is published on the web site of the certificate authority.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1067E" role="paragraph" l10n="NEW">Whenever someone changes something in the document, this change breaks the digital signature. After the change, there will be no sign that you see the original document.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id9354228" role="heading" level="2" l10n="NEW">Security Warnings</paragraph>
- <paragraph xml-lang="en-US" id="par_id2372508" role="paragraph" l10n="NEW">When you receive a signed document, and the software reports that the signature is valid, this does not mean that you can be absolutely sure that the document is the same that the sender has sent. Signing documents with software certificates is not a perfectly secure method. Numerous ways are possible to circumvent the security features.</paragraph>
- <paragraph xml-lang="en-US" id="par_id7953123" role="paragraph" l10n="NEW">Example: Think about someone wants to camouflage his identity to be a sender from your bank. He can easily get a certificate using a false name, then send you any signed e-mail pretending he is working for your bank. You will get that e-mail, and the e-mail or the document within has the "valid signed" icon. </paragraph>
- <paragraph xml-lang="en-US" id="par_id6195257" role="paragraph" l10n="NEW">Do not trust the icon. Inspect and verify the certificates.</paragraph>
- <paragraph xml-lang="en-US" id="par_id8635517" role="warning" l10n="CHG">The validation of a signature is not a legally binding guarantee of any kind.</paragraph>
- <paragraph xml-lang="en-US" id="par_id6075624" role="paragraph" l10n="NEW">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
- <paragraph xml-lang="en-US" id="par_id6819971" role="warning" l10n="NEW">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</paragraph>
- <section id="relatedtopics">
-
- <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id486465" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_send.xhp">Applying digital signatures</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3448591" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
-
- </section>
- </body>
+<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW">In %PRODUCTNAME, you can digitally sign your documents and macros. </paragraph>
+<paragraph role="heading" id="hd_id6564531" xml-lang="en-US" level="2" l10n="NEW">Certificates</paragraph>
+<paragraph role="paragraph" id="par_idN10639" xml-lang="en-US" l10n="NEW">To sign a document digitally, you need a personal key, the certificate. A personal key is stored on your computer as a combination of a private key, which must be kept secret, and a public key, which you add to your documents when you sign them.</paragraph>
+<paragraph role="heading" id="par_idN1066D" xml-lang="en-US" level="2" l10n="NEW">Save and sign the document</paragraph>
+<paragraph role="paragraph" id="par_idN10671" xml-lang="en-US" l10n="NEW">When you apply a digital signature to a document, a kind of checksum is computed from the document's content plus your personal key. The checksum and your public key are stored together with the document.</paragraph>
+<paragraph role="heading" id="par_idN10674" xml-lang="en-US" level="2" l10n="NEW">Open a signed document</paragraph>
+<paragraph role="paragraph" id="par_idN10678" xml-lang="en-US" l10n="NEW">When someone later opens the document on any computer with a recent version of %PRODUCTNAME, the program will compute the checksum again and compare it with the stored checksum. If both are the same, the program will signal that you see the original, unchanged document. In addition, the program can show you the public key information from the certificate.</paragraph>
+<paragraph role="paragraph" id="par_idN1067B" xml-lang="en-US" l10n="NEW">You can compare the public key with the public key that is published on the web site of the certificate authority.</paragraph>
+<paragraph role="paragraph" id="par_idN1067E" xml-lang="en-US" l10n="NEW">Whenever someone changes something in the document, this change breaks the digital signature. After the change, there will be no sign that you see the original document.</paragraph>
+<paragraph role="heading" id="hd_id9354228" xml-lang="en-US" level="2" l10n="NEW">Security Warnings</paragraph>
+<paragraph role="paragraph" id="par_id2372508" xml-lang="en-US" l10n="NEW">When you receive a signed document, and the software reports that the signature is valid, this does not mean that you can be absolutely sure that the document is the same that the sender has sent. Signing documents with software certificates is not a perfectly secure method. Numerous ways are possible to circumvent the security features.</paragraph>
+<paragraph role="paragraph" id="par_id7953123" xml-lang="en-US" l10n="NEW">Example: Think about someone who wants to camouflage his identity to be a sender from your bank. He can easily get a certificate using a false name, then send you any signed e-mail pretending he is working for your bank. You will get that e-mail, and the e-mail or the document within has the "valid signed" icon. </paragraph>
+<paragraph role="paragraph" id="par_id6195257" xml-lang="en-US" l10n="NEW">Do not trust the icon. Inspect and verify the certificates.</paragraph>
+<paragraph role="warning" id="par_id8635517" xml-lang="en-US" l10n="CHG">The validation of a signature is not a legally binding guarantee of any kind.</paragraph>
+<paragraph role="paragraph" id="par_id6075624" xml-lang="en-US" l10n="NEW">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
+<paragraph role="warning" id="par_id6819971" xml-lang="en-US" l10n="NEW">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</paragraph>
+<section id="relatedtopics">
+<paragraph role="paragraph" id="par_id3204443" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+<paragraph role="paragraph" id="par_id486465" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/digitalsign_send.xhp">Applying digital signatures</link></paragraph>
+<paragraph role="paragraph" id="par_id3448591" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/doc_open.xhp b/helpcontent2/source/text/shared/guide/doc_open.xhp
index ce0b59fd4a..745b7ebecf 100644
--- a/helpcontent2/source/text/shared/guide/doc_open.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_open.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: doc_open.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.3 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguidedoc_openxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguidedoc_openxml" indexer="include">
<title id="tit" xml-lang="en-US">Opening Documents</title>
<filename>/text/shared/guide/doc_open.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-22T13:36:50">FPE: Deleted screenshot. Cleaned slightly.</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3147834"><bookmark_value>opening; documents</bookmark_value>
@@ -67,36 +63,43 @@
<paragraph role="listitem" id="par_id3149398" xml-lang="en-US" l10n="CHG" oldref="2">Do one of the following:</paragraph>
<paragraph role="listitem" id="par_idN107A9" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">File - Open</item>
</paragraph>
-<paragraph role="listitem" id="par_idN107AF" xml-lang="en-US" l10n="NEW">Click the <emph>Open</emph> icon</paragraph>
-<paragraph role="listitem" id="par_idN107B2" xml-lang="en-US" l10n="NEW">Press <item type="keycode">Ctrl+O</item>
-</paragraph>
+<paragraph role="listitem" id="par_idN107AF" xml-lang="en-US" l10n="NEW">Click the <emph>Open</emph> icon on the Standard toolbar</paragraph>
+<paragraph role="listitem" id="par_idN107B2" xml-lang="en-US" l10n="NEW">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+O </paragraph>
<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="U" oldref="3">The <link href="text/shared/01/01020000.xhp" name="Open">Open</link> dialog appears.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149164" xml-lang="en-US" l10n="CHG" oldref="4">Select the file you want to open and click <emph>Open</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="9">You can also enter a URL in the <emph>File name</emph> box of the <emph>Open</emph> dialog. This must start with the fully extended form with file:/// or ftp:// or http://.</paragraph>
-<switch select="sys">
-<case select="WIN">
-<paragraph role="warning" id="par_idN107C4" xml-lang="en-US" l10n="NEW">When you open a file by an URL from the Windows file dialog, Windows will open a local copy of the file, located in the Internet Explorer cache. The %PRODUCTNAME file dialog opens the remote file.</paragraph>
-</case>
-</switch>
<paragraph role="heading" id="hd_id3149234" xml-lang="en-US" level="3" l10n="CHG" oldref="13">Restrict Files to Display</paragraph>
<paragraph role="paragraph" id="par_id3150985" xml-lang="en-US" l10n="CHG" oldref="14">To restrict the display of files in the <emph>Open</emph> dialog to a certain type select the corresponding <emph>File type</emph> from the list. Select <emph>All Files (*.*)</emph> to display all files.</paragraph>
<paragraph role="heading" id="hd_id4651326" xml-lang="en-US" level="3" l10n="NEW">Cursor Position</paragraph>
<paragraph role="paragraph" id="par_id5509201" xml-lang="en-US" l10n="NEW">In general, all documents open with the cursor at the start of the document. </paragraph>
-<paragraph role="paragraph" id="par_id6594744" xml-lang="en-US" l10n="NEW">One exception appears when the author of a Writer text document saves and reopens a document: the cursor will be at the same position where it has been when the document was saved. This only works when the author has entered his name in <emph>Tools - Options - %PRODUCTNAME - User Data</emph>.</paragraph>
-<list type="unordered">
+<paragraph role="paragraph" id="par_id6594744" xml-lang="en-US" l10n="NEW">One exception appears when the author of a Writer text document saves and reopens a document: The cursor will be at the same position where it has been when the document was saved. This only works when the name of the author was entered in <emph>Tools - Options - %PRODUCTNAME - User Data</emph>.</paragraph>
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id3422650" xml-lang="en-US" l10n="NEW">Press Shift+F5 to set the cursor to the last saved position.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3148453" xml-lang="en-US" level="2" l10n="U" oldref="17">Opening an Empty Document</paragraph>
-<paragraph role="paragraph" id="par_id3147287" xml-lang="en-US" l10n="CHG" oldref="19">Click the <emph>New</emph> icon
-<image id="img_id3145172" src="sfx2/res/sn064.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145172" xml-lang="en-US">Icon</alt>
- </image> on the Standard bar or choose <emph>File - New</emph>. This opens a document of the document type specified.</paragraph>
+<paragraph role="paragraph" id="par_id3147287" xml-lang="en-US" l10n="CHG" oldref="19">Click the <emph>New</emph> icon on the Standard bar or choose <emph>File - New</emph>. This opens a document of the document type specified.</paragraph>
<paragraph role="paragraph" id="par_id3153092" xml-lang="en-US" l10n="CHG" oldref="20">If you click the arrow next to the <emph>New</emph> icon, a submenu opens in which you can select another document type.</paragraph>
+<paragraph role="heading" id="hd_id0820200803501358" xml-lang="en-US" level="2" l10n="NEW">System File Dialogs or %PRODUCTNAME Dialogs</paragraph>
+<paragraph role="paragraph" id="par_id0820200803501356" xml-lang="en-US" l10n="NEW">On most operating systems, you can choose to use the system file dialogs or %PRODUCTNAME dialogs.</paragraph>
+<list type="unordered">
+<listitem>
+<paragraph role="paragraph" id="par_id0820200803501429" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - General</item> to switch the type of open/save dialogs.</paragraph>
+</listitem>
+</list>
+<paragraph role="paragraph" id="par_id0820200803501449" xml-lang="en-US" l10n="NEW">The %PRODUCTNAME dialogs support file download and upload using secure https connections.</paragraph>
+<paragraph role="heading" id="hd_id0820200803501453" xml-lang="en-US" level="2" l10n="NEW">Opening Files from a Web Server</paragraph>
+<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="CHG" oldref="9">You can enter a URL in the <emph>File name</emph> box of the <emph>Open</emph> dialogs. The URL must start with file:/// or ftp:// or http://. </paragraph>
+<paragraph role="paragraph" id="par_id0820200803501548" xml-lang="en-US" l10n="NEW">If you use the %PRODUCTNAME dialog, you can use the https:// prefix for a secure connection, and you can save a document on the web server.</paragraph>
+<switch select="sys">
+<case select="WIN">
+<paragraph role="warning" id="par_idN107C4" xml-lang="en-US" l10n="NEW">When you open a file by a URL from the Windows file dialog, Windows will open a local copy of the file, located in the Internet Explorer cache. The %PRODUCTNAME file dialog opens a local copy of the file in the system's temp folder.</paragraph>
+</case>
+</switch>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3148616" xml-lang="en-US" l10n="U" oldref="5"><link href="text/shared/01/01020000.xhp" name="File - Open">File - Open</link></paragraph>
<embed href="text/shared/00/00000021.xhp#xmlformat"/>
diff --git a/helpcontent2/source/text/shared/guide/doc_save.xhp b/helpcontent2/source/text/shared/guide/doc_save.xhp
index b341600199..3a4fca1ed1 100644
--- a/helpcontent2/source/text/shared/guide/doc_save.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_save.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: doc_save.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -56,8 +56,7 @@
</variable></paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="5">Click the <emph>Save</emph> icon or press the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S.</paragraph>
+<paragraph role="listitem" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="5">Click the <emph>Save</emph> icon or press the shortcut keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S.</paragraph>
</listitem>
</list>
<table id="tbl_id3154307">
diff --git a/helpcontent2/source/text/shared/guide/dragdrop.xhp b/helpcontent2/source/text/shared/guide/dragdrop.xhp
index 4ea83850c2..fc6d407bce 100644
--- a/helpcontent2/source/text/shared/guide/dragdrop.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dragdrop.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -94,7 +94,7 @@
</tablerow>
</table>
-<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="13">If you press Ctrl or Shift+Ctrl while releasing the mouse button, you can control whether the object is copied, moved, or a link is created.</paragraph>
+<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="13">If you press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> or Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while releasing the mouse button, you can control whether the object is copied, moved, or a link is created.</paragraph>
<table id="tbl_id3150768">
<tablerow>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp b/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
index 56fea2ca9b..c2a327abc9 100644
--- a/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dragdrop_beamer.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -76,8 +76,7 @@
<paragraph role="paragraph" id="par_id3125864" xml-lang="en-US" l10n="U" oldref="40">You can insert one or more records into the current sheet of a spreadsheet by selecting the rows in the data source view and dragging and dropping them into the spreadsheet. The data is inserted at the place where you release the mouse button.</paragraph>
<paragraph role="heading" id="hd_id3149766" xml-lang="en-US" level="3" l10n="U" oldref="42">Inserting controls in a text form</paragraph>
<paragraph role="paragraph" id="par_id3155132" xml-lang="en-US" l10n="U" oldref="43">When you create a text form linked to a database, you can generate controls by drag-and-drop from the data source view.</paragraph>
-<paragraph role="paragraph" id="par_id3149562" xml-lang="en-US" l10n="U" oldref="45">When you drag a database column into the text document, you insert a field. If you hold down Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while dragging, a text field is inserted, grouped with an appropriate label field. The text field already contains all the database information that you need for the form.</paragraph>
+<paragraph role="paragraph" id="par_id3149562" xml-lang="en-US" l10n="U" oldref="45">When you drag a database column into the text document, you insert a field. If you hold down Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while dragging, a text field is inserted, grouped with an appropriate label field. The text field already contains all the database information that you need for the form.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
<embed href="text/shared/guide/dragdrop_graphic.xhp#dragdrop_graphic"/>
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp b/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
index 849067cb4d..9601093494 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dragdrop_fromgallery.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -60,10 +60,10 @@
<paragraph role="listitem" id="par_id3153825" xml-lang="en-US" l10n="U" oldref="43">If you move the graphic (drag it without pressing any key, in which case no additional symbol appears next to the mouse pointer), only the attributes are copied from the graphic and applied to the draw object on which you release the mouse button.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="42">If you copy the graphic (drag it while holding down the Ctrl key, in which case a plus sign appears next to the mouse pointer), the graphic will be inserted as an object.</paragraph>
+<paragraph role="listitem" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="42">If you copy the graphic (drag it while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key, in which case a plus sign appears next to the mouse pointer), the graphic will be inserted as an object.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="44">If you create a hyperlink (drag while holding down Shift and Ctrl, in which case a linking arrow appears next to the mouse pointer), the drawing object is replaced by the graphic from the Gallery, but the position and size of the replaced draw object are retained.</paragraph>
+<paragraph role="listitem" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="44">If you create a hyperlink (drag while holding down Shift and <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, in which case a linking arrow appears next to the mouse pointer), the drawing object is replaced by the graphic from the Gallery, but the position and size of the replaced draw object are retained.</paragraph>
</listitem>
</list>
</section>
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp b/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
index 9fe454fb7d..c4baa16d10 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dragdrop_gallery.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -65,8 +65,7 @@
<paragraph xml-lang="en-US" id="par_id3153748" role="listitem" l10n="U" oldref="51">Position the mouse pointer above the graphic, without clicking.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3156346" role="listitem" l10n="U" oldref="52">If the mouse pointer changes to a hand symbol, the graphic refers to a hyperlink. In this case, click the graphic while pressing the <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key to select it without executing the respective link.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156346" role="listitem" l10n="U" oldref="52">If the mouse pointer changes to a hand symbol, the graphic refers to a hyperlink. In this case, click the graphic while pressing the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key to select it without executing the respective link.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149578" role="listitem" l10n="U" oldref="53">If the mouse pointer does not change to a hand symbol, you can simply click the graphic to select it.</paragraph>
</listitem>
<listitem>
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp b/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
index f5ac2ffeba..0f1f0a7034 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dragdrop_graphic.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -60,8 +60,7 @@
<paragraph role="listitem" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="18">Open the document from which you want to copy the graphic.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="19">Click the graphic while pressing the <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key, to select it without executing any hyperlinks it may refer to.</paragraph>
+<paragraph role="listitem" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="19">Click the graphic while pressing the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key, to select it without executing any hyperlinks it may refer to.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3151110" xml-lang="en-US" l10n="U" oldref="20">Keep the mouse button pressed and wait a moment while the object is copied to an internal memory.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/filternavigator.xhp b/helpcontent2/source/text/shared/guide/filternavigator.xhp
index 0c4686c5da..716e6d5cd4 100644
--- a/helpcontent2/source/text/shared/guide/filternavigator.xhp
+++ b/helpcontent2/source/text/shared/guide/filternavigator.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: filternavigator.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -57,8 +57,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_FM_FILTER_IS_NULL" id="bm_id3146316" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_FM_FILTER_IS_NOT_NULL" id="bm_id3149108" localize="false"/>
<paragraph role="paragraph" id="par_id3145620" xml-lang="en-US" l10n="U" oldref="15">The context menu can be called for each entry in the <emph>Filter navigator</emph>. <ahelp hid="SID_FM_FILTER_IS_NOT_NULL">You can edit the filter conditions in this area directly as text. If you wish to check if a field has content or no content, you can select the filter conditions "empty" (SQL:"Is Null") or "not empty" (SQL: "Is not Null").</ahelp> It is also possible to delete the entry by using the context menu.</paragraph>
-<paragraph role="paragraph" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="16">You can move filter conditions in the <emph>Filter navigator</emph> by dragging and dropping, or use the keys Ctrl+Alt+ArrowUp or Ctrl+Alt+ArrowDown. To copy filter conditions, drag them while holding down the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key.</paragraph>
+<paragraph role="paragraph" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="16">You can move filter conditions in the <emph>Filter navigator</emph> by dragging and dropping, or use the keys <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Alt+Up Arrow or <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Alt+Down Arrow. To copy filter conditions, drag them while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key.</paragraph>
<embed href="text/shared/02/01170102.xhp#filtervorschlag"/>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/data_search.xhp#data_search"/>
diff --git a/helpcontent2/source/text/shared/guide/floating_toolbar.xhp b/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
index d2f4b87353..2c4c253758 100644
--- a/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
+++ b/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: floating_toolbar.xhp,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -93,7 +93,7 @@
<paragraph role="paragraph" id="par_id6154362" xml-lang="en-US" l10n="NEW">To reattach a floating window, drag-and-drop the window's title bar to an edge of the document window. The mouse pointer should be very close to the document window's edge when you release the mouse button.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id1510055" xml-lang="en-US" l10n="NEW">Depending on your system's window manager settings, you may also double-click an empty place on the toolbar or window, while holding down the Ctrl key. Or double-click the title bar of the floating toolbar or window.</paragraph>
+<paragraph role="paragraph" id="par_id1510055" xml-lang="en-US" l10n="NEW">Depending on your system's window manager settings, you may also double-click an empty place on the toolbar or window, while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key. Or double-click the title bar of the floating toolbar or window.</paragraph>
</listitem>
</list>
<section id="docking_win">
diff --git a/helpcontent2/source/text/shared/guide/gallery_insert.xhp b/helpcontent2/source/text/shared/guide/gallery_insert.xhp
index 87e42e67bf..b23cc2f0b9 100755
--- a/helpcontent2/source/text/shared/guide/gallery_insert.xhp
+++ b/helpcontent2/source/text/shared/guide/gallery_insert.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: gallery_insert.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -86,7 +86,7 @@
<paragraph xml-lang="en-US" id="par_id3150543" role="listitem" l10n="U" oldref="11">Select an object by a single click.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3154140" role="listitem" l10n="U" oldref="12">Drag the object into the document while pressing the Shift and Ctrl keys, or right-click to open the context menu and select <emph>Insert</emph> and <emph>Link</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154140" role="listitem" l10n="U" oldref="12">Drag the object into the document while pressing the Shift and <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>keys, or right-click to open the context menu and select <emph>Insert</emph> and <emph>Link</emph>.</paragraph>
</listitem>
</list>
<paragraph xml-lang="en-US" id="hd_id3156282" role="heading" level="2" l10n="U" oldref="13">Inserting an object as a background graphic</paragraph>
@@ -116,7 +116,7 @@
<paragraph xml-lang="en-US" id="par_id3148617" role="listitem" l10n="U" oldref="21">Select an object by a single click.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3147443" role="listitem" l10n="U" oldref="22">Drag the object on to the other object in the document while pressing Ctrl.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147443" role="listitem" l10n="U" oldref="22">Drag the object on to the other object in the document while pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp b/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
index bb298dfb27..ec560220f6 100755
--- a/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: hyperlink_edit.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -51,7 +51,7 @@
<bookmark_value>URL;changing hyperlink URLs</bookmark_value>
</bookmark><comment>MW deleted "changing;"</comment><paragraph role="heading" id="hd_id3153910" xml-lang="en-US" level="1" l10n="U" oldref="11"><variable id="hyperlink_edit"><link href="text/shared/guide/hyperlink_edit.xhp" name="Editing Hyperlinks">Editing Hyperlinks</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id4124881" xml-lang="en-US" l10n="NEW">When you Ctrl-click a hyperlink in a Writer document, your web browser opens with the requested web address. If you don't use a mouse, position the cursor inside the hyperlink and open the context menu by Shift+F10, then choose Open Hyperlink.</paragraph>
+<paragraph role="paragraph" id="par_id4124881" xml-lang="en-US" l10n="NEW">When you <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click a hyperlink in a Writer document, your web browser opens with the requested web address. If you don't use a mouse, position the cursor inside the hyperlink and open the context menu by Shift+F10, then choose Open Hyperlink.</paragraph>
<paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="2" l10n="U" oldref="26">Change the text of a hyperlink as follows</paragraph>
<list type="unordered">
<listitem>
@@ -92,8 +92,7 @@
</listitem>
</list>
<paragraph role="heading" id="hd_id3147530" xml-lang="en-US" level="2" l10n="U" oldref="34">Edit a hyperlink button</paragraph>
-<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="13">If the hyperlink is a button, click on the border to select it, or press the <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key while clicking. Open the <emph>Properties</emph> dialog through the context menu. You can edit the label text under "Caption," and modify the address in the "URL" field.</paragraph>
+<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="13">If the hyperlink is a button, click on the border to select it, or press the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key while clicking. Open the <emph>Properties</emph> dialog through the context menu. You can edit the label text under "Caption," and modify the address in the "URL" field.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/hyperlink_rel_abs.xhp#hyperlink_rel_abs"/>
</body>
diff --git a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
index b21e457cf6..c0f06f2f30 100644
--- a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: insert_bitmap.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideinsert_bitmapxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguideinsert_bitmapxml" indexer="include">
<title id="tit" xml-lang="en-US">Inserting, Editing, Saving Bitmaps</title>
<filename>/text/shared/guide/insert_bitmap.xhp</filename>
</topic>
@@ -65,7 +63,8 @@
<bookmark_value>mosaic filter</bookmark_value>
<bookmark_value>pictures;filters</bookmark_value>
<bookmark_value>filters;pictures</bookmark_value>
-</bookmark><comment>mw made "illustrations,..." a see-reference</comment><paragraph role="heading" id="hd_id3154136" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="insert_bitmap"><link href="text/shared/guide/insert_bitmap.xhp" name="Inserting, Editing, Saving Bitmaps">Inserting, Editing, Saving Bitmaps</link>
+</bookmark><comment>mw made "illustrations,..." a see-reference</comment>
+<paragraph role="heading" id="hd_id3154136" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="insert_bitmap"><link href="text/shared/guide/insert_bitmap.xhp" name="Inserting, Editing, Saving Bitmaps">Inserting, Editing, Saving Bitmaps</link>
</variable></paragraph>
<paragraph role="heading" id="hd_id3149811" xml-lang="en-US" level="2" l10n="U" oldref="2">Inserting Bitmaps</paragraph>
<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="U" oldref="3">A bitmap image can be inserted in $[officename] Writer, $[officename] Calc, $[officename] Draw and $[officename] Impress documents.</paragraph>
@@ -80,7 +79,8 @@
<paragraph role="listitem" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="6">Click the <emph>Link</emph> box if you want a link to the original file.</paragraph>
<paragraph role="listitem" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="7">If the <emph>Link</emph> box is marked, whenever the document is updated and loaded the bitmap image is reloaded. The editing steps that you have carried out in the local copy of the image in the document are re-applied and the image is displayed.</paragraph>
<paragraph role="listitem" id="par_id3147336" xml-lang="en-US" l10n="U" oldref="8">If the <emph>Link</emph> box is not marked, you are always working with the copy created when the graphic was first inserted.</paragraph>
-<paragraph role="listitem" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="26">To embed graphics that were first inserted as links, go to <emph>Edit - Links</emph> and click the <emph>Break Link</emph> button.</paragraph>
+<paragraph role="listitem" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="26">To embed graphics that were first inserted as links, go to <emph>Edit </emph>
+<emph>- Links</emph> and click the <emph>Break Link</emph> button.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="9">Click <emph>Open</emph> to insert the image.</paragraph>
@@ -104,7 +104,8 @@
</listitem>
</list>
<paragraph role="heading" id="hd_id3153574" xml-lang="en-US" level="2" l10n="U" oldref="16">Saving Bitmaps</paragraph>
-<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="17">If you want to save in a format such as GIF, JPEG or TIFF, you must select and export the bitmap image. This is only possible in $[officename] Draw and $[officename] Impress.</paragraph>
+<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="17">If you want to save in a format such as GIF, JPEG or TIFF, you must select and export the bitmap image.</paragraph>
+<paragraph role="paragraph" id="par_id0801200803544667" xml-lang="en-US" l10n="NEW">To export a bitmap in Draw or Impress:</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3155414" xml-lang="en-US" l10n="U" oldref="18">Select the bitmap image. You can also select additional objects, such as text, to be exported with the image by pressing the shift key while selecting or by opening a selection frame around all objects.</paragraph>
@@ -124,6 +125,8 @@
<paragraph role="listitem" id="par_id3149417" xml-lang="en-US" l10n="CHG" oldref="23">Enter a name for the file and click <emph>Export</emph>.</paragraph>
</listitem>
</list>
+<bookmark xml-lang="en-US" branch="hid/FN_SAVE_GRAPHIC" id="bm_id0801200803523126" localize="false"/>
+<paragraph role="paragraph" id="par_id0801200803525078" xml-lang="en-US" l10n="NEW"><ahelp hid=".">To export a bitmap in Writer: Right-click the bitmap, choose Save Graphics. You see the Graphics Export dialog. Enter a file name and select a file type.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
<embed href="text/shared/guide/imagemap.xhp#imagemap"/>
@@ -147,5 +150,6 @@
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
</case>
-</switch></body>
+</switch>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
index ff67c37c40..1a69bdf849 100644
--- a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: insert_graphic_drawit.xhp,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.4.3 $
*
* This file is part of OpenOffice.org.
*
@@ -33,22 +32,19 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideinsert_graphic_drawitxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Editing Graphic Objects </title>
+<topic id="textsharedguideinsert_graphic_drawitxml" indexer="include">
+<title id="tit" xml-lang="en-US">Editing Graphic Objects </title>
<filename>/text/shared/guide/insert_graphic_drawit.xhp</filename>
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id3145136"><bookmark_value>resizing, see also scaling/zooming</bookmark_value>
<bookmark_value>scaling, see also zooming</bookmark_value>
<bookmark_value>drawings, see also draw objects</bookmark_value>
+<bookmark_value>graphic objects, see also draw objects</bookmark_value>
<bookmark_value>text; drawing pictures</bookmark_value>
<bookmark_value>inserting; drawings</bookmark_value>
<bookmark_value>pictures; drawing</bookmark_value>
@@ -64,103 +60,69 @@
<bookmark_value>pasting;draw objects</bookmark_value>
<bookmark_value>editing;draw objects</bookmark_value>
<bookmark_value>pictures;scaling/resizing</bookmark_value>
-</bookmark>
- <comment>MW deleted "adding;"</comment>
- <paragraph xml-lang="en-US" id="hd_id3145136" role="heading" level="1" l10n="U" oldref="11"><variable id="insert_graphic_drawit"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Editing Graphic Objects">Editing Graphic Objects</link>
+</bookmark><comment>MW added "graphic objects, see also..."</comment>
+<paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="1" l10n="U" oldref="11"><variable id="insert_graphic_drawit"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Editing Graphic Objects">Editing Graphic Objects</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153345" role="paragraph" l10n="CHG" oldref="9">Choose <emph>View - Toolbars - Drawing</emph> to open the <emph>Drawing</emph> toolbar, if it is not already open.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="CHG" oldref="2">Drawing objects can be subsequently edited and modified. Drawing objects created in this way are vector graphics, which you can scale freely without any loss of quality.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph" l10n="U" oldref="3">To create a rectangle, click the rectangle icon and move your cursor to the place in the document where you want one corner of the rectangle to be. Press the mouse button and hold it down while dragging to the opposite corner of the rectangle. When you release the mouse button, the rectangle is inserted in the document. It is selected, and you can edit its properties through the context menu.</paragraph>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149164" role="listitem" l10n="CHG" oldref="13"><switchinline select="appl"><caseinline select="DRAW">To draw multiple objects of the same type, double-click the icon.
+<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph>View - Toolbars - Drawing</emph> to open the <emph>Drawing</emph> toolbar, if it is not already open.</paragraph>
+<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="CHG" oldref="2">Drawing objects can be subsequently edited and modified. Drawing objects created in this way are vector graphics, which you can scale freely without any loss of quality.</paragraph>
+<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="3">To create a rectangle, click the rectangle icon and move your cursor to the place in the document where you want one corner of the rectangle to be. Press the mouse button and hold it down while dragging to the opposite corner of the rectangle. When you release the mouse button, the rectangle is inserted in the document. It is selected, and you can edit its properties through the context menu.</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3149164" xml-lang="en-US" l10n="CHG" oldref="13"><switchinline select="appl"><caseinline select="DRAW">To draw multiple objects of the same type, double-click the icon.
</caseinline><caseinline select="IMPRESS">To draw multiple objects of the same type, double-click the icon.
</caseinline><defaultinline>Draw multiple objects of the same type. Click the document without moving the mouse to stop drawing objects.</defaultinline></switchinline></paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3148473" role="listitem" l10n="U" oldref="4">If you want to open up draw objects from the center instead of dragging from one corner to the other, hold down the <switchinline select="sys"><caseinline select="MAC"><item type="keycode">Option</item>
-</caseinline><defaultinline> <item type="keycode">Alt</item></defaultinline></switchinline> key while dragging. <switchinline select="sys"><caseinline select="UNIX">With some window managers, you may need to hold down also the meta key.
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="4">If you want to open up draw objects from the center instead of dragging from one corner to the other, hold down the <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline> key while dragging. <switchinline select="sys"><caseinline select="UNIX">With some window managers, you may need to hold down also the meta key.
</caseinline></switchinline></paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id9448225" role="listitem" l10n="CHG">Holding down the <item type="keycode">Shift</item> key while dragging restricts the created object. For example, instead of a rectangle you get a square, instead of an ellipse you get a circle. When you drag a handle of an existing object with <item type="keycode">Shift</item> held down, the aspect ratio of the object is retained.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3153626" role="listitem" l10n="U" oldref="5">To scale the objects, first select them by clicking on them with the selection tool. You then see eight handles around the object. When you drag one of the four corner handles, the opposite corner remains fixed while the other three corners move. When you drag one of the side handles, the opposite side remains fixed.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id224616" role="listitem" l10n="NEW">To scale a draw object, first select the object, then press <item type="keycode">Ctrl+Tab</item> repeatedly to highlight one of the handles. Then press an arrow key. To scale in smaller steps, hold down the <item type="keycode">Alt</item> key while pressing an arrow key. Press <item type="keycode">Esc</item> to leave the point edit mode.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149669" role="listitem" l10n="U" oldref="6">To move draw objects, first select them. To select more than one object, press the <item type="keycode">Shift</item> key while clicking. Select text objects by clicking exactly on their edge. While holding down the mouse button, drag the objects to the new location. If you hold down <item type="keycode">Shift</item> while dragging, the objects can only be positioned in places compatible with the page margins and the other objects on the page.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id7199316" role="listitem" l10n="NEW">To move a draw object using the keyboard, first select the object, then press an arrow key. To move in smaller steps, hold down the <item type="keycode">Alt</item> key while pressing an arrow key.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3151054" role="listitem" l10n="CHG" oldref="7">To copy a draw object, keep holding down <switchinline select="sys"><caseinline select="MAC">the <item type="keycode">Command</item> key
-</caseinline><defaultinline><item type="keycode">Ctrl</item></defaultinline></switchinline>, click the draw object and wait a second, then with the key still pressed, drag the draw object.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_id3156422" role="note" l10n="CHG" oldref="8">To revert to normal text mode after creating and editing draw objects, click in an area of the document containing no draw or other objects. If you see a drawing cursor, first exit this mode by clicking the <emph>Select</emph> icon.</paragraph>
- <section id="relatedtopics">
-
- <paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" l10n="U" oldref="10"><link href="text/shared/02/01140000.xhp" name="Information about the individual icons">Information about the individual icons</link></paragraph>
-
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id9448225" xml-lang="en-US" l10n="CHG">Holding down the Shift key while dragging restricts the created object. For example, instead of a rectangle you get a square, instead of an ellipse you get a circle. When you drag a handle of an existing object with Shift held down, the aspect ratio of the object is retained.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3153626" xml-lang="en-US" l10n="U" oldref="5">To scale the objects, first select them by clicking on them with the selection tool. You then see eight handles around the object. When you drag one of the four corner handles, the opposite corner remains fixed while the other three corners move. When you drag one of the side handles, the opposite side remains fixed.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id224616" xml-lang="en-US" l10n="NEW">To scale a draw object using the keyboard, first select the object, then press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab repeatedly to highlight one of the handles. Then press an arrow key. To scale in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline> key while pressing an arrow key. Press Esc to leave the point edit mode.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3149669" xml-lang="en-US" l10n="CHG" oldref="6">To move draw objects, first select them. To select more than one object, press the Shift key while clicking. Select text objects by clicking exactly on their edge. While holding down the mouse button, drag the objects to the new location.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id7199316" xml-lang="en-US" l10n="NEW">To move a draw object using the keyboard, first select the object, then press an arrow key. To move in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline> key while pressing an arrow key.</paragraph>
+</listitem>
+</list>
+<paragraph role="note" id="par_id3156422" xml-lang="en-US" l10n="CHG" oldref="8">To revert to normal text mode after creating and editing draw objects, click in an area of the document containing no draw or other objects. If you see a drawing cursor, first exit this mode by clicking the <emph>Select</emph> icon.</paragraph>
+<section id="relatedtopics">
+<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/02/01140000.xhp" name="Information about the individual icons">Information about the individual icons</link></paragraph>
<switch select="appl">
-
-<case select="WRITER">
- <embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
-
+<case select="WRITER"><embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
</case>
-
</switch>
-
<switch select="appl">
-
-<case select="WRITER">
- <embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
-
+<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
</case>
-
</switch>
-
<switch select="appl">
-
-<case select="WRITER">
- <embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
-
+<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
</case>
-
</switch>
-
<switch select="appl">
-
-<case select="WRITER">
- <embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
-
+<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
</case>
-
</switch>
-
<switch select="appl">
-
-<case select="WRITER">
- <embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
-
+<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
</case>
-
</switch>
-
<switch select="appl">
-
-<case select="WRITER">
- <embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
-
+<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
</case>
-
</switch>
-
- </section>
- </body>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/insert_specialchar.xhp b/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
index f6c4df415e..eed0aeebac 100755
--- a/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: insert_specialchar.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -61,7 +61,7 @@
<paragraph role="listitem" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="6">In the large selection field click the desired character or several characters in succession. The characters are displayed at the bottom of the dialog. When you close the dialog with <emph>OK</emph>, all displayed characters in the selected font are inserted in the current document.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="4">In any text input field (such as the input fields in the <emph>Find&amp;Replace</emph> dialog) you can press Shift+Ctrl+S to call the <emph>Special Characters</emph> dialog.</paragraph>
+<paragraph role="listitem" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="4">In any text input field (such as the input fields in the <emph>Find &amp; Replace</emph> dialog) you can press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S to open the <emph>Special Characters</emph> dialog.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3155630" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="UNIX">At present there are three ways of entering letters with accents directly from the keyboard.
diff --git a/helpcontent2/source/text/shared/guide/keyboard.xhp b/helpcontent2/source/text/shared/guide/keyboard.xhp
index 8b156c175d..df46aff9da 100644
--- a/helpcontent2/source/text/shared/guide/keyboard.xhp
+++ b/helpcontent2/source/text/shared/guide/keyboard.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: keyboard.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -69,25 +69,25 @@
<paragraph role="listitem" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="34">document</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="33">If the focus is on a menu bar or a toolbar, and you press Ctrl+Tab, you switch through the previously mentioned objects just as with F6, but without switching through to the document. <switchinline select="sys"><caseinline select="UNIX">Some X Window Managers evaluate this shortcut themselves, in which case you cannot use the shortcut for <item type="productname">%PRODUCTNAME</item>.
+<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="33">If the focus is on a menu bar or a toolbar, and you press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab, you switch through the previously mentioned objects just as with F6, but without switching through to the document. <switchinline select="sys"><caseinline select="UNIX">Some X Window Managers evaluate this shortcut themselves, in which case you cannot use the shortcut for <item type="productname">%PRODUCTNAME</item>.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="32">Press Shift+F6 or Shift+Ctrl+Tab to switch through objects in the opposite direction.</paragraph>
-<paragraph role="paragraph" id="par_id3152473" xml-lang="en-US" l10n="U" oldref="31">Press Ctrl+F6 to switch to the document.</paragraph>
+<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="32">Press Shift+F6 or Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to switch through objects in the opposite direction.</paragraph>
+<paragraph role="paragraph" id="par_id3152473" xml-lang="en-US" l10n="U" oldref="31">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to switch to the document.</paragraph>
<paragraph role="paragraph" id="par_id3152360" xml-lang="en-US" l10n="U" oldref="30">Press F10 to switch to the menu bar and back.</paragraph>
<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="29">Escape closes an open submenu, a toolbar, or the current free window.</paragraph>
<paragraph role="heading" id="hd_id3161656" xml-lang="en-US" level="3" l10n="U" oldref="21">Calling a menu command</paragraph>
-<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="20">Press Alt or F6 or F10 to select the first menu (the <emph>File</emph> menu). With right arrow, the next menu to the right is selected; with left arrow, the previous menu.</paragraph>
+<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="20">Press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> or F6 or F10 to select the first menu (the <emph>File</emph> menu). With right arrow, the next menu to the right is selected; with left arrow, the previous menu.</paragraph>
<paragraph role="paragraph" id="par_id3153381" xml-lang="en-US" l10n="U" oldref="19">Arrow down opens a selected menu. Any additional arrow down and up arrow move the selection through the menu commands. With right arrow you open any existing submenus.</paragraph>
<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="18">Press Enter to execute the selected menu command.</paragraph>
<paragraph role="heading" id="hd_id3147086" xml-lang="en-US" level="3" l10n="U" oldref="17">Executing an icon command</paragraph>
<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="16">Press F6 repeatedly until the first icon on the toolbar is selected. Use the right and left arrows to select an icon on a horizontal toolbar. Similarly, use the up and down arrows to select an icon on a vertical toolbar. The Home key selects the first icon on a toolbar and the End key, the last.</paragraph>
-<paragraph role="paragraph" id="par_id3144433" xml-lang="en-US" l10n="U" oldref="15">Press Enter to execute the selected icon. If the selected icon normally demands a consecutive mouse action, such as inserting a rectangle, then pressing the Enter key is not sufficient: in these cases press Ctrl+Enter.</paragraph>
+<paragraph role="paragraph" id="par_id3144433" xml-lang="en-US" l10n="U" oldref="15">Press Enter to execute the selected icon. If the selected icon normally demands a consecutive mouse action, such as inserting a rectangle, then pressing the Enter key is not sufficient: in these cases press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="28">Pressing Ctrl+Enter on an icon for creating a draw object. A draw object will be placed into the middle of the view, with a predefined size.</paragraph>
+<paragraph role="listitem" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="28">Pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on an icon for creating a draw object. A draw object will be placed into the middle of the view, with a predefined size.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="27">Press Ctrl+Enter on the Selection tool to select the first draw object in the document. If you want to edit, size, or move the selected draw object, first use Ctrl+F6 to set the focus into the document.</paragraph>
+<paragraph role="listitem" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="27">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on the Selection tool to select the first draw object in the document. If you want to edit, size, or move the selected draw object, first use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to set the focus into the document.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="26">If a toolbar is longer than can be displayed on screen, it shows an icon at the right or lower edge. Select the toolbar and press PageUp or PageDown to display the remaining icons.</paragraph>
@@ -116,22 +116,22 @@
<paragraph role="listitem" id="par_id3154014" xml-lang="en-US" l10n="U" oldref="43">Spacebar: switches from selection of the current row and cancellation of any selection, but not if the current cell is in edit mode.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="44">Ctrl+Spacebar: switches between selection of the current row and cancellation of this selection</paragraph>
+<paragraph role="listitem" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+spacebar: switches between selection of the current row and cancellation of this selection</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149488" xml-lang="en-US" l10n="U" oldref="45">Shift+Spacebar: selection of the current column</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="73">Alt+Up Arrow or Alt+Down Arrow: moves the window separator between table and form, for instance in the bibliography database.</paragraph>
+<paragraph role="listitem" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="73"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up Arrow or <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow: moves the window separator between table and form, for instance in the bibliography database.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="147">In a table control or in the data source view, the Tab key moves to the next column. To move to the next control, press Ctrl+Tab. To move to the previous control, press Shift+Ctrl+Tab.</paragraph>
+<paragraph role="listitem" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="147">In a table control or in the data source view, the Tab key moves to the next column. To move to the next control, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab. To move to the previous control, press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3150592" xml-lang="en-US" level="3" l10n="U" oldref="7">Size and Position of Windows and Dialogs</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153221" xml-lang="en-US" l10n="U" oldref="6">First press Alt+Spacebar.</paragraph>
+<paragraph role="listitem" id="par_id3153221" xml-lang="en-US" l10n="U" oldref="6">First press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+spacebar.</paragraph>
<paragraph role="listitem" id="par_id3148456" xml-lang="en-US" l10n="U" oldref="5">A system menu opens with menu commands like <emph>Move</emph>, <emph>Resize</emph> and <emph>Close</emph>.</paragraph>
</listitem>
<listitem>
@@ -150,7 +150,7 @@
<paragraph role="listitem" id="par_id3147176" xml-lang="en-US" l10n="U" oldref="151">Press F6 until the window or toolbar is selected.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="152">Press Ctrl+Shift+F10.</paragraph>
+<paragraph role="listitem" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="152">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3154479" xml-lang="en-US" level="3" l10n="U" oldref="148">Selecting objects</paragraph>
@@ -164,10 +164,10 @@
<paragraph role="listitem" id="par_id3145619" xml-lang="en-US" l10n="U" oldref="57">Set the grid resolution unit with <emph>Tools - Options - %PRODUCTNAME Writer - Grid</emph> in the <emph>Resolution</emph> area. If you enter a number greater than 1 in the <emph>Subdivision</emph> area, you must press the arrow key as often as the number states to move the selected object by one grid resolution unit.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3166450" xml-lang="en-US" l10n="U" oldref="58">Use the Alt and arrow keys to move the selected object by one pixel.</paragraph>
+<paragraph role="listitem" id="par_id3166450" xml-lang="en-US" l10n="U" oldref="58">Use the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and arrow keys to move the selected object by one pixel.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3147345" xml-lang="en-US" l10n="U" oldref="59">Use Ctrl+Tab to enter the handle edit mode. The upper left handle is the active handle, it starts blinking. Use Ctrl+Tab to select the next handle. Use (Esc) to exit the handle edit mode.</paragraph>
+<paragraph role="listitem" id="par_id3147345" xml-lang="en-US" l10n="U" oldref="59">Use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to enter the handle edit mode. The upper left handle is the active handle, it starts blinking. Use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to select the next handle. Press Escape to exit the handle edit mode.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149565" xml-lang="en-US" l10n="U" oldref="60">In the handle edit mode, the arrow keys move the selected handle, which changes the object size.</paragraph>
@@ -180,10 +180,10 @@
<paragraph role="listitem" id="par_id3163808" xml-lang="en-US" l10n="U" oldref="63">Select the object.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150646" xml-lang="en-US" l10n="U" oldref="64">Enter the handle edit mode with Ctrl+Tab.</paragraph>
+<paragraph role="listitem" id="par_id3150646" xml-lang="en-US" l10n="U" oldref="64">Enter the handle edit mode with <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150940" xml-lang="en-US" l10n="U" oldref="65">The upper left handle starts blinking. Press Ctrl+Tab several times, until no handle blinks. This signals that now the anchor of the object is activated. <switchinline select="appl"><caseinline select="WRITER">In text documents you can press Shift+Ctrl+A to activate the anchor directly.
+<paragraph role="listitem" id="par_id3150940" xml-lang="en-US" l10n="U" oldref="65">The upper left handle starts blinking. Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab several times, until no handle blinks. This signals that now the anchor of the object is activated. <switchinline select="appl"><caseinline select="WRITER">In text documents you can press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A to activate the anchor directly.
</caseinline></switchinline></paragraph>
</listitem>
<listitem>
@@ -212,7 +212,7 @@
<paragraph role="paragraph" id="par_id3158413" xml-lang="en-US" l10n="U" oldref="134">Documents of <item type="productname">%PRODUCTNAME</item> Calc, <item type="productname">%PRODUCTNAME</item> Draw, and <item type="productname">%PRODUCTNAME</item> Impress can be split horizontally and vertically into separate views. Each view can show other parts of the document. Using the mouse, you can drag a dividing line from the scrollbar into the document.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3149814" xml-lang="en-US" l10n="U" oldref="135">Shift+Ctrl+F6: shows the dividing lines at default positions and focus a line.</paragraph>
+<paragraph role="listitem" id="par_id3149814" xml-lang="en-US" l10n="U" oldref="135">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6: shows the dividing lines at default positions and focus a line.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3158444" xml-lang="en-US" l10n="U" oldref="136">Arrow keys: moves the current dividing line a big step in the arrow direction.</paragraph>
@@ -239,13 +239,13 @@
<paragraph role="paragraph" id="par_id3159109" xml-lang="en-US" l10n="U" oldref="114">F6: switches between document and toolbars.</paragraph>
<paragraph role="paragraph" id="par_id3153229" xml-lang="en-US" l10n="U" oldref="115">+ (plus key): expands the selected entry in the data source explorer.</paragraph>
<paragraph role="paragraph" id="par_id3150312" xml-lang="en-US" l10n="U" oldref="116">- (minus key): collapses the selected entry in the data source explorer.</paragraph>
-<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="117">Ctrl+Shift+E: switches between data source explorer and table.</paragraph>
+<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+E: switches between data source explorer and table.</paragraph>
<paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="3" l10n="U" oldref="118">Shortcuts in the Query Design Window</paragraph>
<paragraph role="paragraph" id="par_id3152455" xml-lang="en-US" l10n="U" oldref="119">F6: switches between object bar, table view, and selection area.</paragraph>
-<paragraph role="paragraph" id="par_id3151180" xml-lang="en-US" l10n="U" oldref="120">Alt+Up arrow or Alt+Down arrow: moves the border between table view and selection area up or down.</paragraph>
+<paragraph role="paragraph" id="par_id3151180" xml-lang="en-US" l10n="U" oldref="120"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up arrow or <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down arrow: moves the border between table view and selection area up or down.</paragraph>
<paragraph role="heading" id="hd_id3156288" xml-lang="en-US" level="3" l10n="U" oldref="121">Keys in the Table View (upper area of the query design) and in the Relations window</paragraph>
-<paragraph role="paragraph" id="par_id3156166" xml-lang="en-US" l10n="U" oldref="122">Ctrl+Arrow key: moves the selected table in the direction of the arrow.</paragraph>
-<paragraph role="paragraph" id="par_id3147310" xml-lang="en-US" l10n="U" oldref="123">Ctrl+Shift+Arrow key: resizes the selected table in the table view.</paragraph>
+<paragraph role="paragraph" id="par_id3156166" xml-lang="en-US" l10n="U" oldref="122"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow key: moves the selected table in the direction of the arrow.</paragraph>
+<paragraph role="paragraph" id="par_id3147310" xml-lang="en-US" l10n="U" oldref="123"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Arrow key: resizes the selected table in the table view.</paragraph>
<paragraph role="paragraph" id="par_id3152986" xml-lang="en-US" l10n="U" oldref="124">Del: removes the selected table or connection from the table view.</paragraph>
<paragraph role="paragraph" id="par_id3145384" xml-lang="en-US" l10n="U" oldref="125">Tab: switches between tables and connections in the table view.</paragraph>
<paragraph role="paragraph" id="par_id3154529" xml-lang="en-US" l10n="U" oldref="126">Enter: when a connection is selected, the Enter key opens the <emph>Properties</emph> dialog of the connection.</paragraph>
@@ -253,7 +253,7 @@
<paragraph role="heading" id="hd_id3153816" xml-lang="en-US" level="3" l10n="U" oldref="128">Keys in the Selection Area (bottom area of the query design)</paragraph>
<paragraph role="paragraph" id="par_id3159170" xml-lang="en-US" l10n="U" oldref="129">Shift+Space key: selects the column in the selection area, so you can open its context menu.</paragraph>
<paragraph role="paragraph" id="par_id3156198" xml-lang="en-US" l10n="U" oldref="130">Space key: selects the row. Cancels previous selection.</paragraph>
-<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="146">Ctrl+Arrow left or right: moves the selected column to the left or to the right.</paragraph>
+<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="146"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Left Arrow or Right Arrow: moves the selected column to the left or to the right.</paragraph>
<paragraph role="heading" id="hd_id3146152" xml-lang="en-US" level="3" l10n="U" oldref="131">Keys in the Table Design Window</paragraph>
<paragraph role="paragraph" id="par_id3151243" xml-lang="en-US" l10n="CHG" oldref="132">F6: switches between toolbar, column view, and properties area.</paragraph>
</section>
@@ -261,13 +261,13 @@
<paragraph role="heading" id="hd_id3145075" xml-lang="en-US" level="2" l10n="U" oldref="74">Controlling the ImageMap Editor</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3159096" xml-lang="en-US" l10n="U" oldref="75">Press Tab to select an icon. If you selected one of the icons from <emph>Rectangle</emph> to <emph>Freeform Polygon</emph> and you press Ctrl+Enter, an object of the selected type is created in default size.</paragraph>
+<paragraph role="listitem" id="par_id3159096" xml-lang="en-US" l10n="U" oldref="75">Press Tab to select an icon. If you selected one of the icons from <emph>Rectangle</emph> to <emph>Freeform Polygon</emph> and you press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter, an object of the selected type is created in default size.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3156016" xml-lang="en-US" l10n="U" oldref="76">If you press Enter while the icon <emph>Select</emph> is selected, the focus is set into the image window of the ImageMap Editor. Press Esc to set the focus back to the icons and input boxes.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149587" xml-lang="en-US" l10n="U" oldref="77">If the icon <emph>Select</emph> is selected and you press Ctrl+Enter, the first object in the image window gets selected.</paragraph>
+<paragraph role="listitem" id="par_id3149587" xml-lang="en-US" l10n="U" oldref="77">If the <emph>Select</emph> icon is selected and you press Ctrl+Enter, the first object in the image window gets selected.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3154343" xml-lang="en-US" l10n="U" oldref="78">Use the icon <emph>Edit Points</emph> to switch into the point edit mode for polygons and back.</paragraph>
@@ -391,7 +391,7 @@
<paragraph role="listitem" id="par_id3153073" xml-lang="en-US" l10n="U" oldref="143">Tab switches through all controls in the dialog.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153295" xml-lang="en-US" l10n="U" oldref="144">Alt+Down Arrow opens a combo box. Enter selects the current entry in the combo box.</paragraph>
+<paragraph role="listitem" id="par_id3153295" xml-lang="en-US" l10n="U" oldref="144"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow opens a combo box. Enter selects the current entry in the combo box.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3153958" xml-lang="en-US" l10n="U" oldref="145">Arrow buttons move through the main selection area. Spacebar adds the current character to the list of characters to be inserted.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/makefile.mk b/helpcontent2/source/text/shared/guide/makefile.mk
index 1e6d88fc80..3bfdd7593b 100644
--- a/helpcontent2/source/text/shared/guide/makefile.mk
+++ b/helpcontent2/source/text/shared/guide/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.14 $
+# $Revision: 1.14.4.4 $
#
# This file is part of OpenOffice.org.
#
@@ -162,6 +162,7 @@ XHPFILES = \
spadmin.xhp \
standard_template.xhp \
start_parameters.xhp \
+ startcenter.xhp \
tabs.xhp \
text_color.xhp \
textmode_change.xhp \
diff --git a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
index 9b38268b43..0c4b9f7ee5 100755
--- a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
+++ b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: microsoft_terms.xhp,v $
- *
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -75,6 +73,14 @@
</tablerow>
<tablerow>
<tablecell>
+<paragraph role="tablecontent" id="par_id1029200801240915" xml-lang="en-US" l10n="NEW">Click and Type</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id1029200801240965" xml-lang="en-US" l10n="NEW"><link href="text/swriter/guide/text_direct_cursor.xhp">Direct Cursor</link></paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
<paragraph role="tablecontent" id="par_id3145674" xml-lang="en-US" l10n="U" oldref="8">Comments</paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/guide/ms_doctypes.xhp b/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
index 34e02a5dad..f80cce2b39 100755
--- a/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ms_doctypes.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,19 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
<topic id="textsharedguidems_doctypesxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Changing the Association of Microsoft Office Document Types</title>
<filename>/text/shared/guide/ms_doctypes.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-08T15:56:14">FPE: Deleted screenshot.
-checked - yj</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3143267"><bookmark_value>Microsoft Office;reassigning document types</bookmark_value>
@@ -54,17 +51,14 @@ checked - yj</lastedited>
<section id="ms_extensions">
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="2">Exit $[officename] and the $[officename] Quickstarter.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="3">Run the $[officename] Setup program:</paragraph>
-<paragraph role="listitem" id="par_idN10665" xml-lang="en-US" l10n="NEW">Click the Windows <emph>Start</emph> button, choose <emph>Control Panel</emph>, click <emph>Add or Remove Programs</emph>, select the %PRODUCTNAME %PRODUCTVERSION entry, click <emph>Change</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id0815200803314147" xml-lang="en-US" l10n="NEW">In Windows Explorer, right-click a file of the type that you want to assign to another application.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="4">In the $[officename] Setup, check the <emph>Modify</emph> option and click <emph>Next</emph> until you see the file types page.</paragraph>
+<paragraph role="paragraph" id="par_id0815200803314268" xml-lang="en-US" l10n="NEW">In the context menu, choose "Open with..."</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="6">Select or deselect the file types. Click <emph>OK</emph> and complete the $[officename] Setup program.</paragraph>
+<paragraph role="paragraph" id="par_id0815200803314245" xml-lang="en-US" l10n="NEW">In the list of applications, select the program that should open the current type of files. Make sure that "Always use this program" is selected.</paragraph>
+<paragraph role="paragraph" id="par_id0815200803314243" xml-lang="en-US" l10n="NEW">If these steps do not apply to your brand of Microsoft Windows, search your Microsoft Windows Help for instructions how to change the file associations.</paragraph>
</listitem>
</list>
</section>
diff --git a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
index 0285b16794..f230251017 100644
--- a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ms_import_export_limitations.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,171 +32,173 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidems_import_export_limitationsxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">About Converting Microsoft Office Documents</title>
+<topic id="textsharedguidems_import_export_limitationsxml" indexer="include">
+<title id="tit" xml-lang="en-US">About Converting Microsoft Office Documents</title>
<filename>/text/shared/guide/ms_import_export_limitations.xhp</filename>
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id3149760"><bookmark_value>Microsoft Office;document import restrictions</bookmark_value>
<bookmark_value>import restrictions for Microsoft Office</bookmark_value>
<bookmark_value>Microsoft Office;importing password protected files</bookmark_value>
-</bookmark>
- <comment>MW moved "Microsoft Office;" from shared/guide/protection.xhp</comment>
- <paragraph xml-lang="en-US" id="par_id3149760" role="paragraph" l10n="E" oldref="32" localize="false"/>
- <paragraph xml-lang="en-US" id="hd_id3152425" role="heading" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link>
+</bookmark><comment>MW moved "Microsoft Office;" from shared/guide/protection.xhp</comment>
+<paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="E" oldref="32" localize="false"/>
+<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147834" role="paragraph" l10n="U" oldref="2">$[officename] can automatically open Microsoft Office 97/2000/XP documents. However, some layout features and formatting attributes in more complex Microsoft Office documents are handled differently in $[officename] or are unsupported. As a result, converted files require some degree of manual reformatting. The amount of reformatting that can be expected is proportional to the complexity of the structure and formatting of the source document. $[officename] cannot run Visual Basic Scripts, but can load them for you to analyze.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155934" role="paragraph" l10n="U" oldref="3">The following lists provide a general overview of Microsoft Office features that may cause conversion challenges. These will not affect your ability to use or work with the content of the converted document.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3155892" role="heading" level="2" l10n="U" oldref="6">Microsoft Word</paragraph>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147088" role="listitem" l10n="U" oldref="7">AutoShapes</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3150774" role="listitem" l10n="U" oldref="8">Revision marks</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147209" role="listitem" l10n="U" oldref="9">OLE objects</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154749" role="listitem" l10n="U" oldref="10">Certain controls and Microsoft Office form fields</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149578" role="listitem" l10n="U" oldref="11">Indexes</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3155342" role="listitem" l10n="U" oldref="12">Tables, frames, and multi-column formatting</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3153541" role="listitem" l10n="U" oldref="13">Hyperlinks and bookmarks</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154143" role="listitem" l10n="U" oldref="14">Microsoft WordArt graphics</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3156117" role="listitem" l10n="U" oldref="15">Animated characters/text</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="hd_id3150986" role="heading" level="2" l10n="U" oldref="16">Microsoft Excel</paragraph>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3148685" role="listitem" l10n="U" oldref="17">AutoShapes</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149514" role="listitem" l10n="U" oldref="18">OLE objects</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3148943" role="listitem" l10n="U" oldref="19">Certain controls and Microsoft Office form fields</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3155922" role="listitem" l10n="U" oldref="20">Pivot tables</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3152361" role="listitem" l10n="U" oldref="21">New chart types</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3156343" role="listitem" l10n="U" oldref="22">Conditional formatting</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149456" role="listitem" l10n="U" oldref="23">Some functions/formulas</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="hd_id3153524" role="heading" level="2" l10n="U" oldref="24">Microsoft PowerPoint</paragraph>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154365" role="listitem" l10n="U" oldref="25">AutoShapes</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3156424" role="listitem" l10n="U" oldref="26">Tab, line, and paragraph spacing</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154910" role="listitem" l10n="U" oldref="27">Master background graphics</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3159151" role="listitem" l10n="U" oldref="28">Grouped objects</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3156282" role="listitem" l10n="U" oldref="29">Certain multimedia effects</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_id3150439" role="note" l10n="U" oldref="30">For a detailed overview of the converting documents to and from Microsoft Office format, see the $[officename] Migration Guide.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10A9F" role="heading" level="2" l10n="NEW">Opening Microsoft Office Documents That Are Protected With a Password</paragraph>
- <paragraph xml-lang="en-US" id="par_id8699606" role="paragraph" l10n="NEW">%PRODUCTNAME can open the following Microsoft Office document types that are protected by a password.</paragraph>
- <table id="tbl_id4497512">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AB6" role="tablehead" l10n="NEW">Microsoft Office format</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10ABC" role="tablehead" l10n="NEW">Supported encryption method</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AC3" role="tablecontent" l10n="NEW">Word 6.0, Word 95</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AC9" role="tablecontent" l10n="NEW">Weak XOR encryption</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AD0" role="tablecontent" l10n="NEW">Word 97, Word 2000, Word XP, Word 2003</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AD6" role="tablecontent" l10n="NEW">Office 97/2000 compatible encryption</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10ADD" role="tablecontent" l10n="NEW">Word XP, Word 2003</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AE3" role="tablecontent" l10n="NEW">Weak XOR encryption from older Word versions</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AEA" role="tablecontent" l10n="NEW">Excel 2.1, Excel 3.0, Excel 4.0, Excel 5.0, Excel 95</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AF0" role="tablecontent" l10n="NEW">Weak XOR encryption</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AF7" role="tablecontent" l10n="NEW">Excel 97, Excel 2000, Excel XP, Excel 2003</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10AFD" role="tablecontent" l10n="NEW">Office 97/2000 compatible encryption</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10B04" role="tablecontent" l10n="NEW">Excel XP, Excel 2003</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_idN10B0A" role="tablecontent" l10n="NEW">Weak XOR encryption from older Excel versions</paragraph>
- </tablecell>
- </tablerow>
- </table>
- <paragraph xml-lang="en-US" id="par_idN10B0D" role="paragraph" l10n="NEW">Other encryption methods are not supported.</paragraph>
- <section id="relatedtopics">
-
- <embed href="text/shared/guide/ms_user.xhp#ms_user"/>
- <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
- <paragraph xml-lang="en-US" id="par_id3147318" role="paragraph" l10n="U" oldref="33"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
-
- </section>
- </body>
+<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="2">$[officename] can automatically open Microsoft Office 97/2000/XP documents. However, some layout features and formatting attributes in more complex Microsoft Office documents are handled differently in $[officename] or are unsupported. As a result, converted files require some degree of manual reformatting. The amount of reformatting that can be expected is proportional to the complexity of the structure and formatting of the source document. $[officename] cannot run Visual Basic Scripts, but can load them for you to analyze.</paragraph>
+<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load, but not save, the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem">Tools - Options - Load/Save - VBA Properties</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="3">The following lists provide a general overview of Microsoft Office features that may cause conversion challenges. These will not affect your ability to use or work with the content of the converted document.</paragraph>
+<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="2" l10n="U" oldref="6">Microsoft Word</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="7">AutoShapes</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="8">Revision marks</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="9">OLE objects</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="10">Certain controls and Microsoft Office form fields</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="11">Indexes</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3155342" xml-lang="en-US" l10n="U" oldref="12">Tables, frames, and multi-column formatting</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="13">Hyperlinks and bookmarks</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3154143" xml-lang="en-US" l10n="U" oldref="14">Microsoft WordArt graphics</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="15">Animated characters/text</paragraph>
+</listitem>
+</list>
+<paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="2" l10n="U" oldref="24">Microsoft PowerPoint</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="25">AutoShapes</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3156424" xml-lang="en-US" l10n="U" oldref="26">Tab, line, and paragraph spacing</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3154910" xml-lang="en-US" l10n="U" oldref="27">Master background graphics</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3159151" xml-lang="en-US" l10n="U" oldref="28">Grouped objects</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3156282" xml-lang="en-US" l10n="U" oldref="29">Certain multimedia effects</paragraph>
+</listitem>
+</list>
+<paragraph role="heading" id="hd_id3150986" xml-lang="en-US" level="2" l10n="U" oldref="16">Microsoft Excel</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="17">AutoShapes</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="18">OLE objects</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="19">Certain controls and Microsoft Office form fields</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="20">Pivot tables</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="21">New chart types</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="22">Conditional formatting</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3149456" xml-lang="en-US" l10n="CHG" oldref="23">Some functions/formulas (see below)</paragraph>
+</listitem>
+</list>
+<paragraph role="paragraph" id="par_id0811200801491971" xml-lang="en-US" l10n="NEW">One example of differences between Calc and Excel is the handling of boolean values. Enter TRUE to cells A1 and A2. </paragraph>
+<list type="unordered">
+<listitem>
+<paragraph role="paragraph" id="par_id0811200801491973" xml-lang="en-US" l10n="NEW">In Calc, the formula =A1+A2 returns the value 2, and the formula =SUM(A1;A2) returns 2. </paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0811200801491972" xml-lang="en-US" l10n="NEW">In Excel, the formula =A1+A2 returns 2, but the formula =SUM(A1,A2) returns 0.<comment>in SUM(A1&lt;limiter&gt;A2), use the Excel limiter comma , in English and semicolon ; in German</comment></paragraph>
+</listitem>
+</list>
+<paragraph role="note" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="30">For a detailed overview about converting documents to and from Microsoft Office format, see the <link href="http://wiki.services.openoffice.org/wiki/Documentation/OOoAuthors_User_Manual/Migration_Guide">Migration Guide</link>.</paragraph>
+<paragraph role="heading" id="par_idN10A9F" xml-lang="en-US" level="2" l10n="NEW">Opening Microsoft Office Documents That Are Protected With a Password</paragraph>
+<paragraph role="paragraph" id="par_id8699606" xml-lang="en-US" l10n="NEW">%PRODUCTNAME can open the following Microsoft Office document types that are protected by a password.</paragraph>
+<table id="tbl_id4497512">
+<tablerow>
+<tablecell>
+<paragraph role="tablehead" id="par_idN10AB6" xml-lang="en-US" l10n="NEW">Microsoft Office format</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablehead" id="par_idN10ABC" xml-lang="en-US" l10n="NEW">Supported encryption method</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AC3" xml-lang="en-US" l10n="NEW">Word 6.0, Word 95</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AC9" xml-lang="en-US" l10n="NEW">Weak XOR encryption</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AD0" xml-lang="en-US" l10n="NEW">Word 97, Word 2000, Word XP, Word 2003</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AD6" xml-lang="en-US" l10n="NEW">Office 97/2000 compatible encryption</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10ADD" xml-lang="en-US" l10n="NEW">Word XP, Word 2003</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AE3" xml-lang="en-US" l10n="NEW">Weak XOR encryption from older Word versions</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AEA" xml-lang="en-US" l10n="NEW">Excel 2.1, Excel 3.0, Excel 4.0, Excel 5.0, Excel 95</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AF0" xml-lang="en-US" l10n="NEW">Weak XOR encryption</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AF7" xml-lang="en-US" l10n="NEW">Excel 97, Excel 2000, Excel XP, Excel 2003</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10AFD" xml-lang="en-US" l10n="NEW">Office 97/2000 compatible encryption</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10B04" xml-lang="en-US" l10n="NEW">Excel XP, Excel 2003</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_idN10B0A" xml-lang="en-US" l10n="NEW">Weak XOR encryption from older Excel versions</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+<paragraph role="paragraph" id="par_idN10B0D" xml-lang="en-US" l10n="NEW">Other encryption methods are not supported.</paragraph>
+<section id="relatedtopics">
+<embed href="text/shared/guide/ms_user.xhp#ms_user"/>
+<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="33"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
+</section>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/ms_user.xhp b/helpcontent2/source/text/shared/guide/ms_user.xhp
index 264c3fa09e..5525bec140 100755
--- a/helpcontent2/source/text/shared/guide/ms_user.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_user.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ms_user.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguidems_userxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguidems_userxml" indexer="include">
<title id="tit" xml-lang="en-US">Using Microsoft Office and $[officename]</title>
<filename>/text/shared/guide/ms_user.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-17T13:21:46">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150789"><bookmark_value>Office;Microsoft Office and $[officename]</bookmark_value>
@@ -53,43 +49,43 @@
</bookmark>
<paragraph role="heading" id="hd_id3150789" xml-lang="en-US" level="1" l10n="U" oldref="30"><variable id="ms_user"><link href="text/shared/guide/ms_user.xhp" name="Using Microsoft Office and $[officename]">Using Microsoft Office and $[officename]</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="U" oldref="1">$[officename] can open and save documents in the Microsoft Office file formats.</paragraph>
+<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="CHG" oldref="1">$[officename] can open and save documents in the Microsoft Office file formats. Microsoft Office Open XML formats can be read, but not saved.</paragraph>
<paragraph role="heading" id="hd_id3145345" xml-lang="en-US" level="2" l10n="U" oldref="2">Opening a Microsoft Office File</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>File - Open</emph>. Select a Microsoft Office file in the $[officename] file open dialog.</paragraph>
</listitem>
</list>
<table id="tbl_id3147653">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3156346" xml-lang="en-US" l10n="U" oldref="4">MS Office file...</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155342" xml-lang="en-US" l10n="U" oldref="5">...will open in $[officename] module</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153543" xml-lang="en-US" l10n="U" oldref="6">MS Word, *.doc</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3153543" xml-lang="en-US" l10n="U" oldref="6">MS Word, *.doc, *.docx</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147620" xml-lang="en-US" l10n="U" oldref="7">$[officename] Writer</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154898" xml-lang="en-US" l10n="U" oldref="8">MS Excel, *.xls</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3154898" xml-lang="en-US" l10n="U" oldref="8">MS Excel, *.xls, *.xlsx</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149580" xml-lang="en-US" l10n="U" oldref="9">$[officename] Calc</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147574" xml-lang="en-US" l10n="U" oldref="10">MS PowerPoint, *.ppt, *.pps</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3147574" xml-lang="en-US" l10n="U" oldref="10">MS PowerPoint, *.ppt, *.pps, *.pptx</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153626" xml-lang="en-US" l10n="U" oldref="11">$[officename] Impress</paragraph>
</tablecell>
</tablerow>
@@ -122,18 +118,19 @@
</switch>
<paragraph role="heading" id="hd_id3153092" xml-lang="en-US" level="2" l10n="CHG" oldref="20">Converting Many Microsoft Office Files into OpenDocument Format</paragraph>
<paragraph role="paragraph" id="par_id3146986" xml-lang="en-US" l10n="CHG" oldref="21">The <emph>Document Converter Wizard</emph> will copy and convert all Microsoft Office files in a folder into $[officename] documents in the OpenDocument file format. You can specify the folder to be read, and the folder where the converted files are to be saved.</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3150486" xml-lang="en-US" l10n="U" oldref="22">Choose <link href="text/shared/autopi/01130000.xhp" name="File - AutoPilot - Document Converter"><emph>File - Wizards - Document Converter</emph></link> to start the wizard.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3154319" xml-lang="en-US" level="2" l10n="U" oldref="23">Macros in Microsoft Office and $[officename]</paragraph>
-<paragraph role="paragraph" id="par_id3154921" xml-lang="en-US" l10n="U" oldref="24">Microsoft Office and $[officename] cannot run the same macro code. Microsoft Office uses VBA (Visual Basic for Applications) code, and $[officename] uses Basic code based on the $[officename] API (Application Program Interface) environment. Although the programming language is the same, the objects and methods are different.</paragraph>
+<paragraph role="paragraph" id="par_id3154921" xml-lang="en-US" l10n="U" oldref="24">With a few exceptions, Microsoft Office and $[officename] cannot run the same macro code. Microsoft Office uses VBA (Visual Basic for Applications) code, and $[officename] uses Basic code based on the $[officename] API (Application Program Interface) environment. Although the programming language is the same, the objects and methods are different.</paragraph>
+<paragraph role="note" id="par_id0804200804173539" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can run some Excel Visual Basic scripts if you enable this feature at <item type="menuitem">Tools - Options - Load/Save - VBA Properties</item>.</paragraph>
<paragraph role="paragraph" id="par_id3152577" xml-lang="en-US" l10n="U" oldref="25">If you use macros in one of the applications and want to use the same functionality in the other application, you must edit the macros. $[officename] can load the macros that are contained within Microsoft Office files and you can then view and edit the macro code in the $[officename] <link href="text/shared/main0600.xhp" name="Basic IDE">Basic IDE</link> editor.</paragraph>
<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="3" l10n="U" oldref="26">You can choose to preserve or delete VBA macros</paragraph>
<paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="27">Open a Microsoft Office document that contains VBA macro code. Change only the normal contents (text, cells, graphics), and do not edit the macros. Save the document as a Microsoft Office file type. Open the file in Microsoft Office, and the VBA macros will run as before.</paragraph>
<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="U" oldref="28">You may delete the VBA macros from the Microsoft Office file on loading or on saving.</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="29">Choose <link href="text/shared/optionen/01130100.xhp" name="Tools - Options - Load/Save - VBA Properties"><emph>Tools - Options - Load/Save - VBA Properties</emph></link> to set the VBA macro handling of $[officename].</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index 1ac488d61d..0ee5980242 100755
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: paintbrush.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidepaintbrushxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguidepaintbrushxml" indexer="include">
<title id="tit" xml-lang="en-US">Copying Attributes With the Format Paintbrush</title>
<filename>/text/shared/guide/paintbrush.xhp</filename>
</topic>
@@ -51,7 +49,7 @@
<paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1" l10n="NEW"><variable id="formatpaintbrush"><link href="text/shared/guide/paintbrush.xhp">Copying Formatting With the Format Paintbrush</link>
</variable></paragraph>
</section>
-<paragraph role="paragraph" id="par_idN10655" xml-lang="en-US" l10n="NEW">You can use the Format Paintbrush tool to copy formatting from a text selection or object and apply the formatting to another text selection or object.</paragraph>
+<paragraph role="paragraph" id="par_idN10655" xml-lang="en-US" l10n="NEW">You can use the Format Paintbrush tool to copy formatting from a text selection in Writer or from an object and apply the formatting to another text selection or object.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN106DD" xml-lang="en-US" l10n="NEW">Select the text (in Writer) or object whose formatting you want to copy.</paragraph>
@@ -62,96 +60,99 @@
<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
<paragraph role="tip" id="par_idN10663" xml-lang="en-US" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
-<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id209967" xml-lang="en-US">Icon</alt>
+<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt id="alt_id209967" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image>. After you apply all the formatting, click the icon again.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN1066E" xml-lang="en-US" l10n="NEW">Select or click the text (in Writer) or object that you want to apply the formatting to.</paragraph>
</listitem>
</list>
-<paragraph role="tip" id="par_idN10716" xml-lang="en-US" l10n="NEW">To exclude paragraph formatting, hold down Ctrl when you click. To exclude character formatting, hold down Ctrl+Shift when you click.</paragraph>
+<paragraph role="tip" id="par_idN10716" xml-lang="en-US" l10n="NEW">To exclude paragraph formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline> when you click. To exclude character formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift when you click.</paragraph>
<paragraph role="paragraph" id="par_idN10671" xml-lang="en-US" l10n="NEW">The following table describes the formatting attributes that the <emph>Format Paintbrush</emph> can copy:</paragraph>
<table id="tbl_id599688">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10691" xml-lang="en-US" l10n="NEW">Type of Selection</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10697" xml-lang="en-US" l10n="NEW">Comment</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1069E" xml-lang="en-US" l10n="NEW">Nothing selected, but cursor is inside a text passage</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106A4" xml-lang="en-US" l10n="NEW">Copies the formatting of the current paragraph and the character formatting of the next character in the text flow direction.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106AB" xml-lang="en-US" l10n="NEW">Text is selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106B1" xml-lang="en-US" l10n="NEW">Copies the formatting of the last selected character and of the paragraph that contains the character.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106B8" xml-lang="en-US" l10n="NEW">Frame is selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106BE" xml-lang="en-US" l10n="NEW">Copies the frame attributes that are defined in Format - Frame dialog. The contents, size, position, linking, hyperlinks, and macros in the frame are not copied.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106C5" xml-lang="en-US" l10n="NEW">Object is selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106CB" xml-lang="en-US" l10n="NEW">Copies the object formatting that is defined in the Format - Graphics or Format - Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106D2" xml-lang="en-US" l10n="NEW">Form control is selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106D8" xml-lang="en-US" l10n="NEW">Not supported</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106DF" xml-lang="en-US" l10n="NEW">Drawing object is selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106E5" xml-lang="en-US" l10n="NEW">Copies all formatting attributes. In Impress and Draw, the text contents of the object is also copied.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106EC" xml-lang="en-US" l10n="NEW">Text within drawing object or within Calc cells is selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106F2" xml-lang="en-US" l10n="NEW">Not supported</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106F9" xml-lang="en-US" l10n="NEW">Writer table or cells are selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN106FF" xml-lang="en-US" l10n="NEW">Copies the formatting that is specified in Table, Text Flow, Borders, and Background tab pages in the Format - Table dialog. The paragraph and character formatting are also copied.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10706" xml-lang="en-US" l10n="NEW">Calc table or cells are selected</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN1070C" xml-lang="en-US" l10n="NEW">Copies the formatting that is specified in the Format - Cells dialog as well as the formatting of the cell contents</paragraph>
</tablecell>
</tablerow>
</table>
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/redlining_accept.xhp b/helpcontent2/source/text/shared/guide/redlining_accept.xhp
index 54527827b7..310e844612 100755
--- a/helpcontent2/source/text/shared/guide/redlining_accept.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_accept.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: redlining_accept.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguideredlining_acceptxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguideredlining_acceptxml" indexer="include">
<title id="tit" xml-lang="en-US">Accepting or Rejecting Changes</title>
<filename>/text/shared/guide/redlining_accept.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-13T15:51:09">FPE: Deleted screenshot</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150247"><bookmark_value>changes; accepting or rejecting</bookmark_value>
@@ -50,7 +46,12 @@
</bookmark>
<paragraph role="heading" id="hd_id3150247" xml-lang="en-US" level="1" l10n="U" oldref="23"><variable id="redlining_accept"><link href="text/shared/guide/redlining_accept.xhp" name="Accepting or Rejecting Changes">Accepting or Rejecting Changes</link>
</variable></paragraph>
-<paragraph role="note" id="par_id1491134" xml-lang="en-US" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
+<paragraph role="paragraph" id="par_id1491134" xml-lang="en-US" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
+<switch select="appl">
+<case select="WRITER">
+<paragraph role="note" id="par_id1110200810120034" xml-lang="en-US" l10n="NEW">In Writer text documents you can also accept or reject changes by choosing commands from the context menu.</paragraph>
+</case>
+</switch>
<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="24">When you edit a document in which others have made changes, you can accept or reject the changes individually or all together.</paragraph>
<list type="ordered">
<listitem>
diff --git a/helpcontent2/source/text/shared/guide/scripting.xhp b/helpcontent2/source/text/shared/guide/scripting.xhp
index 0fab138853..0b02734ac4 100755
--- a/helpcontent2/source/text/shared/guide/scripting.xhp
+++ b/helpcontent2/source/text/shared/guide/scripting.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: scripting.xhp,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidescriptingxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguidescriptingxml" indexer="include">
<title id="tit" xml-lang="en-US">Scripting %PRODUCTNAME</title>
<filename>/text/shared/guide/scripting.xhp</filename>
</topic>
@@ -52,11 +50,12 @@
<bookmark_value>controls;assigning macros (Basic)</bookmark_value>
<bookmark_value>menus;assigning macros</bookmark_value>
<bookmark_value>events;assigning scripts</bookmark_value>
-</bookmark><comment>MW deleted "programming;...", "scripting in programming", "BeanShell scripting", "Basic;..." and "java;..."</comment><comment>MW added "controls;..", "menus;..." and "events;..."</comment><paragraph role="heading" id="par_idN1070A" xml-lang="en-US" level="1" l10n="NEW"><variable id="scripting"><link href="text/shared/guide/scripting.xhp">Assigning Scripts in %PRODUCTNAME</link>
+</bookmark><comment>MW deleted "programming;...", "scripting in programming", "BeanShell scripting", "Basic;..." and "java;..."</comment><comment>MW added "controls;..", "menus;..." and "events;..."</comment>
+<paragraph role="heading" id="par_idN1070A" xml-lang="en-US" level="1" l10n="NEW"><variable id="scripting"><link href="text/shared/guide/scripting.xhp">Assigning Scripts in %PRODUCTNAME</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10728" xml-lang="en-US" l10n="NEW">You can assign custom scripts (macros) to menu items, icons, dialog controls, and events in %PRODUCTNAME.</paragraph>
<paragraph role="paragraph" id="par_idN1072B" xml-lang="en-US" l10n="NEW">%PRODUCTNAME internally supports the following scripting languages:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN10731" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Basic</paragraph>
</listitem>
@@ -67,7 +66,7 @@
<paragraph role="paragraph" id="par_idN1073D" xml-lang="en-US" l10n="CHG">BeanShell</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id6797082" xml-lang="en-US" l10n="CHG">Python (not included with all distributions)<comment>i50641</comment><comment>removed switch, added text</comment></paragraph>
</listitem>
@@ -156,7 +155,7 @@
<paragraph role="paragraph" id="par_idN10795" xml-lang="en-US" l10n="NEW">Select the embedded object, for example a chart, in your document.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_idN10ADB" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Object - Macro</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN10ADB" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Frame/Object - Macro</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN10ADF" xml-lang="en-US" l10n="NEW">In the <emph>Macros</emph> list box, open the %PRODUCTNAME Scripts entry.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/space_hyphen.xhp b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
index b0f0b26339..796a9db11b 100755
--- a/helpcontent2/source/text/shared/guide/space_hyphen.xhp
+++ b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: space_hyphen.xhp,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +37,7 @@
<meta>
-<topic id="textsharedguidespace_hyphenxml" indexer="include">
+<topic id="textsharedguidespace_hyphenxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Inserting Protected Spaces, Hyphens and Conditional Separators</title>
<filename>/text/shared/guide/space_hyphen.xhp</filename>
</topic>
@@ -57,8 +57,8 @@
<paragraph role="head1" id="hd_id3155364" xml-lang="en-US" l10n="U" oldref="30"><variable id="space_hyphen"><link href="text/shared/guide/space_hyphen.xhp" name="Inserting Protected Spaces, Hyphens and Conditional Separators">Inserting Protected Spaces, Hyphens and Conditional Separators</link>
</variable></paragraph>
<paragraph role="heading" id="hd_id3156136" xml-lang="en-US" level="2" l10n="U" oldref="61">Non-breaking spaces</paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="31">To prevent two words from being separated at the end of a line, press the <switchinline select="sys"><caseinline select="MAC">Command key
-</caseinline><defaultinline>Ctrl key</defaultinline></switchinline> when you type a space between the words.</paragraph>
+<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="31">To prevent two words from being separated at the end of a line, hold down the <switchinline select="sys"><caseinline select="MAC">Command key
+</caseinline><defaultinline>Ctrl key</defaultinline></switchinline> and the Shift key when you type a space between the words.</paragraph>
<paragraph role="note" id="par_id5749687" xml-lang="en-US" l10n="NEW">In Calc, you cannot insert non-breaking spaces.</paragraph>
<paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2" l10n="U" oldref="62">Non-breaking dash</paragraph>
<paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="32">An example of a non-breaking dash is a company name such as A-Z. Obviously you would not want A- to appear at the end of a line and Z at the beginning of the next line. To solve this problem, press Shift+Ctrl+ minus sign. In other words, hold down the Shift and Ctrl keys and press the minus key.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/startcenter.xhp b/helpcontent2/source/text/shared/guide/startcenter.xhp
new file mode 100644
index 0000000000..cf4cc16071
--- /dev/null
+++ b/helpcontent2/source/text/shared/guide/startcenter.xhp
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: startcenter.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textsharedguidestartcenterxhp" indexer="include">
+<title id="tit" xml-lang="en-US">Start Center</title>
+<filename/>
+</topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id0820200802500562"><bookmark_value>backing window</bookmark_value>
+<bookmark_value>start center</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/HID_BACKINGWINDOW" id="bm_id0820200802550234" localize="false"/>
+<paragraph role="heading" id="hd_id0820200802524447" xml-lang="en-US" level="1" l10n="NEW"><variable id="startcenter"><link href="text/shared/guide/startcenter.xhp">Start Center</link>
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id0820200803204063" xml-lang="en-US" l10n="NEW">Welcome to %PRODUCTNAME. Thank you for using the %PRODUCTNAME <link href="text/shared/05/00000110.xhp">application help</link>. Press F1 whenever you need help using the %PRODUCTNAME software.</paragraph>
+<paragraph role="paragraph" id="par_id0820200802524413" xml-lang="en-US" l10n="NEW">You see the Start Center when no document is open in %PRODUCTNAME. <ahelp hid=".">Click an icon to open a new document, to open a file dialog, or to browse to a featured web page.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id0820200803104810" xml-lang="en-US" l10n="NEW">The top six icons each open a new document of the specified type, using the default template for a new document:</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="paragraph" id="par_id0820200803104978" xml-lang="en-US" l10n="NEW">
+<emph>Text Document</emph> opens %PRODUCTNAME <link href="text/swriter/main0000.xhp">Writer</link></paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0820200803104998" xml-lang="en-US" l10n="NEW">
+<emph>Spreadsheet</emph> opens %PRODUCTNAME <link href="text/scalc/main0000.xhp">Calc</link></paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0820200803104927" xml-lang="en-US" l10n="NEW">
+<emph>Presentation</emph> opens %PRODUCTNAME <link href="text/simpress/main0000.xhp">Impress</link></paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0820200803104948" xml-lang="en-US" l10n="NEW">
+<emph>Drawing</emph> opens %PRODUCTNAME <link href="text/sdraw/main0000.xhp">Draw</link></paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0820200803105089" xml-lang="en-US" l10n="NEW">
+<emph>Database</emph> opens %PRODUCTNAME <link href="text/shared/explorer/database/main.xhp">Base</link></paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0820200803105015" xml-lang="en-US" l10n="NEW">
+<emph>Formula</emph> opens %PRODUCTNAME <link href="text/smath/main0000.xhp">Math</link></paragraph>
+</listitem>
+</list>
+<paragraph role="paragraph" id="par_id0820200803105045" xml-lang="en-US" l10n="NEW">The <emph>Templates</emph> icon opens the <link href="text/shared/guide/aaa_start.xhp">Templates and Documents</link> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id082020080310500" xml-lang="en-US" l10n="NEW">The <emph>Open a document</emph> icon presents a <link href="text/shared/guide/doc_open.xhp">file open</link> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id0820200803105158" xml-lang="en-US" l10n="NEW">The remaining icons open your system default browser to show different web pages related to %PRODUCTNAME.</paragraph>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/makefile.mk b/helpcontent2/source/text/shared/makefile.mk
index 47e631efc1..8f5dba7586 100644
--- a/helpcontent2/source/text/shared/makefile.mk
+++ b/helpcontent2/source/text/shared/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.11 $
+# $Revision: 1.11.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/shared/optionen/01010200.xhp b/helpcontent2/source/text/shared/optionen/01010200.xhp
index 569976ea7f..da5ba92584 100644
--- a/helpcontent2/source/text/shared/optionen/01010200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010200.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: 01010200.xhp,v $
*
- * $Revision: 1.20 $
+ * $Revision: 1.20.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +37,7 @@
<meta>
-<topic id="textsharedoptionen01010200xml" indexer="include">
+<topic id="textsharedoptionen01010200xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">General</title>
<filename>/text/shared/optionen/01010200.xhp</filename>
</topic>
diff --git a/helpcontent2/source/text/shared/optionen/01010301.xhp b/helpcontent2/source/text/shared/optionen/01010301.xhp
index d2a8f40a4f..fbd4b27e3f 100755
--- a/helpcontent2/source/text/shared/optionen/01010301.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010301.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01010301.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,23 +32,19 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01010301xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01010301xml" indexer="include">
<title id="tit" xml-lang="en-US">Edit Paths</title>
<filename>/text/shared/optionen/01010301.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-07-11T09:45:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Edit Paths</paragraph><comment>changed, see OOoPaths spec doc</comment>
<paragraph role="paragraph" id="par_id3149762" xml-lang="en-US" l10n="CHG" oldref="2">In the <emph>Edit Paths </emph>dialog, you can select some folders that are available in $[officename].</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#pfade"/>
+<embed href="text/shared/00/00000406.xhp#pfade"/>
</section>
<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_MULTIPATH:LB_MULTIPATH" id="bm_id3154938" localize="false"/>
<paragraph role="heading" id="hd_id3147559" xml-lang="en-US" level="2" l10n="CHG" oldref="3">Paths</paragraph>
@@ -56,6 +52,6 @@
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH" id="bm_id3150768" localize="false"/>
<paragraph role="heading" id="hd_id3148798" xml-lang="en-US" level="2" l10n="U" oldref="5">Add</paragraph>
<paragraph role="paragraph" id="par_id3153106" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH">Opens the <emph>Select Path</emph> dialog to select another folder or the <emph>Open</emph> dialog to select another file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH" id="bm_id3154686" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen1"/>
+<embed href="text/shared/00/00000001.xhp#loeschen1"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01010400.xhp b/helpcontent2/source/text/shared/optionen/01010400.xhp
index 9e4e6fdbad..e7070bb50d 100644
--- a/helpcontent2/source/text/shared/optionen/01010400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010400.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01010400.xhp,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedoptionen01010400xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01010400xml" indexer="include">
<title id="tit" xml-lang="en-US">Writing Aids</title>
<filename>/text/shared/optionen/01010400.xhp</filename>
</topic>
@@ -54,61 +52,77 @@
<bookmark_value>ignore list for spellcheck</bookmark_value>
<bookmark_value>spellcheck; ignore list</bookmark_value>
<bookmark_value>hyphenation; minimal number of characters</bookmark_value>
-<bookmark_value>old German spellcheck</bookmark_value>
-<bookmark_value>new German spellcheck</bookmark_value>
-<bookmark_value>German spellcheck</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_LINGU" id="bm_id3147291" localize="false"/><paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01010400.xhp" name="Writing Aids">Writing Aids</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_LINGU" id="bm_id3147291" localize="false"/><comment>removed "german" references, i78879</comment>
+<paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01010400.xhp" name="Writing Aids">Writing Aids</link></paragraph>
<paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_LINGU">Specifies the properties of the spellcheck, thesaurus and hyphenation.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#writingaids"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_CLB_LINGU_MODULES" id="bm_id3147653" localize="false"/><paragraph role="heading" id="hd_id3149096" xml-lang="en-US" level="2" l10n="U" oldref="33">Available Language Modules</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_CLB_LINGU_MODULES" id="bm_id3147653" localize="false"/>
+<paragraph role="heading" id="hd_id3149096" xml-lang="en-US" level="2" l10n="U" oldref="33">Available Language Modules</paragraph>
<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_CLB_LINGU_MODULES">Contains the installed language modules.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="35">A language module can contain one, two or three submodules: Spellcheck, hyphenation and thesaurus. Each sub-module can be available in one or more languages. If you click in front of the name of the module, you activate all the available sub-modules simultaneously. If you remove a set mark, you deactivate all the available sub-modules simultaneously. If you wish to activate or deactivate individual sub-modules, click the<emph> Edit button </emph>to open the <link href="text/shared/optionen/01010401.xhp" name="Edit Modules"><emph>Edit Modules</emph></link> dialog.</paragraph>
<paragraph role="note" id="par_id3294778" xml-lang="en-US" l10n="NEW">The configuration allows for two different directories: one folder where the user has write permissions, and one without write permissions. The user can only edit and delete the user dictionaries that are located in the writable path. Other dictionaries can be read only.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_MODULES_EDIT" id="bm_id3154898" localize="false"/><paragraph role="heading" id="hd_id3154307" xml-lang="en-US" level="3" l10n="U" oldref="36">Edit</paragraph>
-<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_MODULES_EDIT">To edit a language module, select it and click <emph>Edit</emph>.</ahelp> The <link href="text/shared/optionen/01010401.xhp" name="Edit Modules"><emph>Edit Modules</emph></link> dialog appears.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_MODULES_EDIT" id="bm_id3154898" localize="false"/>
+<paragraph role="heading" id="hd_id3154307" xml-lang="en-US" level="3" l10n="U" oldref="36">Edit</paragraph>
+<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_MODULES_EDIT">To edit a language module, select it and click <emph>Edit</emph>.</ahelp> The <link href="text/shared/optionen/01010401.xhp" name="Edit Modules"><emph>Edit </emph>
+<emph>Modules</emph></link> dialog appears.</paragraph>
<section id="benutzerwb">
-<bookmark xml-lang="en-US" branch="hid/HID_CLB_EDIT_MODULES_DICS" id="bm_id3150503" localize="false"/><paragraph role="heading" id="hd_id3153348" xml-lang="en-US" level="2" l10n="U" oldref="60">User-defined dictionaries</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_CLB_EDIT_MODULES_DICS" id="bm_id3150503" localize="false"/>
+<paragraph role="heading" id="hd_id3153348" xml-lang="en-US" level="2" l10n="U" oldref="60">User-defined dictionaries</paragraph>
<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="62"><ahelp hid="HID_CLB_EDIT_MODULES_DICS">Lists the available user dictionaries.</ahelp> Mark the user dictionaries that you want to use for spellcheck and hyphenation.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_DICT_NEW" id="bm_id3149670" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_NEW_DIC" id="bm_id3154923" localize="false"/><paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="3" l10n="U" oldref="63">New</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_NEW_DIC" id="bm_id3154923" localize="false"/>
+<paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="3" l10n="U" oldref="63">New</paragraph>
<paragraph role="paragraph" id="par_id3146794" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_NEW_DIC">Opens the <emph>New Dictionary</emph> dialog, in which you can name a new user-defined dictionary or dictionary of exceptions and specify the language.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3151054" xml-lang="en-US" level="3" l10n="U" oldref="65">New Dictionary</paragraph>
<paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="66">In the <emph>Dictionary</emph> section you can name a new user-defined dictionary or dictionary of exceptions and specify the language.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_NEWDICT:ED_DICTNAME" id="bm_id3151210" localize="false"/><paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="67">Name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_NEWDICT:ED_DICTNAME" id="bm_id3151210" localize="false"/>
+<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="3" l10n="U" oldref="67">Name</paragraph>
<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="68"><ahelp hid="SVX:EDIT:RID_SFXDLG_NEWDICT:ED_DICTNAME">Specifies the name of the new custom dictionary.</ahelp> The file extension "*.DIC" is automatically appended.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_NEWDICT:LB_DICTLANG" id="bm_id3148451" localize="false"/><paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="3" l10n="U" oldref="69">Language</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_NEWDICT:LB_DICTLANG" id="bm_id3148451" localize="false"/>
+<paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="3" l10n="U" oldref="69">Language</paragraph>
<paragraph role="paragraph" id="par_id3148920" xml-lang="en-US" l10n="U" oldref="70"><ahelp hid="SVX:LISTBOX:RID_SFXDLG_NEWDICT:LB_DICTLANG">By selecting a certain language you can limit the use of the custom dictionary.</ahelp> By selecting <emph>All</emph> the custom dictionary is used independently of the current language.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SFXDLG_NEWDICT:BTN_EXCEPT" id="bm_id3145606" localize="false"/><paragraph role="heading" id="hd_id3153106" xml-lang="en-US" level="3" l10n="U" oldref="71">Exceptions (-)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SFXDLG_NEWDICT:BTN_EXCEPT" id="bm_id3145606" localize="false"/>
+<paragraph role="heading" id="hd_id3153106" xml-lang="en-US" level="3" l10n="U" oldref="71">Exceptions (-)</paragraph>
<paragraph role="paragraph" id="par_id3149561" xml-lang="en-US" l10n="CHG" oldref="72"><ahelp hid="SVX:CHECKBOX:RID_SFXDLG_NEWDICT:BTN_EXCEPT">Specifies whether you wish to avoid certain words in your documents.</ahelp> In this way, you can create a custom dictionary of all the words to be avoided. If this exception dictionary is activated, during spellchecking you receive a corresponding note about any words which should be avoided.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_DICT_EDIT" id="bm_id3147213" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_EDIT_DIC" id="bm_id3155411" localize="false"/><paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="3" l10n="U" oldref="73">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_EDIT_DIC" id="bm_id3155411" localize="false"/>
+<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="3" l10n="U" oldref="73">Edit</paragraph>
<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="74"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_EDIT_DIC">Opens the <emph>Edit custom dictionary</emph> dialog, in which you can add to your custom dictionary or edit existing entries.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="75">In the <emph>Edit custom dictionary </emph>dialog you have the option to enter new terms or edit existing entries. If you edit an exception dictionary, the dialog has the added facility of defining an exception for a word. During the spellcheck this exception is then listed as a suggestion.</paragraph>
<paragraph role="paragraph" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="76">When a dictionary is edited, a check is made on the status of the file. If the file is write-protected, it cannot be changed. The buttons <emph>New</emph> and <emph>Delete</emph> are then deactivated. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_ALLDICTS" id="bm_id3155415" localize="false"/><paragraph role="heading" id="hd_id3150116" xml-lang="en-US" level="3" l10n="U" oldref="77">Book</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_ALLDICTS" id="bm_id3155415" localize="false"/>
+<paragraph role="heading" id="hd_id3150116" xml-lang="en-US" level="3" l10n="U" oldref="77">Book</paragraph>
<paragraph role="paragraph" id="par_id3147394" xml-lang="en-US" l10n="U" oldref="78"><ahelp hid="SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_ALLDICTS">Specifies the book to be edited.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3154730" xml-lang="en-US" l10n="CHG" oldref="79"><variable id="ignore">The <emph>IgnoreAllList (All) </emph>includes all words that have been marked with <emph>Ignore</emph> during spellcheck. This list is valid only for the current spellcheck.
</variable></paragraph>
<paragraph role="note" id="par_id3154757" xml-lang="en-US" l10n="U" oldref="80">The <emph>IgnoreAllList</emph> entry cannot be selected and cannot be deleted. Only the words included as content can be deleted. This happens automatically each time that $[officename] is closed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_DICTLANG" id="bm_id3156385" localize="false"/><paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3" l10n="U" oldref="81">Language</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_DICTLANG" id="bm_id3156385" localize="false"/>
+<paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3" l10n="U" oldref="81">Language</paragraph>
<paragraph role="paragraph" id="par_id3154255" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="SVX:LISTBOX:RID_SFXDLG_EDITDICT:LB_DICTLANG">Assigns a new language to the current custom dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_EDITDICT:ED_WORD" id="bm_id3155334" localize="false"/><paragraph role="heading" id="hd_id3151189" xml-lang="en-US" level="3" l10n="U" oldref="83">Word</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_EDITDICT:ED_WORD" id="bm_id3155334" localize="false"/>
+<paragraph role="heading" id="hd_id3151189" xml-lang="en-US" level="3" l10n="U" oldref="83">Word</paragraph>
<paragraph role="paragraph" id="par_id3151252" xml-lang="en-US" l10n="CHG" oldref="84"><ahelp hid="SVX:EDIT:RID_SFXDLG_EDITDICT:ED_WORD">You can type a new word for inclusion in the dictionary. In the list below you will see the contents of the current custom dictionary.</ahelp> If you select a word from this list it is displayed in the text field. If you type a word with a trailing = character, such as "AutoComplete=", the word is never automatically hyphenated and no hyphenation is suggested. Typing "Auto=Complete" results in the word being hyphenated, or a hyphenation suggested, where you insert the = sign.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_EDITDICT:ED_REPLACE" id="bm_id3147346" localize="false"/><paragraph role="heading" id="hd_id3155175" xml-lang="en-US" level="3" l10n="U" oldref="85">Suggestion</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SFXDLG_EDITDICT:ED_REPLACE" id="bm_id3147346" localize="false"/>
+<paragraph role="heading" id="hd_id3155175" xml-lang="en-US" level="3" l10n="U" oldref="85">Suggestion</paragraph>
<paragraph role="paragraph" id="par_id3147323" xml-lang="en-US" l10n="CHG" oldref="86"><ahelp hid="SVX:EDIT:RID_SFXDLG_EDITDICT:ED_REPLACE">This input field is only available if you are editing an exception dictionary. The field shows the alternative suggestion for the current word in the "Word" text box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE" id="bm_id3149566" localize="false"/><paragraph role="heading" id="hd_id3147361" xml-lang="en-US" level="3" l10n="U" oldref="88">New</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE" id="bm_id3149566" localize="false"/>
+<paragraph role="heading" id="hd_id3147361" xml-lang="en-US" level="3" l10n="U" oldref="88">New</paragraph>
<paragraph role="paragraph" id="par_id3163808" xml-lang="en-US" l10n="U" oldref="89"><ahelp hid="SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE">Adds the word in the <emph>Word </emph>text field to your current custom dictionary. The word in the <emph>Suggestion </emph>field is also added when working with exception dictionaries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE" id="bm_id3153790" localize="false"/><paragraph role="paragraph" id="par_id3145790" xml-lang="en-US" l10n="U" oldref="91"><ahelp hid="." visibility="hidden">Removes the marked word from the current custom dictionary.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_DEL_DIC" id="bm_id3150787" localize="false"/><paragraph role="paragraph" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="93"><ahelp hid="." visibility="hidden">Deletes the selected dictionary after a confirmation, provided it is not write-protected.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE" id="bm_id3153790" localize="false"/>
+<paragraph role="paragraph" id="par_id3145790" xml-lang="en-US" l10n="U" oldref="91"><ahelp hid="." visibility="hidden">Removes the marked word from the current custom dictionary.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_DEL_DIC" id="bm_id3150787" localize="false"/>
+<paragraph role="paragraph" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="93"><ahelp hid="." visibility="hidden">Deletes the selected dictionary after a confirmation, provided it is not write-protected.</ahelp></paragraph>
</section>
<section id="optionen">
-<bookmark xml-lang="en-US" branch="hid/HID_CLB_LINGU_OPTIONS" id="bm_id3153703" localize="false"/><paragraph role="heading" id="hd_id3149032" xml-lang="en-US" level="2" l10n="U" oldref="39">Options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_CLB_LINGU_OPTIONS" id="bm_id3153703" localize="false"/>
+<paragraph role="heading" id="hd_id3149032" xml-lang="en-US" level="2" l10n="U" oldref="39">Options</paragraph>
<paragraph role="paragraph" id="par_id3145259" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid="HID_CLB_LINGU_OPTIONS">Defines the options for the spellcheck and hyphenation.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_OPTIONS_EDIT" id="bm_id3147131" localize="false"/><paragraph role="heading" id="hd_id3149965" xml-lang="en-US" level="3" l10n="U" oldref="41">Edit</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_OPTIONS_EDIT" id="bm_id3147131" localize="false"/>
+<paragraph role="heading" id="hd_id3149965" xml-lang="en-US" level="3" l10n="U" oldref="41">Edit</paragraph>
<paragraph role="paragraph" id="par_id3153231" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_OPTIONS_EDIT">If you want to change a value, select the entry and then click <emph>Edit</emph>.</ahelp> You will see a dialog for entering a new value.</paragraph>
<paragraph role="heading" id="hd_id3150983" xml-lang="en-US" level="3" l10n="U" oldref="43">Check uppercase words</paragraph>
<paragraph role="paragraph" id="par_id3152582" xml-lang="en-US" l10n="CHG" oldref="44">Specifies that capitalization is checked during spellcheck.</paragraph>
@@ -118,21 +132,18 @@
<paragraph role="paragraph" id="par_id3154200" xml-lang="en-US" l10n="CHG" oldref="48">Checks for the correct use of capitals at the start of words during spellcheck.</paragraph>
<paragraph role="heading" id="hd_id3166424" xml-lang="en-US" level="3" l10n="U" oldref="49">Check special regions</paragraph>
<paragraph role="paragraph" id="par_id3150345" xml-lang="en-US" l10n="CHG" oldref="50">Specifies that special regions, such as drawing text, are checked during spellcheck.<comment>UFI: doesn't work in versions up to OOo 2.4</comment></paragraph>
-<paragraph role="heading" id="hd_id3155510" xml-lang="en-US" level="3" l10n="U" oldref="51">Check in all languages</paragraph>
-<paragraph role="paragraph" id="par_id3155378" xml-lang="en-US" l10n="CHG" oldref="52">Checks spelling against all installed language dictionaries. The "Language" font attribute is therefore not taken into account.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_AUTOSPELL_CHECK" id="bm_id5188694" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:SpellOnline" id="bm_id3166435" localize="false"/><paragraph role="heading" id="hd_id3166429" xml-lang="en-US" level="3" l10n="U" oldref="21">Check spelling as you type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SpellOnline" id="bm_id3166435" localize="false"/>
+<paragraph role="heading" id="hd_id3166429" xml-lang="en-US" level="3" l10n="U" oldref="21">Check spelling as you type</paragraph>
<paragraph role="paragraph" id="par_id3155531" xml-lang="en-US" l10n="U" oldref="6"><variable id="automatisch"><ahelp hid=".uno:SpellOnline">Automatically checks spelling as you type, and underlines errors.</ahelp>
</variable></paragraph>
<section id="automatischweiter">
-<paragraph role="paragraph" id="par_id3156291" xml-lang="en-US" l10n="CHG" oldref="32">Typing errors are highlighted in the document with a red underline. If you place the cursor over a word marked in this way, you can open the context menu to obtain a list of corrections. Select a correction to replace the word. If you make the same mistake again while editing the document, it will be marked as an error again.</paragraph><comment>UFI: changed para, removed note, see i60431</comment><paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="U" oldref="23">To place the word pair in the <link href="text/shared/01/06040200.xhp" name="AutoCorrect replacement table">AutoCorrect replacement table</link>, open the <link href="text/shared/01/06040500.xhp" name="AutoCorrect context menu">AutoCorrect context menu</link> and choose <emph>AutoCorrect</emph>. Make your selection from the submenu. The word is replaced and at the same time the word pair is placed in the replacement table.</paragraph>
+<paragraph role="paragraph" id="par_id3156291" xml-lang="en-US" l10n="CHG" oldref="32">Typing errors are highlighted in the document with a red underline. If you place the cursor over a word marked in this way, you can open the context menu to obtain a list of corrections. Select a correction to replace the word. If you make the same mistake again while editing the document, it will be marked as an error again.</paragraph><comment>UFI: changed para, removed note, see i60431</comment>
+<paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="U" oldref="23">To place the word pair in the <link href="text/shared/01/06040200.xhp" name="AutoCorrect replacement table">AutoCorrect replacement table</link>, open the <link href="text/shared/01/06040500.xhp" name="AutoCorrect context menu">AutoCorrect context menu</link> and choose <emph>AutoCorrect</emph>. Make your selection from the submenu. The word is replaced and at the same time the word pair is placed in the replacement table.</paragraph>
</section>
-<paragraph role="heading" id="hd_id3153912" xml-lang="en-US" level="3" l10n="U" oldref="7">Do not mark errors</paragraph>
-<paragraph role="paragraph" id="par_id3151240" xml-lang="en-US" l10n="CHG" oldref="8">Specifies that spelling errors will not be indicated with a red underline. This mode allows you to check the spelling "in the background" while typing or loading a text, but without the time-consuming red underlining. If you unmark the <emph>Do not mark errors</emph> box later, you will immediately see the red underlining.</paragraph>
-<paragraph role="heading" id="hd_id3149332" xml-lang="en-US" level="3" l10n="U" oldref="26">German spelling - old</paragraph>
-<paragraph role="paragraph" id="par_id3156017" xml-lang="en-US" l10n="CHG" oldref="29">Specifies that old German spelling rules are applied. If you don't check this box, $[officename] follows the new spelling rules for spellcheck and hyphenation.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SVXDLG_LNG_ED_NUM_PREBREAK_ED_PREBREAK" id="bm_id3148607" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_LNGDLG_NUM_PREBREAK" id="bm_id3159095" localize="false"/><paragraph role="heading" id="hd_id3150111" xml-lang="en-US" level="3" l10n="U" oldref="53">Minimal number of characters for hyphenation </paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_LNGDLG_NUM_PREBREAK" id="bm_id3159095" localize="false"/>
+<paragraph role="heading" id="hd_id3150111" xml-lang="en-US" level="3" l10n="U" oldref="53">Minimal number of characters for hyphenation </paragraph>
<paragraph role="paragraph" id="par_id3150316" xml-lang="en-US" l10n="U" oldref="54">Specifies the minimum number of characters required for automatic hyphenation to be applied. <ahelp hid="HID_LNGDLG_NUM_PREBREAK" visibility="hidden"> Type the minimum number of characters that must come before or after the hyphen.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148823" xml-lang="en-US" level="3" l10n="U" oldref="11">Characters before line break</paragraph>
<paragraph role="paragraph" id="par_id3156029" xml-lang="en-US" l10n="CHG" oldref="12">Sets the minimum number of characters of the word to be hyphenated that must remain at the end of the line.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01010500.xhp b/helpcontent2/source/text/shared/optionen/01010500.xhp
index 7f1dcb59ff..2370140d9a 100644
--- a/helpcontent2/source/text/shared/optionen/01010500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010500.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01010500.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01010500xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01010500xml" indexer="include">
<title id="tit" xml-lang="en-US">Colors</title>
<filename>/text/shared/optionen/01010500.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-22T15:39:01">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="farben">
@@ -53,7 +49,7 @@
<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_COLOR">Allows you to select a color from a color table, edit an existing color, or define new colors.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#color"/>
+<embed href="text/shared/00/00000406.xhp#color"/>
</section>
<paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="2" l10n="U" oldref="3">Color table</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_COLOR:EDT_NAME" id="bm_id3156215" localize="false"/>
@@ -96,7 +92,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_WORK_ON" id="bm_id3153767" localize="false"/>
<paragraph role="heading" id="hd_id3154754" xml-lang="en-US" level="2" l10n="U" oldref="31"><link href="text/shared/optionen/01010501.xhp" name="Edit">Edit</link></paragraph>
<embed href="text/shared/optionen/01010501.xhp#farbentext"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_COLOR:BTN_DELETE" id="bm_id3156382" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<bookmark xml-lang="en-US" branch="hid/SVX:IMAGEBUTTON:RID_SVXPAGE_COLOR:BTN_LOAD" id="bm_id3145148" localize="false"/>
<paragraph role="heading" id="hd_id3159267" xml-lang="en-US" level="2" l10n="U" oldref="33">Load Color List</paragraph>
<paragraph role="paragraph" id="par_id3154705" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXPAGE_COLOR:BTN_LOAD">Accesses the <emph>Open</emph> dialog, which allows you to select a color palette</ahelp>.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01010800.xhp b/helpcontent2/source/text/shared/optionen/01010800.xhp
index f0b924b8d9..725d62e527 100644
--- a/helpcontent2/source/text/shared/optionen/01010800.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010800.xhp
@@ -13,7 +13,7 @@
*
* $RCSfile: 01010800.xhp,v $
*
- * $Revision: 1.22 $
+ * $Revision: 1.22.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -50,8 +50,6 @@
<bookmark_value>settings; views</bookmark_value>
<bookmark_value>scaling; font sizes in user interface</bookmark_value>
<bookmark_value>font sizes; scaling on screen</bookmark_value>
-<bookmark_value>menus; inactive menu items</bookmark_value>
-<bookmark_value>commands; not visible</bookmark_value>
<bookmark_value>WYSIWYG in fonts lists</bookmark_value>
<bookmark_value>previews; fonts lists</bookmark_value>
<bookmark_value>font lists</bookmark_value>
diff --git a/helpcontent2/source/text/shared/optionen/01040600.xhp b/helpcontent2/source/text/shared/optionen/01040600.xhp
index 35b51b1716..b868a8ac6d 100644
--- a/helpcontent2/source/text/shared/optionen/01040600.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040600.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01040600.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -85,8 +85,8 @@
<paragraph role="paragraph" id="par_id3147427" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_SPACE">Specifies whether to represent every space in the text with a dot.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HSPACE" id="bm_id3148616" localize="false"/>
<paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="35">Non-breaking spaces</paragraph>
-<paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HSPACE">Specifies that non-breaking spaces are shown as gray boxes. Non-breaking spaces are not broken at the end of a line and are entered with the <switchinline select="sys"><caseinline select="MAC">Command+Spacebar
-</caseinline><defaultinline>Ctrl+Spacebar</defaultinline></switchinline> shortcut keys.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_HSPACE">Specifies that non-breaking spaces are shown as gray boxes. Non-breaking spaces are not broken at the end of a line and are entered with the <switchinline select="sys"><caseinline select="MAC">Command+Shift+Spacebar
+</caseinline><defaultinline>Ctrl+Shift+Spacebar</defaultinline></switchinline> shortcut keys.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTSHDWCRSR_CB_TAB" id="bm_id3152578" localize="false"/>
<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="37">Tabs</paragraph>
<paragraph role="paragraph" id="par_id3153574" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SW_CHECKBOX_TP_OPTSHDWCRSR_CB_TAB">Specifies that tab stops are displayed as small arrows.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01041000.xhp b/helpcontent2/source/text/shared/optionen/01041000.xhp
index e4890f0539..e4bd7d8df6 100755
--- a/helpcontent2/source/text/shared/optionen/01041000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01041000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01041000.xhp,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedoptionen01041000xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01041000xml" indexer="include">
<title id="tit" xml-lang="en-US">Compatibility</title>
<filename>/text/shared/optionen/01041000.xhp</filename>
</topic>
@@ -54,57 +52,63 @@
<bookmark_value>printer metrics for document formatting (Writer)</bookmark_value>
</bookmark>
<section id="compatibility">
-<bookmark xml-lang="en-US" branch="hid/HID_OPTCOMPATIBILITY_PAGE" id="bm_id2023987" localize="false"/><paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="1" l10n="NEW"><variable id="compatibility_var"><link href="text/shared/optionen/01041000.xhp">Compatibility</link>
+<bookmark xml-lang="en-US" branch="hid/HID_OPTCOMPATIBILITY_PAGE" id="bm_id2023987" localize="false"/>
+<paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="1" l10n="NEW"><variable id="compatibility_var"><link href="text/shared/optionen/01041000.xhp">Compatibility</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10625" xml-lang="en-US" l10n="NEW"><ahelp hid="53251">Specifies compatibility settings for text documents. These options help in fine-tuning %PRODUCTNAME when importing Microsoft Word documents.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#compatibility"/>
+<embed href="text/shared/00/00000406.xhp#compatibility"/>
</section>
<paragraph role="note" id="par_id3153876" xml-lang="en-US" l10n="CHG" oldref="17">Some of the settings defined here are only valid for the current document and must be defined separately for each document.</paragraph>
<section id="printermetrics">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS" id="bm_id3157844" localize="false"/><comment>UFI: added bookmarks due to bug #i24216#</comment><comment>UFI: this one called also from Impress options</comment><paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="3" l10n="U" oldref="47">Use printer metrics for document formatting</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS" id="bm_id3157844" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_MISC_CB_USE_PRINTER_METRICS" id="bm_id3149922" localize="false"/><comment>UFI: added bookmarks due to bug #i24216#</comment><comment>UFI: this one called also from Impress options</comment>
+<paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="3" l10n="U" oldref="47">Use printer metrics for document formatting</paragraph>
<paragraph role="paragraph" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS">Specifies that printer metrics are applied for printing and also for formatting the display on the screen.</ahelp> If this box is not checked, a printer independent layout will be used for screen display and printing.</paragraph>
<paragraph role="note" id="par_id3155768" xml-lang="en-US" l10n="U" oldref="49">If you set this option for the current document and then save the document, for example, in an older binary format, this option will not be saved. If you later open the file from the older format, this option will be set by default.</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST" id="bm_id3159268" localize="false"/><paragraph role="heading" id="hd_id3145640" xml-lang="en-US" level="3" l10n="CHG" oldref="9">Add spacing between paragraphs and tables (in current document)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST" id="bm_id3159268" localize="false"/>
+<paragraph role="heading" id="hd_id3145640" xml-lang="en-US" level="3" l10n="CHG" oldref="9">Add spacing between paragraphs and tables (in current document)</paragraph>
<paragraph role="paragraph" id="par_id3147339" xml-lang="en-US" l10n="U" oldref="18">In $[officename] Writer, paragraph spacing is defined differently than in MS Word documents. If you have defined spacing between two paragraphs or tables, spacing is also added in the corresponding MS Word documents.</paragraph>
<paragraph role="paragraph" id="par_id3151250" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST">Specifies whether to add MS Word-compatible spacing between paragraphs and tables in $[officename] Writer text documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART" id="bm_id3163806" localize="false"/><paragraph role="heading" id="hd_id3146317" xml-lang="en-US" level="3" l10n="CHG" oldref="29">Add paragraph and table spacing at tops of pages (in current document)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART" id="bm_id3163806" localize="false"/>
+<paragraph role="heading" id="hd_id3146317" xml-lang="en-US" level="3" l10n="CHG" oldref="29">Add paragraph and table spacing at tops of pages (in current document)</paragraph>
<paragraph role="paragraph" id="par_id3155333" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART">Specifies whether paragraph spacing at the top of a page will also be effective at the beginning of a page or column if the paragraph is positioned on the first page of the document.</ahelp> The same applies for a page break.</paragraph>
<paragraph role="note" id="par_id3145789" xml-lang="en-US" l10n="U" oldref="20">If you import an MS Word document, the spaces are automatically added during the conversion.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT" id="bm_id3155112" localize="false"/><paragraph role="heading" id="hd_id3149964" xml-lang="en-US" level="3" l10n="CHG" oldref="42">Use StarOffice 6.0/7 tab stop formatting<comment>UFI: spec "Tab Stop Compatibility"</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT" id="bm_id3155112" localize="false"/>
+<paragraph role="heading" id="hd_id3149964" xml-lang="en-US" level="3" l10n="CHG" oldref="42">Use StarOffice 6.0/7 tab stop formatting<comment>UFI: spec "Tab Stop Compatibility"</comment></paragraph>
<paragraph role="paragraph" id="par_id3152777" xml-lang="en-US" l10n="CHG" oldref="43"><ahelp hid="SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT">Specifies how to align text at tab stops beyond the right margin, how to handle decimal tab stops, and how to handle tab stops close to a line break.</ahelp> If this check box is not selected, tab stops are handled in the same way as in other Office applications.</paragraph>
-<paragraph role="paragraph" id="par_idN10810" xml-lang="en-US" l10n="NEW">In text documents created by %PRODUCTNAME %PRODUCTVERSION, the new tab stop handling is used by default. In documents created by %PRODUCTNAME prior to version %PRODUCTVERSION, the previously used tab stop handling is applied.</paragraph>
+<paragraph role="paragraph" id="par_idN10810" xml-lang="en-US" l10n="NEW">In text documents created by your current version of Writer, the new tab stop handling is used by default. In text documents created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the old tab stop handling is applied.</paragraph>
<paragraph role="heading" id="par_idN107F9" xml-lang="en-US" level="3" l10n="NEW">Do not add leading (extra space) between lines of text<comment>UFI: spec external_leading</comment></paragraph>
<paragraph role="paragraph" id="par_idN10806" xml-lang="en-US" l10n="NEW">Specifies that additional leading (extra space) between lines of text is not added, even if the font in use contains the additional leading attribute.</paragraph>
-<paragraph role="paragraph" id="par_idN10809" xml-lang="en-US" l10n="NEW">In text documents created by %PRODUCTNAME %PRODUCTVERSION, the additional leading is used by default. In documents created by %PRODUCTNAME prior to version %PRODUCTVERSION, the additional leading is not used.</paragraph>
+<paragraph role="paragraph" id="par_idN10809" xml-lang="en-US" l10n="NEW">In text documents created by your current version of Writer, the additional leading is used by default. In text documents created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the additional leading is not used.</paragraph>
<paragraph role="heading" id="par_idN107FF" xml-lang="en-US" level="3" l10n="NEW">Use StarOffice 6.0/7 line spacing<comment>UFI: spec spec-line-spacing</comment><comment>UFI: api.feature "Adjusted formatting of text lines with proportional line spacing"</comment></paragraph>
<paragraph role="paragraph" id="par_idN10815" xml-lang="en-US" l10n="NEW">If the option is off, a new process for formatting text lines with proportional line spacing will be applied. If the option is on, the previous method of formatting of text lines with proportional line spacing will be applied.</paragraph>
-<paragraph role="paragraph" id="par_idN10818" xml-lang="en-US" l10n="NEW">In %PRODUCTNAME %PRODUCTVERSION and Microsoft Word documents of recent versions, the new process is used. In %PRODUCTNAME prior to version %PRODUCTVERSION, the previous process is used.</paragraph>
+<paragraph role="paragraph" id="par_idN10818" xml-lang="en-US" l10n="NEW">In text documents created by your current version of Writer and in Microsoft Word documents of recent versions, the new process is used. In text documents created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the previous process is used.</paragraph>
<paragraph role="heading" id="par_idN1081B" xml-lang="en-US" level="3" l10n="NEW">Add paragraph and table spacing at bottom of table cells<comment>UFI: spec spec-formatting-table-cells</comment></paragraph>
<paragraph role="paragraph" id="par_idN10846" xml-lang="en-US" l10n="NEW">Specifies that the bottom spacing is added to a paragraph, even when it is the last paragraph in a table cell.</paragraph>
-<paragraph role="paragraph" id="par_idN10849" xml-lang="en-US" l10n="NEW">If the option is off, table cells will be formatted as in %PRODUCTNAME prior to version %PRODUCTVERSION. If the option is on, an alternative method of formatting table cells will be applied. The option is on by default for new documents created with %PRODUCTNAME %PRODUCTVERSION and for documents imported from Microsoft Word format.</paragraph>
+<paragraph role="paragraph" id="par_idN10849" xml-lang="en-US" l10n="NEW">If the option is off, table cells will be formatted as in Writer versions prior to StarOffice 8 or OpenOffice.org 2.0. If the option is on, an alternative method of formatting table cells will be applied. The option is on by default for new documents created with %PRODUCTNAME %PRODUCTVERSION and for documents imported from Microsoft Word format.</paragraph>
<paragraph role="heading" id="par_idN1084C" xml-lang="en-US" level="3" l10n="NEW">Use StarOffice 6.0/7 object positioning<comment>UFI: spec spec-adjust-object-positioning</comment></paragraph>
<paragraph role="paragraph" id="par_idN10864" xml-lang="en-US" l10n="NEW">Specifies how to calculate the position of floating objects anchored to a character or paragraph with respect to the top and bottom paragraph spacing.</paragraph>
-<paragraph role="paragraph" id="par_idN10867" xml-lang="en-US" l10n="NEW">If the option is on, the floating objects are positioned as in %PRODUCTNAME versions prior to %PRODUCTVERSION. If the option is off, the floating objects are positioned using an alternative method that is similar to the method used by Microsoft Word. </paragraph>
+<paragraph role="paragraph" id="par_idN10867" xml-lang="en-US" l10n="NEW">If the option is on, the floating objects are positioned as in Writer versions prior to StarOffice 8 or OpenOffice.org 2.0. If the option is off, the floating objects are positioned using an alternative method that is similar to the method used by Microsoft Word. </paragraph>
<paragraph role="paragraph" id="par_idN1086A" xml-lang="en-US" l10n="NEW">The option will be set to off for new documents. For Writer documents created by a version prior to %PRODUCTNAME %PRODUCTVERSION the option is on.</paragraph>
<paragraph role="heading" id="par_idN10821" xml-lang="en-US" level="3" l10n="NEW">Use StarOffice 6.0/7 text wrapping around objects<comment>UFI: spec doc adjust-text-wrapping.sxw</comment></paragraph>
<paragraph role="paragraph" id="par_id4016541" xml-lang="en-US" l10n="NEW">MS Word and Writer have different approaches on wrapping text around floating screen objects. Floating screen object are Writer frames and drawing objects, and the objects 'text box', 'graphic', 'frame', 'picture' etc. in MS Word.</paragraph>
-<paragraph role="paragraph" id="par_id7280190" xml-lang="en-US" l10n="NEW">In MS Word and in %PRODUCTNAME %PRODUCTVERSION, page header/footer content and footnote/endnote content does not wrap around floating screen objects. Text body content wraps around floating screen objects which are anchored in the page header. </paragraph>
-<paragraph role="paragraph" id="par_id2782982" xml-lang="en-US" l10n="NEW">In %PRODUCTNAME prior to %PRODUCTVERSION, the opposite was true.</paragraph>
-<paragraph role="paragraph" id="par_idN10892" xml-lang="en-US" l10n="NEW">If the option is off, which is the default setting, the new text wrapping will be applied. If the option is on, <emph>the former text wrapping will be applied.</emph>
-</paragraph>
+<paragraph role="paragraph" id="par_id7280190" xml-lang="en-US" l10n="NEW">In MS Word and in current versions of Writer, page header/footer content and footnote/endnote content does not wrap around floating screen objects. Text body content wraps around floating screen objects which are anchored in the page header. </paragraph>
+<paragraph role="paragraph" id="par_id2782982" xml-lang="en-US" l10n="NEW">In Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the opposite was true.</paragraph>
+<paragraph role="paragraph" id="par_idN10892" xml-lang="en-US" l10n="NEW">If the option is off, which is the default setting, the new text wrapping will be applied. If the option is on, the former text wrapping will be applied. </paragraph>
<paragraph role="heading" id="par_idN1092A" xml-lang="en-US" level="3" l10n="NEW">Consider wrapping style when positioning objects<comment>UFI: spec obj-pos-without-wrapping</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10837" xml-lang="en-US" l10n="CHG">Specifies how the complex process of positioning floating objects that are anchored to a character or paragraph should work. In %PRODUCTNAME prior to version %PRODUCTVERSION, an iterative process was used, while in %PRODUCTNAME %PRODUCTVERSION a straightforward process is used, which is similar to the same process in Microsoft Word.</paragraph>
-<paragraph role="paragraph" id="par_idN10943" xml-lang="en-US" l10n="NEW">If the option is off, the %PRODUCTNAME iterative process of object positioning is used. If the option is on, the straightforward process is used to ensure compatibility with Microsoft Word documents.</paragraph>
+<paragraph role="paragraph" id="par_idN10837" xml-lang="en-US" l10n="CHG">Specifies how the complex process of positioning floating objects that are anchored to a character or paragraph should work. In Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, an iterative process was used, while in current versions a straightforward process is used, which is similar to the same process in Microsoft Word.</paragraph>
+<paragraph role="paragraph" id="par_idN10943" xml-lang="en-US" l10n="NEW">If the option is off, the old %PRODUCTNAME iterative process of object positioning is used. If the option is on, the new straightforward process is used to ensure compatibility with Microsoft Word documents.</paragraph>
<paragraph role="heading" id="hd_id5240028" xml-lang="en-US" level="3" l10n="NEW">Expand word space on lines with manual line breaks in justified paragraphs<comment>UFI: i79041</comment></paragraph>
<paragraph role="paragraph" id="par_id8599810" xml-lang="en-US" l10n="NEW">If enabled, Writer adds spacing between words, in lines that end with Shift+Enter in justified paragraphs. If disabled, spacing between words will not be expanded to justify the lines.</paragraph>
<paragraph role="paragraph" id="par_id8012634" xml-lang="en-US" l10n="NEW">This setting is on by default for .odt text documents. It will be saved and loaded with the document in the .odt text document format. This setting cannot be saved in old .sxw text documents, so this setting is off for .sxw text documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT" id="bm_id4321726" localize="false"/><paragraph role="heading" id="par_idN10845" xml-lang="en-US" level="2" l10n="NEW">Use as Default</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT" id="bm_id4321726" localize="false"/>
+<paragraph role="heading" id="par_idN10845" xml-lang="en-US" level="2" l10n="NEW">Use as Default</paragraph>
<paragraph role="paragraph" id="par_idN10848" xml-lang="en-US" l10n="NEW"><ahelp hid="879350288">Click to use the current settings on this tab page as the default for further sessions with %PRODUCTNAME.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10977" xml-lang="en-US" l10n="NEW">The factory defaults are set as follows. Enabled are the following options, while all other options are disabled:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN1097D" xml-lang="en-US" l10n="NEW">Add spacing between paragraphs and tables (in current document)</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp
index 7f8719f4bc..66fec37911 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01060100.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedoptionen01060100xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01060100xml" indexer="include">
<title id="tit" xml-lang="en-US">View</title>
<filename>/text/shared/optionen/01060100.xhp</filename>
</topic>
@@ -73,68 +71,95 @@
<bookmark_value>tabs; displaying sheet tabs</bookmark_value>
<bookmark_value>outlines;outline symbols</bookmark_value>
</bookmark><comment>mw deleted "formulas;..." and copied "displaying; formulas..." to Calc guide formula_value.xhp and changed "sheets;.." into "sheet tabs;..."</comment><comment>MW made "outline..." a two level entry</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_CONTENT" id="bm_id3157898" localize="false"/><paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060100.xhp" name="View">View</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_CONTENT" id="bm_id3157898" localize="false"/>
+<paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060100.xhp" name="View">View</link></paragraph>
<paragraph role="paragraph" id="par_id3153988" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CONTENT">Defines which elements of the <item type="productname">%PRODUCTNAME</item> Calc main window are displayed. You can also show or hide highlighting of values in tables.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#tabelleinhalte"/>
+<embed href="text/shared/00/00000406.xhp#tabelleinhalte"/>
</section>
<paragraph role="heading" id="hd_id3153682" xml-lang="en-US" level="2" l10n="U" oldref="28">Visual aids</paragraph>
<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="29">Specifies which lines are displayed.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GRID" id="bm_id3148538" localize="false"/><paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="30">Grid lines</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GRID" id="bm_id3148538" localize="false"/>
+<paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="30">Grid lines</paragraph>
<paragraph role="paragraph" id="par_id3153088" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GRID">Specifies whether to display grid lines between the cells.</ahelp><switchinline select="appl"><caseinline select="CALC">For printing, choose <emph>Format - Page - </emph><link href="text/scalc/01/05070500.xhp" name="Sheet"><emph>Sheet</emph></link> and mark the <emph>Grid</emph> check box.
</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR" id="bm_id3150504" localize="false"/><paragraph role="heading" id="hd_id3156326" xml-lang="en-US" level="3" l10n="U" oldref="32">Color</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR" id="bm_id3150504" localize="false"/>
+<paragraph role="heading" id="hd_id3156326" xml-lang="en-US" level="3" l10n="U" oldref="32">Color</paragraph>
<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR">Specifies a color for the grid lines in the current document.</ahelp> To see the grid line color that was saved with the document, go to <emph>Tools - Options - %PRODUCTNAME</emph>
<emph>- Appearance</emph>, under <emph>Scheme</emph> find the entry <emph>Spreadsheet - Grid lines</emph> and set the color to "Automatic".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS" id="bm_id3148563" localize="false"/><paragraph role="heading" id="hd_id3152349" xml-lang="en-US" level="3" l10n="U" oldref="34">Page breaks</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS" id="bm_id3148563" localize="false"/>
+<paragraph role="heading" id="hd_id3152349" xml-lang="en-US" level="3" l10n="U" oldref="34">Page breaks</paragraph>
<paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS">Specifies whether to view the page breaks within a defined print area.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE" id="bm_id3148946" localize="false"/><paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="3" l10n="U" oldref="36">Guides while moving</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE" id="bm_id3148946" localize="false"/>
+<paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="3" l10n="U" oldref="36">Guides while moving</paragraph>
<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE">Specifies whether to view guides when moving drawings, frames, graphics and other objects.</ahelp> These guides help you align objects.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HANDLES" id="bm_id3153380" localize="false"/><paragraph role="heading" id="hd_id3150358" xml-lang="en-US" level="3" l10n="U" oldref="38">Simple handles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HANDLES" id="bm_id3153380" localize="false"/>
+<paragraph role="heading" id="hd_id3150358" xml-lang="en-US" level="3" l10n="U" oldref="38">Simple handles</paragraph>
<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HANDLES">Specifies whether to display the handles (the eight points on a selection box) as simple squares without 3D effect.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_BIGHANDLES" id="bm_id3151176" localize="false"/><paragraph role="heading" id="hd_id3149202" xml-lang="en-US" level="3" l10n="U" oldref="40">Large handles</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_BIGHANDLES" id="bm_id3151176" localize="false"/>
+<paragraph role="heading" id="hd_id3149202" xml-lang="en-US" level="3" l10n="U" oldref="40">Large handles</paragraph>
<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_BIGHANDLES">Specifies that larger than normal handles (the eight points on a selection box) are displayed.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152920" xml-lang="en-US" level="2" l10n="U" oldref="3">Display</paragraph>
<paragraph role="paragraph" id="par_id3125864" xml-lang="en-US" l10n="U" oldref="4">Select various options for the screen display.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_FORMULA" id="bm_id3150767" localize="false"/><paragraph role="heading" id="hd_id3154218" xml-lang="en-US" level="3" l10n="U" oldref="5">Formulas</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_FORMULA" id="bm_id3150767" localize="false"/>
+<paragraph role="heading" id="hd_id3154218" xml-lang="en-US" level="3" l10n="U" oldref="5">Formulas</paragraph>
<paragraph role="paragraph" id="par_id3150440" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_FORMULA">Specifies whether to show formulas instead of results in the cells.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL" id="bm_id3146146" localize="false"/><paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="3" l10n="U" oldref="7">Zero values</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL" id="bm_id3146146" localize="false"/>
+<paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="3" l10n="U" oldref="7">Zero values</paragraph>
<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL">Specifies whether to show numbers with the value of 0.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT" id="bm_id3163711" localize="false"/><paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="9">Note indicator</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT" id="bm_id3163711" localize="false"/>
+<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="9">Note indicator</paragraph>
<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT">Specifies that a small rectangle in the top right corner of the cell indicates that a note exists. The note will be shown only when you enable tips under <emph>Tools - Options - %PRODUCTNAME - General</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FID_NOTE_VISIBLE" id="bm_id2862651" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:NoteVisible" id="bm_id3153574" localize="false"/><paragraph role="paragraph" id="par_id3150487" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid=".uno:NoteVisible">To display a note permanently, select the <emph>Show note</emph> command from the cell's context menu.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:NoteVisible" id="bm_id3153574" localize="false"/>
+<paragraph role="paragraph" id="par_id3150487" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid=".uno:NoteVisible">To display a note permanently, select the <emph>Show note</emph> command from the cell's context menu.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3149667" xml-lang="en-US" l10n="CHG" oldref="25">You can type and edit notes with the <link href="text/shared/01/04050000.xhp" name="Insert - Note"><emph>Insert - Note</emph></link> command. Notes that are permanently displayed can be edited by clicking the note box. Click the Navigator and under the <emph>Notes</emph> entry you can view all notes in the current document. By double clicking a note in Navigator, the cursor will jump to the corresponding cell containing the note.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE" id="bm_id3155306" localize="false"/><paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="3" l10n="U" oldref="11">Value highlighting</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE" id="bm_id3155306" localize="false"/>
+<paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="3" l10n="U" oldref="11">Value highlighting</paragraph>
<paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE">Mark the<emph> Value highlighting </emph>box to highlight all values in the sheet. Text cells are highlighted in black, cells with numbers in blue, and cells containing formulas, logical values, dates, and so on, in green.</ahelp></paragraph>
<paragraph role="warning" id="par_id3151319" xml-lang="en-US" l10n="U" oldref="13">When this command is active, any colors assigned in the document will not be displayed until the function is deactivated.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR" id="bm_id3146972" localize="false"/><paragraph role="heading" id="hd_id3157846" xml-lang="en-US" level="3" l10n="U" oldref="14">Anchor</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR" id="bm_id3146972" localize="false"/>
+<paragraph role="heading" id="hd_id3157846" xml-lang="en-US" level="3" l10n="U" oldref="14">Anchor</paragraph>
<paragraph role="paragraph" id="par_id3147494" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR">Specifies whether the anchor icon is displayed when an inserted object, such as a graphic, is selected.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_CLIP" id="bm_id3146789" localize="false"/><paragraph role="heading" id="hd_id3146898" xml-lang="en-US" level="3" l10n="U" oldref="26">Text overflow</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_CLIP" id="bm_id3146789" localize="false"/>
+<paragraph role="heading" id="hd_id3146898" xml-lang="en-US" level="3" l10n="U" oldref="26">Text overflow</paragraph>
<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_CLIP">If a cell contains text that is wider than the width of the cell, the text is displayed over empty neighboring cells in the same row. If there is no empty neighboring cell, a small triangle at the cell border indicates that the text continues.</ahelp><comment>UFI: sc.features "Alignment of text that is larger than a cell"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_RFIND" id="bm_id3153927" localize="false"/><paragraph role="heading" id="hd_id3150327" xml-lang="en-US" level="3" l10n="U" oldref="54">Show references in color</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_RFIND" id="bm_id3153927" localize="false"/>
+<paragraph role="heading" id="hd_id3150327" xml-lang="en-US" level="3" l10n="U" oldref="54">Show references in color</paragraph>
<paragraph role="paragraph" id="par_id3153766" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_RFIND">Specifies that each reference is highlighted in color in the formula. The cell range is also enclosed by a colored border as soon as the cell containing the reference is selected for editing.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155444" xml-lang="en-US" level="2" l10n="U" oldref="16">Objects</paragraph>
<paragraph role="paragraph" id="par_id3148405" xml-lang="en-US" l10n="CHG" oldref="17">Defines whether to display or hide objects for up to three object groups.</paragraph><comment>removed "placeholder" text, see i81634</comment>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_OBJGRF" id="bm_id3154256" localize="false"/><paragraph role="heading" id="hd_id3150043" xml-lang="en-US" level="3" l10n="U" oldref="18">Objects/Graphics</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_OBJGRF" id="bm_id3154256" localize="false"/>
+<paragraph role="heading" id="hd_id3150043" xml-lang="en-US" level="3" l10n="U" oldref="18">Objects/Graphics</paragraph>
<paragraph role="paragraph" id="par_id3163549" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_OBJGRF">Defines if objects and graphics are shown or hidden.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DIAGRAM" id="bm_id3147344" localize="false"/><paragraph role="heading" id="hd_id3151249" xml-lang="en-US" level="3" l10n="U" oldref="20">Charts</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DIAGRAM" id="bm_id3147344" localize="false"/>
+<paragraph role="heading" id="hd_id3151249" xml-lang="en-US" level="3" l10n="U" oldref="20">Charts</paragraph>
<paragraph role="paragraph" id="par_id3149106" xml-lang="en-US" l10n="CHG" oldref="21"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DIAGRAM">Defines if charts in your document are shown or hidden.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DRAW" id="bm_id3155334" localize="false"/><paragraph role="heading" id="hd_id3154703" xml-lang="en-US" level="3" l10n="U" oldref="22">Drawing objects</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DRAW" id="bm_id3155334" localize="false"/>
+<paragraph role="heading" id="hd_id3154703" xml-lang="en-US" level="3" l10n="U" oldref="22">Drawing objects</paragraph>
<paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DRAW">Defines if drawing objects in your document are shown or hidden.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id0909200810585828" xml-lang="en-US" level="2" l10n="NEW">Zoom</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCPAGE_CONTENT_CB_SYNCZOOM" id="bm_id0909200810584462" localize="false"/>
+<paragraph role="heading" id="hd_id0909200810585881" xml-lang="en-US" level="3" l10n="NEW">Synchronize sheets</paragraph>
+<paragraph role="paragraph" id="par_id0909200810585870" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If checked, all sheets are shown with the same zoom factor. If not checked, each sheet can have its own zoom factor.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153920" xml-lang="en-US" level="2" l10n="U" oldref="42">Window</paragraph>
<paragraph role="paragraph" id="par_id3154661" xml-lang="en-US" l10n="U" oldref="43">Specifies whether some Help elements will or will not appear in the table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ROWCOLHEADER" id="bm_id3145791" localize="false"/><paragraph role="heading" id="hd_id3149923" xml-lang="en-US" level="3" l10n="U" oldref="44">Column/Row headers</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ROWCOLHEADER" id="bm_id3145791" localize="false"/>
+<paragraph role="heading" id="hd_id3149923" xml-lang="en-US" level="3" l10n="U" oldref="44">Column/Row headers</paragraph>
<paragraph role="paragraph" id="par_id3149816" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ROWCOLHEADER">Specifies whether to display row and column headers.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HSCROLL" id="bm_id3154120" localize="false"/><paragraph role="heading" id="hd_id3154205" xml-lang="en-US" level="3" l10n="U" oldref="46">Horizontal scrollbar</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HSCROLL" id="bm_id3154120" localize="false"/>
+<paragraph role="heading" id="hd_id3154205" xml-lang="en-US" level="3" l10n="U" oldref="46">Horizontal scrollbar</paragraph>
<paragraph role="paragraph" id="par_id3155578" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HSCROLL">Specifies whether to display a horizontal scrollbar at the bottom of the document window.</ahelp> Note that there is a slider between the horizontal scrollbar and the sheet tabs that may be set to one end.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VSCROLL" id="bm_id3158413" localize="false"/><paragraph role="heading" id="hd_id3148422" xml-lang="en-US" level="3" l10n="U" oldref="48">Vertical scrollbar</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VSCROLL" id="bm_id3158413" localize="false"/>
+<paragraph role="heading" id="hd_id3148422" xml-lang="en-US" level="3" l10n="U" oldref="48">Vertical scrollbar</paragraph>
<paragraph role="paragraph" id="par_id3147128" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VSCROLL">Specifies whether to display a vertical scrollbar at the right of the document window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_TBLREG" id="bm_id3158214" localize="false"/><paragraph role="heading" id="hd_id3150826" xml-lang="en-US" level="3" l10n="U" oldref="50">Sheet tabs</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_TBLREG" id="bm_id3158214" localize="false"/>
+<paragraph role="heading" id="hd_id3150826" xml-lang="en-US" level="3" l10n="U" oldref="50">Sheet tabs</paragraph>
<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_TBLREG">Specifies whether to display the sheet tabs at the bottom of the spreadsheet document.</ahelp> If this box is not checked, you will only be able to switch between the sheets through the <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link>
</caseinline><defaultinline>Navigator</defaultinline></switchinline>. Note that there is a slider between the horizontal scrollbar and the sheet tabs that may be set to one end.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_OUTLINE" id="bm_id3154199" localize="false"/><paragraph role="heading" id="hd_id3152584" xml-lang="en-US" level="3" l10n="U" oldref="52">Outline symbols</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_OUTLINE" id="bm_id3154199" localize="false"/>
+<paragraph role="heading" id="hd_id3152584" xml-lang="en-US" level="3" l10n="U" oldref="52">Outline symbols</paragraph>
<paragraph role="paragraph" id="par_id3145135" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_OUTLINE">If you have defined an <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/12080000.xhp" name="outline">outline</link>
</caseinline><defaultinline>outline</defaultinline></switchinline>, the <emph>Outline symbols</emph> option specifies whether to view the outline symbols at the border of the sheet.</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/optionen/01060400.xhp b/helpcontent2/source/text/shared/optionen/01060400.xhp
index 7aaa9aebef..e0f5cd87f6 100755
--- a/helpcontent2/source/text/shared/optionen/01060400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060400.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01060400.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01060400xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01060400xml" indexer="include">
<title id="tit" xml-lang="en-US">Sort Lists</title>
<filename>/text/shared/optionen/01060400.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-06-14T14:36:46">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="sortierlisten">
@@ -49,7 +47,7 @@
<paragraph role="paragraph" id="par_id3153825" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_SCPAGE_USERLISTS">All user-defined lists are displayed in the<emph> Sort Lists </emph>dialog. You can also define and edit your own lists. Only text can be used as sort lists, no numbers.</ahelp><comment>UFI: fix to #111848#</comment></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#exopso"/>
+<embed href="text/shared/00/00000406.xhp#exopso"/>
</section>
<switch select="appl">
<case select="CALC"><embed href="text/scalc/guide/calc_series.xhp#calc_series"/>
@@ -77,6 +75,6 @@
<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_ADD" id="bm_id3149562" localize="false"/>
<paragraph role="heading" id="hd_id3144760" xml-lang="en-US" level="2" l10n="U" oldref="11">Add/Modify</paragraph>
<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_ADD">Adds a new list into the <emph>Lists</emph> box.</ahelp> If you would like to edit this list in the <emph>Entries</emph> box, this button will change from <emph>Add</emph> to <emph>Modify</emph>, which enables you to include the newly modified list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:PUSHBUTTON:RID_SCPAGE_USERLISTS:BTN_REMOVE" id="bm_id3152577" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01070500.xhp b/helpcontent2/source/text/shared/optionen/01070500.xhp
index 549a99d98e..35ca157bf2 100644
--- a/helpcontent2/source/text/shared/optionen/01070500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070500.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01070500.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,21 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01070500xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01070500xml" indexer="include">
<title id="tit" xml-lang="en-US">General</title>
<filename>/text/shared/optionen/01070500.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-24T09:52:00">converted from old format - fpe
-dedr: fixed #i30842#</lastedited>
-</history>
</meta>
<body>
<section id="sonstiges">
@@ -59,7 +54,7 @@ dedr: fixed #i30842#</lastedited>
<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SD_OPTIONS_MISC">Defines the general options for drawing or presentation documents.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#etopsonstiges"/>
+<embed href="text/shared/00/00000406.xhp#etopsonstiges"/>
</section>
<paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="2" l10n="U" oldref="3">Text objects</paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_QUICKEDIT" id="bm_id3156343" localize="false"/>
@@ -119,7 +114,7 @@ dedr: fixed #i30842#</lastedited>
<paragraph role="paragraph" id="par_id3153965" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SD_COMBOBOX_TP_OPTIONS_MISC_CB_SCALE">Determines the drawing scale on the rulers.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3155177" xml-lang="en-US" level="2" l10n="U" oldref="36">Compatibility (document specific settings)</paragraph>
<paragraph role="paragraph" id="par_id3155608" xml-lang="en-US" l10n="U" oldref="44">The settings in this area are valid for the current document only.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_MISC_CB_USE_PRINTER_METRICS" id="bm_id3149922" localize="false"/><embed href="text/shared/optionen/01041000.xhp#printermetrics"/>
+<embed href="text/shared/optionen/01041000.xhp#printermetrics"/>
<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_MISC_CB_MERGE_PARA_DIST" id="bm_id3153788" localize="false"/>
<paragraph role="heading" id="hd_id3145790" xml-lang="en-US" level="3" l10n="U" oldref="38">Add spacing between paragraphs in the current document</paragraph>
<paragraph role="paragraph" id="par_id3145768" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_MISC_CB_MERGE_PARA_DIST">Specifies that $[officename] Impress calculates the paragraph spacing exactly like Microsoft PowerPoint.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01130100.xhp b/helpcontent2/source/text/shared/optionen/01130100.xhp
index dbc1401f6e..69f8c5eaa0 100755
--- a/helpcontent2/source/text/shared/optionen/01130100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01130100.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01130100.xhp,v $
- *
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +35,7 @@
<meta>
-<topic id="textsharedoptionen01130100xml" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionen01130100xml" indexer="include">
<title id="tit" xml-lang="en-US">VBA Properties</title>
<filename>/text/shared/optionen/01130100.xhp</filename>
</topic>
@@ -54,7 +52,7 @@
</bookmark>
<paragraph role="paragraph" id="par_id3155805" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
<paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="1" l10n="U" oldref="20"><link href="text/shared/optionen/01130100.xhp" name="VBA Properties">VBA Properties</link></paragraph>
-<paragraph role="paragraph" id="par_id3150443" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Specifies the general properties for loading and saving Microsoft Office documents with VBA code.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150443" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Specifies the general properties for loading and saving Microsoft Office documents with VBA (Visual Basic for Applications) code.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#etsofi"/>
@@ -80,7 +78,7 @@
<embed href="text/shared/optionen/01130100.xhp#codetext"/>
<bookmark xml-lang="en-US" branch="hid/809174020" id="bm_id0523200811460569" localize="false"/>
<paragraph role="heading" id="hd_id0523200811475727" xml-lang="en-US" level="3" l10n="NEW">Executable code</paragraph>
-<paragraph role="paragraph" id="par_id0523200811475733" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The VBA code will be loaded ready to be executed. If this checkbox is not checked, the VBA code will be commented out so it can be inspected, but will not run.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id0523200811475733" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The VBA (Visual Basic for Applications) code will be loaded ready to be executed. If this checkbox is not checked, the VBA code will be commented out so it can be inspected, but will not run.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/809174021" id="bm_id0523200811454459" localize="false"/>
<paragraph role="heading" id="hd_id3151211" xml-lang="en-US" level="3" l10n="U" oldref="12">Save original Basic code</paragraph>
<embed href="text/shared/optionen/01130100.xhp#origtext"/>
diff --git a/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp b/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
index fe4ba65da4..79dcf0c06b 100644
--- a/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
+++ b/helpcontent2/source/text/shared/optionen/macrosecurity_sl.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: macrosecurity_sl.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,22 +30,21 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionenmacrosecurity_slxhp" indexer="include" status="PUBLISH">
+<topic id="textsharedoptionenmacrosecurity_slxhp" indexer="include">
<title id="tit" xml-lang="en-US">Security Level</title>
<filename>/text/shared/optionen/macrosecurity_sl.xhp</filename>
</topic>
-<history>
-<created date="2004-08-25T16:37:39">UFI: Macro Security first tab page</created>
-<lastedited date="2005-12-05T13:11:51">YJ: checked</lastedited>
-</history>
</meta>
<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id1203039"><bookmark_value>security;security levels for macros</bookmark_value>
+<bookmark_value>macros;security levels</bookmark_value>
+<bookmark_value>levels;macro security</bookmark_value>
+</bookmark><comment>MW added 3 index entries</comment>
<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity_sl"><link href="text/shared/optionen/macrosecurity_sl.xhp">Security Level</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW">Select the <link href="text/shared/optionen/macrosecurity.xhp">macro security</link> level from one of four options. The options differ according to the security level. Macros that are allowed to run on a higher security level are also allowed to run in all lower levels.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/makefile.mk b/helpcontent2/source/text/shared/optionen/makefile.mk
index 2033cc6268..88d6249ab3 100644
--- a/helpcontent2/source/text/shared/optionen/makefile.mk
+++ b/helpcontent2/source/text/shared/optionen/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.13 $
+# $Revision: 1.13.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/simpress/00/makefile.mk b/helpcontent2/source/text/simpress/00/makefile.mk
index 885c65f2a2..34c0e389fe 100644
--- a/helpcontent2/source/text/simpress/00/makefile.mk
+++ b/helpcontent2/source/text/simpress/00/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/simpress/01/02120000.xhp b/helpcontent2/source/text/simpress/01/02120000.xhp
index 0f75d463f6..72418a663c 100644
--- a/helpcontent2/source/text/simpress/01/02120000.xhp
+++ b/helpcontent2/source/text/simpress/01/02120000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02120000.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,65 +30,71 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textsimpress0102120000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Duplicate</title>
+<topic id="textsimpress0102120000xml" indexer="include">
+<title id="tit" xml-lang="en-US">Duplicate</title>
<filename>/text/simpress/01/02120000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
- <bookmark xml-lang="en-US" branch="hid/SID_COPYOBJECTS" id="bm_id5589802" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:CopyObjects" xml-lang="en-US" id="bm_id3149943"/><paragraph role="heading" level="1" id="hd_id3148868" l10n="U" xml-lang="en-US" oldref="1">Duplicate</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3148604" xml-lang="en-US" oldref="2"><variable id="duplizieren"><ahelp hid=".uno:CopyObjects" visibility="visible">Makes one or more copies of a selected object. </ahelp></variable></paragraph>
- <section id="howtoget">
- <embed href="text/simpress/00/00000402.xhp#badpz"/>
+<bookmark xml-lang="en-US" branch="hid/SID_COPYOBJECTS" id="bm_id5589802" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:CopyObjects" id="bm_id3149943" localize="false"/>
+<paragraph role="heading" id="hd_id3148868" xml-lang="en-US" level="1" l10n="U" oldref="1">Duplicate</paragraph>
+<paragraph role="paragraph" id="par_id3148604" xml-lang="en-US" l10n="U" oldref="2"><variable id="duplizieren"><ahelp hid=".uno:CopyObjects">Makes one or more copies of a selected object. </ahelp>
+</variable></paragraph>
+<section id="howtoget">
+<embed href="text/simpress/00/00000402.xhp#badpz"/>
</section>
- <embed href="text/sdraw/guide/duplicate_object.xhp#duplicate_object"/>
- <bookmark branch="hid/SD:NUMERICFIELD:DLG_COPY:NUM_FLD_COPIES" xml-lang="en-US" id="bm_id3153813"/><paragraph role="heading" level="2" id="hd_id3146962" l10n="U" xml-lang="en-US" oldref="3">Number of copies</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3153075" xml-lang="en-US" oldref="4"><ahelp hid="SD:NUMERICFIELD:DLG_COPY:NUM_FLD_COPIES" visibility="visible">Enter the number of copies you want to make.</ahelp></paragraph>
- <bookmark branch="hid/SD:IMAGEBUTTON:DLG_COPY:BTN_SET_VIEWDATA" xml-lang="en-US" id="bm_id3147300"/><paragraph role="heading" level="2" id="hd_id3150431" l10n="U" xml-lang="en-US" oldref="25">Values from selection</paragraph>
- <table id="tbl_id3150395">
-
-
-
- <tablerow>
- <tablecell>
- <paragraph l10n="E" role="paragraph" id="par_id3150534" xml-lang="en-US" oldref=""><image src="res/sc10350.png" id="img_id3157870"><alt xml-lang="en-US" id="alt_id3157870">Icon</alt></image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph l10n="U" role="paragraph" id="par_id3150744" xml-lang="en-US" oldref="27"><ahelp visibility="visible" hid="SD:IMAGEBUTTON:DLG_COPY:BTN_SET_VIEWDATA">Enters the width and the height values of the selected object in the <emph>X axis </emph>and the <emph>Y axis </emph>boxes respectively as well as the fill color of the object in the Start box.</ahelp> The rotation angle of the selected object is not entered.</paragraph>
- </tablecell>
- </tablerow>
-
- </table>
- <paragraph role="heading" level="2" id="hd_id3153932" l10n="U" xml-lang="en-US" oldref="5">Placement</paragraph>
- <paragraph role="paragraph" id="par_id3150860" l10n="U" xml-lang="en-US" oldref="6">Sets the position and rotation of a duplicate object with respect to the selected object.</paragraph>
- <bookmark branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_X" xml-lang="en-US" id="bm_id3153110"/><paragraph role="heading" level="3" id="hd_id3153084" l10n="U" xml-lang="en-US" oldref="7">X axis</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3153564" xml-lang="en-US" oldref="8"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_X" visibility="visible">Enter the horizontal distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object to the right and negative values shift the duplicate object to the left.</ahelp></paragraph>
- <bookmark branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_Y" xml-lang="en-US" id="bm_id3150338"/><paragraph role="heading" level="3" id="hd_id3154507" l10n="U" xml-lang="en-US" oldref="9">Y axis</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3149882" xml-lang="en-US" oldref="10"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_Y" visibility="visible">Enter the vertical distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object up and negative values shift the duplicate object down.</ahelp></paragraph>
- <bookmark branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_ANGLE" xml-lang="en-US" id="bm_id3153731"/><paragraph role="heading" level="3" id="hd_id3150022" l10n="U" xml-lang="en-US" oldref="11">Angle</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3153738" xml-lang="en-US" oldref="12"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_ANGLE" visibility="visible">Enter the angle (0 to 359 degrees) by which you want to rotate the duplicate object. Positive values rotate the duplicate object in a clockwise direction and negative values in a counterclockwise direction. </ahelp></paragraph>
- <paragraph role="heading" level="2" id="hd_id3145296" l10n="U" xml-lang="en-US" oldref="13">Enlargement</paragraph>
- <paragraph role="paragraph" id="par_id3156065" l10n="U" xml-lang="en-US" oldref="14">Sets the size of a duplicate object.</paragraph>
- <bookmark branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_WIDTH" xml-lang="en-US" id="bm_id3150568"/><paragraph role="heading" level="3" id="hd_id3148769" l10n="U" xml-lang="en-US" oldref="15">Width</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150267" xml-lang="en-US" oldref="16"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_WIDTH" visibility="visible">Enter the amount by which you want to enlarge or reduce the width of the duplicate object.</ahelp></paragraph>
- <bookmark branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_HEIGHT" xml-lang="en-US" id="bm_id3153046"/><paragraph role="heading" level="3" id="hd_id3150930" l10n="U" xml-lang="en-US" oldref="17">Height</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3157970" xml-lang="en-US" oldref="18"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_HEIGHT" visibility="visible">Enter the amount by which you want to enlarge or reduce the height of the duplicate object.</ahelp></paragraph>
- <paragraph role="heading" level="2" id="hd_id3154866" l10n="U" xml-lang="en-US" oldref="19">Colors</paragraph>
- <paragraph role="paragraph" id="par_id3150474" l10n="U" xml-lang="en-US" oldref="20">Sets the colors for the selected object and the duplicate object. If you make more than one copy, these colors define the start and end points of a color gradient.</paragraph>
- <bookmark branch="hid/SD:LISTBOX:DLG_COPY:LB_START_COLOR" xml-lang="en-US" id="bm_id3155372"/><paragraph role="heading" level="3" id="hd_id3155819" l10n="U" xml-lang="en-US" oldref="21">Start</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3155987" xml-lang="en-US" oldref="22"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_START_COLOR" visibility="visible">Choose a color for the selected object.</ahelp></paragraph>
- <bookmark branch="hid/SD:LISTBOX:DLG_COPY:LB_END_COLOR" xml-lang="en-US" id="bm_id3155405"/><paragraph role="heading" level="3" id="hd_id3156258" l10n="U" xml-lang="en-US" oldref="23">End</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3147167" xml-lang="en-US" oldref="24"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_END_COLOR" visibility="visible">Choose a color for the duplicate object. If you are making more than one copy, this color is applied to the last copy. </ahelp></paragraph>
- <bookmark branch="hid/SD_PUSHBUTTON_DLG_COPY_BTN_SET_DEFAULT" xml-lang="en-US" id="bm_id3083280"/><embed href="text/shared/00/00000001.xhp#standard"/>
-
- </body>
+<embed href="text/sdraw/guide/duplicate_object.xhp#duplicate_object"/>
+<bookmark xml-lang="en-US" branch="hid/SD:NUMERICFIELD:DLG_COPY:NUM_FLD_COPIES" id="bm_id3153813" localize="false"/>
+<paragraph role="heading" id="hd_id3146962" xml-lang="en-US" level="2" l10n="U" oldref="3">Number of copies</paragraph>
+<paragraph role="paragraph" id="par_id3153075" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SD:NUMERICFIELD:DLG_COPY:NUM_FLD_COPIES">Enter the number of copies you want to make.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD:IMAGEBUTTON:DLG_COPY:BTN_SET_VIEWDATA" id="bm_id3147300" localize="false"/>
+<paragraph role="heading" id="hd_id3150431" xml-lang="en-US" level="2" l10n="U" oldref="25">Values from selection</paragraph>
+<table id="tbl_id3150395">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3150534" xml-lang="en-US" l10n="E">
+<image id="img_id3157870" src="res/sc10350.png" width="0.423cm" height="0.423cm"><alt id="alt_id3157870" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3150744" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SD:IMAGEBUTTON:DLG_COPY:BTN_SET_VIEWDATA">Enters the width and the height values of the selected object in the <emph>X axis </emph>and the <emph>Y axis </emph>boxes respectively as well as the fill color of the object in the Start box.</ahelp> The rotation angle of the selected object is not entered.</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+<paragraph role="heading" id="hd_id3153932" xml-lang="en-US" level="2" l10n="U" oldref="5">Placement</paragraph>
+<paragraph role="paragraph" id="par_id3150860" xml-lang="en-US" l10n="U" oldref="6">Sets the position and rotation of a duplicate object with respect to the selected object.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_X" id="bm_id3153110" localize="false"/>
+<paragraph role="heading" id="hd_id3153084" xml-lang="en-US" level="3" l10n="U" oldref="7">X axis</paragraph>
+<paragraph role="paragraph" id="par_id3153564" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_X">Enter the horizontal distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object to the right and negative values shift the duplicate object to the left.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_Y" id="bm_id3150338" localize="false"/>
+<paragraph role="heading" id="hd_id3154507" xml-lang="en-US" level="3" l10n="U" oldref="9">Y axis</paragraph>
+<paragraph role="paragraph" id="par_id3149882" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_Y">Enter the vertical distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object up and negative values shift the duplicate object down.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_ANGLE" id="bm_id3153731" localize="false"/>
+<paragraph role="heading" id="hd_id3150022" xml-lang="en-US" level="3" l10n="U" oldref="11">Angle</paragraph>
+<paragraph role="paragraph" id="par_id3153738" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_ANGLE">Enter the angle (0 to 359 degrees) by which you want to rotate the duplicate object. Positive values rotate the duplicate object in a clockwise direction and negative values in a counterclockwise direction. </ahelp></paragraph>
+<paragraph role="heading" id="hd_id3145296" xml-lang="en-US" level="2" l10n="U" oldref="13">Enlargement</paragraph>
+<paragraph role="paragraph" id="par_id3156065" xml-lang="en-US" l10n="U" oldref="14">Sets the size of a duplicate object.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_WIDTH" id="bm_id3150568" localize="false"/>
+<paragraph role="heading" id="hd_id3148769" xml-lang="en-US" level="3" l10n="U" oldref="15">Width</paragraph>
+<paragraph role="paragraph" id="par_id3150267" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_WIDTH">Enter the amount by which you want to enlarge or reduce the width of the duplicate object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_HEIGHT" id="bm_id3153046" localize="false"/>
+<paragraph role="heading" id="hd_id3150930" xml-lang="en-US" level="3" l10n="U" oldref="17">Height</paragraph>
+<paragraph role="paragraph" id="par_id3157970" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_HEIGHT">Enter the amount by which you want to enlarge or reduce the height of the duplicate object.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3154866" xml-lang="en-US" level="2" l10n="U" oldref="19">Colors</paragraph>
+<paragraph role="paragraph" id="par_id3150474" xml-lang="en-US" l10n="U" oldref="20">Sets the colors for the selected object and the duplicate object. If you make more than one copy, these colors define the start and end points of a color gradient.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_COPY:LB_START_COLOR" id="bm_id3155372" localize="false"/>
+<paragraph role="heading" id="hd_id3155819" xml-lang="en-US" level="3" l10n="U" oldref="21">Start</paragraph>
+<paragraph role="paragraph" id="par_id3155987" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_START_COLOR">Choose a color for the selected object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_COPY:LB_END_COLOR" id="bm_id3155405" localize="false"/>
+<paragraph role="heading" id="hd_id3156258" xml-lang="en-US" level="3" l10n="U" oldref="23">End</paragraph>
+<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_END_COLOR">Choose a color for the duplicate object. If you are making more than one copy, this color is applied to the last copy. </ahelp></paragraph>
+<embed href="text/shared/00/00000001.xhp#standard"/>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/04030000m.xhp b/helpcontent2/source/text/simpress/01/04030000m.xhp
new file mode 100644
index 0000000000..d299d853e6
--- /dev/null
+++ b/helpcontent2/source/text/simpress/01/04030000m.xhp
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 04030000m.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textsimpress0104030000mxml" indexer="include">
+<title id="tit" xml-lang="en-US">Rows</title>
+<filename>/text/simpress/01/04030000m.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="zeilen">
+<bookmark xml-lang="en-US" branch="index" id="bm_id31505414711"><bookmark_value>rows; inserting</bookmark_value>
+<bookmark_value>inserting; rows</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_INSERT_ROW" id="bm_id4302477" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertRows" id="bm_id3154366" localize="false"/>
+<paragraph role="heading" id="hd_id3150541" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/01/04030000m.xhp" name="Rows">Rows</link></paragraph>
+<paragraph role="paragraph" id="par_id3150767" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:InsertRows">Inserts a new row above the active cell. The number of rows inserted correspond to the number of rows selected. The existing rows are moved downward.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id091620081118197" xml-lang="en-US" l10n="NEW">In the context menu of a cell, choose <emph>Insert - Rows</emph>
+</paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/04040000m.xhp b/helpcontent2/source/text/simpress/01/04040000m.xhp
new file mode 100644
index 0000000000..7a6cb036f1
--- /dev/null
+++ b/helpcontent2/source/text/simpress/01/04040000m.xhp
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 04040000m.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textsimpress0104040000mxml" indexer="include">
+<title id="tit" xml-lang="en-US">Columns</title>
+<filename>/text/simpress/01/04040000m.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="spalten">
+<bookmark xml-lang="en-US" branch="index" id="bm_id31556284711"><bookmark_value>inserting; columns</bookmark_value>
+<bookmark_value>columns; inserting</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_INSERT_COL" id="bm_id601010" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertColumns" id="bm_id3155922" localize="false"/>
+<paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/01/04040000m.xhp" name="Columns">Columns</link></paragraph>
+<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:InsertColumns">Inserts a new column to the left of the active cell. The number of columns inserted correspond to the number of columns selected. The existing columns are moved to the right.</ahelp></paragraph>
+</section>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id0916200811234668" xml-lang="en-US" l10n="NEW">In the context menu of a cell, choose <emph>Insert - Columns</emph>
+</paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/05090000m.xhp b/helpcontent2/source/text/simpress/01/05090000m.xhp
new file mode 100644
index 0000000000..52e66e4f57
--- /dev/null
+++ b/helpcontent2/source/text/simpress/01/05090000m.xhp
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05090000m.xhp,v $
+ * $Revision: 1.1.2.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textsimpress0105090000mxml" indexer="include">
+<title id="tit" xml-lang="en-US">Format Cells</title>
+<filename>/text/simpress/01/05090000m.xhp</filename>
+</topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="hid/.uno:TableDialog" id="bm_id3151186" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FORMAT_TABLE_DLG" id="bm_id6845912" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SID_FORMAT_TABLE_DLG" id="bm_id0916200801490993" localize="false"/>
+<paragraph role="heading" id="hd_id3147172" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Cells</paragraph>
+<paragraph role="paragraph" id="par_id3154643" xml-lang="en-US" l10n="U" oldref="2"><variable id="tabelletext"><ahelp hid=".uno:TableDialog">Specifies the properties of the selected table, for example, fonts, font effects, borders, and background.</ahelp>
+</variable></paragraph>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id0916200811543127" xml-lang="en-US" l10n="NEW">On the Table Bar, click <emph>Table Properties</emph>.</paragraph>
+</section>
+<paragraph role="heading" id="hd_id3146119" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/05020100.xhp" name="Font">Font</link></paragraph>
+<embed href="text/shared/01/05020100.xhp#zn"/>
+<embed href="text/shared/01/05020200.xhp#schrifteffekt"/>
+<embed href="text/shared/01/05030500.xhp#umrandung"/>
+<embed href="text/shared/01/05030600.xhp#hintergrund"/>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/05110500m.xhp b/helpcontent2/source/text/simpress/01/05110500m.xhp
new file mode 100644
index 0000000000..e2a3ae0460
--- /dev/null
+++ b/helpcontent2/source/text/simpress/01/05110500m.xhp
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05110500m.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textsimpress0105110500mxml" indexer="include">
+<title id="tit" xml-lang="en-US">Delete</title>
+<filename>/text/simpress/01/05110500m.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="loeschen">
+<bookmark xml-lang="en-US" branch="hid/SID_DEL_ROWS" id="bm_id7236774" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DeleteRows" id="bm_id3154766" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_DELETE_ROW" id="bm_id1454512" localize="false"/>
+<paragraph role="heading" id="hd_id3149502" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/01/05110500m.xhp" name="Delete">Delete</link></paragraph>
+<paragraph role="paragraph" id="par_id3149050" xml-lang="en-US" l10n="U" oldref="2"><variable id="loeschentext"><ahelp hid=".uno:DeleteRows">Deletes the selected row(s) from the table.</ahelp>
+</variable></paragraph>
+</section>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id3149591" xml-lang="en-US" l10n="U" oldref="100">On <emph>Table</emph> Bar, click</paragraph>
+<table id="tbl_id3146892">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3147555" xml-lang="en-US" l10n="E">
+<image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150361" xml-lang="en-US">Icon</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3156248" xml-lang="en-US" l10n="U" oldref="101">Delete Row</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/05120500m.xhp b/helpcontent2/source/text/simpress/01/05120500m.xhp
new file mode 100644
index 0000000000..b3c34d0389
--- /dev/null
+++ b/helpcontent2/source/text/simpress/01/05120500m.xhp
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: 05120500m.xhp,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textsimpress0105120500mxml" indexer="include">
+<title id="tit" xml-lang="en-US">Delete</title>
+<filename>/text/simpress/01/05120500m.xhp</filename>
+</topic>
+</meta>
+<body>
+<section id="loeschen">
+<bookmark xml-lang="en-US" branch="hid/SID_DEL_COLS" id="bm_id9878689" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DeleteColumns" id="bm_id3154015" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_TABLE_DELETE_COL" id="bm_id1239356" localize="false"/>
+<paragraph role="heading" id="hd_id3145801" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/01/05120500m.xhp" name="Delete">Delete</link></paragraph>
+<paragraph role="paragraph" id="par_id3153418" xml-lang="en-US" l10n="U" oldref="2"><variable id="loeschentext"><ahelp hid=".uno:DeleteColumns">Deletes the selected column(s) from the table.</ahelp>
+</variable></paragraph>
+</section>
+<paragraph role="paragraph" id="par_id3156385" xml-lang="en-US" l10n="U" oldref="3">This command is only available if the cursor is in a table.</paragraph>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id3155328" xml-lang="en-US" l10n="U" oldref="115">On <emph>Table</emph> Bar, click</paragraph>
+<table id="tbl_id3150954">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153600" xml-lang="en-US" l10n="E">
+<image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153607" xml-lang="en-US">Icon</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3154423" xml-lang="en-US" l10n="U" oldref="116">Delete Column</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/05150000.xhp b/helpcontent2/source/text/simpress/01/05150000.xhp
index fd871a47a9..a5485feb6a 100644
--- a/helpcontent2/source/text/simpress/01/05150000.xhp
+++ b/helpcontent2/source/text/simpress/01/05150000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05150000.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,23 +30,20 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsimpress0105150000xml" indexer="include" status="PUBLISH">
+<topic id="textsimpress0105150000xml" indexer="include">
<title id="tit" xml-lang="en-US">Dimensioning</title>
<filename>/text/simpress/01/05150000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-27T13:23:09">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150439"><bookmark_value>dimension lines; properties of</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SID_MEASURE_DLG" id="bm_id5427321" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_MEASURE_DLG" id="bm_id5427321" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:MeasureAttributes" id="bm_id3148575" localize="false"/>
<paragraph role="heading" id="hd_id3150439" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/01/05150000.xhp" name="Dimensioning">Dimensioning</link></paragraph>
<paragraph role="paragraph" id="par_id3159154" xml-lang="en-US" l10n="U" oldref="2"><variable id="bemaszungtext"><ahelp hid=".uno:MeasureAttributes">Changes the length, measurement and guide properties of the selected <link href="text/simpress/02/10120000.xhp" name="dimension line">dimension line</link>.</ahelp>
@@ -98,6 +96,6 @@
<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_MEASURE:TSB_PARALLEL" id="bm_id3150567" localize="false"/>
<paragraph role="heading" id="hd_id3150930" xml-lang="en-US" level="3" l10n="U" oldref="83">Parallel to line</paragraph>
<paragraph role="paragraph" id="par_id3156060" xml-lang="en-US" l10n="U" oldref="84"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_MEASURE:TSB_PARALLEL">Displays the text parallel to or at 90 degrees to the dimension line.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_MEASURE_CTL_PREVIEW" id="bm_id3157970" localize="false"/><embed href="text/shared/00/00000001.xhp#vorschau"/>
+<embed href="text/shared/00/00000001.xhp#vorschau"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/06100000.xhp b/helpcontent2/source/text/simpress/01/06100000.xhp
index d8236d58df..6c85c2ff73 100644
--- a/helpcontent2/source/text/simpress/01/06100000.xhp
+++ b/helpcontent2/source/text/simpress/01/06100000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06100000.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,51 +30,55 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
<meta>
-<topic id="textsimpress0106100000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Custom Slide Shows</title>
+<topic id="textsimpress0106100000xml" indexer="include">
+<title id="tit" xml-lang="en-US">Custom Slide Shows</title>
<filename>/text/simpress/01/06100000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
-
- <bookmark xml-lang="en-US" branch="hid/SID_CUSTOMSHOW_DLG" id="bm_id9872314" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:CustomShowDialog" xml-lang="en-US" id="bm_id3159240"/><paragraph role="heading" level="1" id="hd_id3154659" l10n="U" xml-lang="en-US" oldref="1">Custom Slide Shows</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3149207" xml-lang="en-US" oldref="2"><variable id="indipraesent"><ahelp hid=".uno:CustomShowDialog" visibility="visible">Defines a custom slide show using slides within the current presentation. You can then pick slides to meet the needs of your audience. You can create as many custom slide shows as you want.</ahelp></variable></paragraph>
- <section id="howtoget">
- <embed href="text/simpress/00/00000407.xhp#indipra"/>
+<bookmark xml-lang="en-US" branch="hid/SID_CUSTOMSHOW_DLG" id="bm_id9872314" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:CustomShowDialog" id="bm_id3159240" localize="false"/>
+<paragraph role="heading" id="hd_id3154659" xml-lang="en-US" level="1" l10n="U" oldref="1">Custom Slide Shows</paragraph>
+<paragraph role="paragraph" id="par_id3149207" xml-lang="en-US" l10n="U" oldref="2"><variable id="indipraesent"><ahelp hid=".uno:CustomShowDialog">Defines a custom slide show using slides within the current presentation. You can then pick slides to meet the needs of your audience. You can create as many custom slide shows as you want.</ahelp>
+</variable></paragraph>
+<section id="howtoget">
+<embed href="text/simpress/00/00000407.xhp#indipra"/>
</section>
- <embed href="text/simpress/guide/individual.xhp#individual"/>
- <bookmark branch="hid/SD_LISTBOX_DLG_CUSTOMSHOW_LB_CUSTOMSHOWS" xml-lang="en-US" id="bm_id3146980"/><paragraph role="heading" level="2" id="hd_id3155530" l10n="U" xml-lang="en-US" oldref="3">Name of the presentation(s)</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3156449" xml-lang="en-US" oldref="4"><ahelp hid="SD_LISTBOX_DLG_CUSTOMSHOW_LB_CUSTOMSHOWS" visibility="visible">Lists the custom slide shows that are available.</ahelp></paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3149408" l10n="U" oldref="5">To create a custom slide show, click <emph>New</emph>.</paragraph>
- <bookmark branch="hid/SD_CHECKBOX_DLG_CUSTOMSHOW_CBX_USE_CUSTOMSHOW" xml-lang="en-US" id="bm_id3148870"/><paragraph role="heading" level="2" id="hd_id3152899" l10n="U" xml-lang="en-US" oldref="9">Use Custom Slide Show</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3149947" xml-lang="en-US" oldref="10"><ahelp visibility="visible" hid="SD_CHECKBOX_DLG_CUSTOMSHOW_CBX_USE_CUSTOMSHOW">Runs the custom slide show you selected when you click <emph>Start</emph>. Otherwise, the entire presentation is shown.</ahelp></paragraph>
- <paragraph role="heading" level="3" id="hd_id3148604" l10n="U" xml-lang="en-US" oldref="6">To run a custom slide show:</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" role="listitem" id="par_id3153250" l10n="U" oldref="7">Click the show in the list and then select <emph>Use Custom Slide Show</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" role="listitem" id="par_id3159230" l10n="U" oldref="8">Click <emph>Start</emph>.</paragraph>
- </listitem>
- </list>
- <bookmark branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_NEW" xml-lang="en-US" id="bm_id3153013"/><paragraph id="hd_id3153808" role="heading" level="2" oldref="11" l10n="U" xml-lang="en-US"><link href="text/simpress/01/06100100.xhp" name="New">New</link></paragraph>
- <embed href="text/simpress/01/06100100.xhp#neu"/>
- <bookmark branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_EDIT" xml-lang="en-US" id="bm_id3147244"/><paragraph role="heading" level="2" id="hd_id3153073" l10n="U" xml-lang="en-US" oldref="12">Edit</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150431" xml-lang="en-US" oldref="13"><ahelp visibility="visible" hid="SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_EDIT"><link href="text/simpress/01/06100100.xhp" name="Add, remove or reorder">Add, remove or reorder</link> slides as well as change the name of the selected custom slide show.</ahelp></paragraph>
- <bookmark branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_REMOVE" xml-lang="en-US" id="bm_id3147296"/><embed href="text/shared/00/00000001.xhp#loeschen1"/>
- <bookmark branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_COPY" xml-lang="en-US" id="bm_id3147404"/><paragraph role="heading" level="2" id="hd_id3151393" l10n="U" xml-lang="en-US" oldref="14">Copy</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3145236" xml-lang="en-US" oldref="15"><ahelp visibility="visible" hid="SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_COPY">Creates a copy of the selected custom slide show. You can modify the name of the show by clicking <emph>Edit</emph>.</ahelp></paragraph>
- <bookmark branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_STARTSHOW" xml-lang="en-US" id="bm_id3157900"/><paragraph role="heading" level="2" id="hd_id3153121" l10n="U" xml-lang="en-US" oldref="16">Start</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3157907" xml-lang="en-US" oldref="17"><ahelp visibility="visible" hid="SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_STARTSHOW">Runs the slide show. Ensure that <emph>Use Custom Slide Show</emph> is selected if you want to run a custom presentation.</ahelp></paragraph>
- <embed href="text/shared/00/00000001.xhp#schliessen"/>
- </body>
+<embed href="text/simpress/guide/individual.xhp#individual"/>
+<bookmark xml-lang="en-US" branch="hid/SD_LISTBOX_DLG_CUSTOMSHOW_LB_CUSTOMSHOWS" id="bm_id3146980" localize="false"/>
+<paragraph role="heading" id="hd_id3155530" xml-lang="en-US" level="2" l10n="U" oldref="3">Name of the presentation(s)</paragraph>
+<paragraph role="paragraph" id="par_id3156449" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SD_LISTBOX_DLG_CUSTOMSHOW_LB_CUSTOMSHOWS">Lists the custom slide shows that are available.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149408" xml-lang="en-US" l10n="U" oldref="5">To create a custom slide show, click <emph>New</emph>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_DLG_CUSTOMSHOW_CBX_USE_CUSTOMSHOW" id="bm_id3148870" localize="false"/>
+<paragraph role="heading" id="hd_id3152899" xml-lang="en-US" level="2" l10n="U" oldref="9">Use Custom Slide Show</paragraph>
+<paragraph role="paragraph" id="par_id3149947" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SD_CHECKBOX_DLG_CUSTOMSHOW_CBX_USE_CUSTOMSHOW">Runs the custom slide show you selected when you click <emph>Start</emph>. Otherwise, the entire presentation is shown.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3148604" xml-lang="en-US" level="3" l10n="U" oldref="6">To run a custom slide show:</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="listitem" id="par_id3153250" xml-lang="en-US" l10n="U" oldref="7">Click the show in the list and then select <emph>Use Custom Slide Show</emph>.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3159230" xml-lang="en-US" l10n="U" oldref="8">Click <emph>Start</emph>.</paragraph>
+</listitem>
+</list>
+<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_NEW" id="bm_id3153013" localize="false"/>
+<paragraph role="heading" id="hd_id3153808" xml-lang="en-US" level="2" l10n="U" oldref="11"><link href="text/simpress/01/06100100.xhp" name="New">New</link></paragraph>
+<embed href="text/simpress/01/06100100.xhp#neu"/>
+<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_EDIT" id="bm_id3147244" localize="false"/>
+<paragraph role="heading" id="hd_id3153073" xml-lang="en-US" level="2" l10n="U" oldref="12">Edit</paragraph>
+<paragraph role="paragraph" id="par_id3150431" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_EDIT"><link href="text/simpress/01/06100100.xhp" name="Add, remove or reorder">Add, remove or reorder</link> slides as well as change the name of the selected custom slide show.</ahelp></paragraph>
+<embed href="text/shared/00/00000001.xhp#loeschen1"/>
+<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_COPY" id="bm_id3147404" localize="false"/>
+<paragraph role="heading" id="hd_id3151393" xml-lang="en-US" level="2" l10n="U" oldref="14">Copy</paragraph>
+<paragraph role="paragraph" id="par_id3145236" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_COPY">Creates a copy of the selected custom slide show. You can modify the name of the show by clicking <emph>Edit</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_STARTSHOW" id="bm_id3157900" localize="false"/>
+<paragraph role="heading" id="hd_id3153121" xml-lang="en-US" level="2" l10n="U" oldref="16">Start</paragraph>
+<paragraph role="paragraph" id="par_id3157907" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SD_PUSHBUTTON_DLG_CUSTOMSHOW_BTN_STARTSHOW">Runs the slide show. Ensure that <emph>Use Custom Slide Show</emph> is selected if you want to run a custom presentation.</ahelp></paragraph>
+<embed href="text/shared/00/00000001.xhp#schliessen"/>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/simpress/01/makefile.mk b/helpcontent2/source/text/simpress/01/makefile.mk
index a56770afc3..4b08f2a41a 100644
--- a/helpcontent2/source/text/simpress/01/makefile.mk
+++ b/helpcontent2/source/text/simpress/01/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.10.4.4 $
#
# This file is part of OpenOffice.org.
#
@@ -78,7 +78,9 @@ XHPFILES = \
04010000.xhp \
04020000.xhp \
04030000.xhp \
+ 04030000m.xhp \
04030100.xhp \
+ 04040000m.xhp \
04080100.xhp \
04110000.xhp \
04110100.xhp \
@@ -94,9 +96,12 @@ XHPFILES = \
04990500.xhp \
04990600.xhp \
04990700.xhp \
+ 05090000m.xhp \
05100000.xhp \
+ 05110500m.xhp \
05120000.xhp \
05120100.xhp \
+ 05120500m.xhp \
05130000.xhp \
05140000.xhp \
05150000.xhp \
diff --git a/helpcontent2/source/text/simpress/01/taskpanel.xhp b/helpcontent2/source/text/simpress/01/taskpanel.xhp
index 1afee82d8e..2550d2afbe 100755
--- a/helpcontent2/source/text/simpress/01/taskpanel.xhp
+++ b/helpcontent2/source/text/simpress/01/taskpanel.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: taskpanel.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsimpress01taskpanelxml" indexer="include" status="PUBLISH">
+<topic id="textsimpress01taskpanelxml" indexer="include">
<title id="tit" xml-lang="en-US">Task Pane</title>
<filename>/text/simpress/01/taskpanel.xhp</filename>
</topic>
@@ -46,7 +44,8 @@
<section id="taskpanel">
<bookmark xml-lang="en-US" branch="index" id="bm_id3274636"><bookmark_value>task pane</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:RightPane" id="bm_id5609302" localize="false"/><paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><link href="text/simpress/01/taskpanel.xhp">Task Pane</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:RightPane" id="bm_id5609302" localize="false"/>
+<paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1" l10n="NEW"><link href="text/simpress/01/taskpanel.xhp">Task Pane</link></paragraph>
<paragraph role="paragraph" id="par_idN10554" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Switches the %PRODUCTNAME Impress task pane on and off.</ahelp></paragraph>
</section>
<section id="howtoget">
@@ -58,27 +57,36 @@
<embedvar href="text/simpress/guide/masterpage.xhp#masterpage"/>
</paragraph>
</section>
-<bookmark xml-lang="en-US" branch="hid/HID_SC_DPLAY_DATA" id="bm_id957365" localize="false"/><paragraph role="paragraph" id="par_idN1063E" xml-lang="en-US" l10n="NEW"><comment>Master Page</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SC_DPLAY_DATA" id="bm_id957365" localize="false"/><comment>Master Page</comment>
<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Master Pages tab page, where you apply a master page (background) to all slides (left-click) or to the selected slides (right-click).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SD_CURRENT_MASTERS" id="bm_id5079500" localize="false"/><paragraph role="paragraph" id="par_idN10669" xml-lang="en-US" l10n="NEW"><comment>Used in this presentation</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SD_CURRENT_MASTERS" id="bm_id5079500" localize="false"/><comment>Used in this presentation</comment>
<paragraph role="paragraph" id="par_idN1067D" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the currently used master pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/59907" id="bm_id4361705" localize="false"/><paragraph role="paragraph" id="par_idN10694" xml-lang="en-US" l10n="NEW"><comment>Recently used</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/59907" id="bm_id4361705" localize="false"/><comment>Recently used</comment>
<paragraph role="paragraph" id="par_idN106A8" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the recently used master pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SD_ALL_MASTERS" id="bm_id746177" localize="false"/><paragraph role="paragraph" id="par_idN106BF" xml-lang="en-US" l10n="NEW"><comment>Available for Use</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SD_ALL_MASTERS" id="bm_id746177" localize="false"/><comment>Available for Use</comment>
<paragraph role="paragraph" id="par_idN106D3" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists all available master pages.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SD_TASK_PANE_PREVIEW_CURRENT" id="bm_id2108523" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SD_TASK_PANE_PREVIEW_RECENT" id="bm_id433362" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_SD_TASK_PANE_PREVIEW_ALL" id="bm_id8973662" localize="false"/><paragraph role="paragraph" id="par_idN106FA" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Left-click to apply the master page to all slides. Right-click for a submenu.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TP_APPLY_TO_ALL_SLIDES" id="bm_id2527848" localize="false"/><paragraph role="paragraph" id="par_idN10747" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Applies the master page to all slides.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TP_APPLY_TO_SELECTED_SLIDES" id="bm_id5487228" localize="false"/><paragraph role="paragraph" id="par_idN10762" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Applies the master page or the slide design to the selected slides.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SD_TASK_PANE_PREVIEW_ALL" id="bm_id8973662" localize="false"/>
+<paragraph role="paragraph" id="par_idN106FA" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Left-click to apply the master page to all slides. Right-click for a submenu.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TP_APPLY_TO_ALL_SLIDES" id="bm_id2527848" localize="false"/>
+<paragraph role="paragraph" id="par_idN10747" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Applies the master page to all slides.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TP_APPLY_TO_SELECTED_SLIDES" id="bm_id5487228" localize="false"/>
+<paragraph role="paragraph" id="par_idN10762" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Applies the master page or the slide design to the selected slides.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_TP_SHOW_LARGE_PREVIEW" id="bm_id9531235" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_TP_SHOW_SMALL_PREVIEW" id="bm_id4315622" localize="false"/><paragraph role="paragraph" id="par_idN10785" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Resizes the preview of the master pages.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SD_SLIDE_DESIGNS" id="bm_id7836848" localize="false"/><paragraph role="paragraph" id="par_idN107A0" xml-lang="en-US" l10n="NEW"><comment>Layouts</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TP_SHOW_SMALL_PREVIEW" id="bm_id4315622" localize="false"/>
+<paragraph role="paragraph" id="par_idN10785" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Resizes the preview of the master pages.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SD_SLIDE_DESIGNS" id="bm_id7836848" localize="false"/><comment>Layouts</comment>
<paragraph role="paragraph" id="par_idN107B4" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Layouts tab page, where you apply a slide design to the selected slide or slides.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SD_TASK_PANE_PREVIEW_LAYOUTS" id="bm_id6526688" localize="false"/><paragraph role="paragraph" id="par_idN107CB" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to apply a slide design to all selected slides. Right-click for a submenu.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SD_CUSTOM_ANIMATIONS" id="bm_id3448591" localize="false"/><paragraph role="paragraph" id="par_idN107FA" xml-lang="en-US" l10n="NEW"><comment>Custom Animation</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SD_TASK_PANE_PREVIEW_LAYOUTS" id="bm_id6526688" localize="false"/>
+<paragraph role="paragraph" id="par_idN107CB" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to apply a slide design to all selected slides. Right-click for a submenu.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SD_CUSTOM_ANIMATIONS" id="bm_id3448591" localize="false"/><comment>Custom Animation</comment>
<paragraph role="paragraph" id="par_idN1080E" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Custom Animation tab page, where you apply effects to the selected objects on a slide.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SD_SLIDE_TRANSITIONS" id="bm_id8300729" localize="false"/><paragraph role="paragraph" id="par_idN10825" xml-lang="en-US" l10n="NEW"><comment>Slide Transition</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10839" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Slide Transition tab page, where you apply transition effects to the selected slides.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SD_SLIDE_TRANSITIONS" id="bm_id8300729" localize="false"/><comment>Slide Transition</comment>
+<paragraph role="paragraph" id="par_idN10839" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Slide Transition tab page, where you apply transition effects to the selected slides.</ahelp></paragraph><comment>Table Design</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_SD_TABLE_DESIGN" id="bm_id0916200812145783" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:TableDesign" id="bm_id091620081221536" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200812240344" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Table Design. Double-click a preview to insert a new table.</ahelp><comment>Impress: Table Design tab page in task pane.
+Draw: Table Design dialog</comment></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/simpress/02/10030200.xhp b/helpcontent2/source/text/simpress/02/10030200.xhp
index 6d36577b0d..5e7cc7a4f1 100644
--- a/helpcontent2/source/text/simpress/02/10030200.xhp
+++ b/helpcontent2/source/text/simpress/02/10030200.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 10030200.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,209 +32,227 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsimpress0210030200xml" indexer="include" status="PUBLISH">
+<topic id="textsimpress0210030200xml" indexer="include">
<title id="tit" xml-lang="en-US">Gluepoints Bar</title>
<filename>/text/simpress/02/10030200.xhp</filename>
</topic>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149948"><bookmark_value>object bars; editing glue points</bookmark_value>
-<bookmark_value>glue points; editing</bookmark_value>
-<bookmark_value>editing; glue points</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3149948" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><variable id="gluepointsbar"><link href="text/simpress/02/10030200.xhp">Glue Points Bar</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3159206" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Insert or modify the properties of a glue point. A glue point is a custom connection point where you can attach a <link href="text/simpress/02/10100000.xhp" name="connector">connector</link> line. </ahelp> By default, <item type="productname">%PRODUCTNAME</item> automatically places a connection point at the center of each side of the bounding rectangle for every object you create.</paragraph>
+<paragraph role="paragraph" id="par_id3159206" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Insert or modify the properties of a gluepoint. A gluepoint is a point where you can attach a <link href="text/simpress/02/10100000.xhp" name="connector">connector</link> line. </ahelp> By default, <item type="productname">%PRODUCTNAME</item> automatically places a gluepoint at the center of each side of the bounding rectangle for every object you create.</paragraph>
<section id="howtoget">
- <embed href="text/simpress/00/00000402.xhp#gluebar"/>
+<embed href="text/simpress/00/00000402.xhp#gluebar"/>
</section>
<embed href="text/simpress/guide/orgchart.xhp#orgchart"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3149876"><bookmark_value>glue points; inserting</bookmark_value>
-<bookmark_value>inserting; glue points</bookmark_value>
-</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_GLUE_INSERT_POINT" id="bm_id5848317" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:GlueInsertPoint" id="bm_id3153073" localize="false"/><paragraph role="heading" id="hd_id3149876" xml-lang="en-US" level="2" l10n="U" oldref="3">Insert Glue Point </paragraph>
-<paragraph role="paragraph" id="par_id3150393" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid=".uno:GlueInsertPoint">Inserts a glue point where you click in an object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GlueInsertPoint" id="bm_id3153073" localize="false"/>
+<paragraph role="heading" id="hd_id3149876" xml-lang="en-US" level="2" l10n="U" oldref="3">Insert Glue Point </paragraph>
+<paragraph role="paragraph" id="par_id3150393" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid=".uno:GlueInsertPoint">Inserts a gluepoint where you click in an object.</ahelp></paragraph>
<table id="tbl_id3147407">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3157876" xml-lang="en-US" l10n="E">
-<image id="img_id3150650" src="res/commandimagelist/sc_glueinsertpoint.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150650" xml-lang="en-US">Icon</alt>
+<image id="img_id3150650" src="res/commandimagelist/sc_glueinsertpoint.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150650" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148729" xml-lang="en-US" l10n="U" oldref="4">Insert Point</paragraph>
</tablecell>
</tablerow>
</table>
+
<bookmark xml-lang="en-US" branch="hid/SID_GLUE_ESCDIR_LEFT" id="bm_id2438250" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:GlueEscapeDirectionLeft" id="bm_id3153084" localize="false"/><paragraph role="heading" id="hd_id3153933" xml-lang="en-US" level="2" l10n="U" oldref="6">Exit Direction Left</paragraph>
-<paragraph role="paragraph" id="par_id3150864" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid=".uno:GlueEscapeDirectionLeft">Connector attaches to the left edge of the selected glue point.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GlueEscapeDirectionLeft" id="bm_id3153084" localize="false"/>
+<paragraph role="heading" id="hd_id3153933" xml-lang="en-US" level="2" l10n="U" oldref="6">Exit Direction Left</paragraph>
+<paragraph role="paragraph" id="par_id3150864" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid=".uno:GlueEscapeDirectionLeft">Connector attaches to the left edge of the selected gluepoint.</ahelp></paragraph>
<table id="tbl_id3155261">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145165" xml-lang="en-US" l10n="E">
-<image id="img_id3153567" src="res/commandimagelist/sc_glueescapedirectionleft.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3153567" xml-lang="en-US">Icon</alt>
+<image id="img_id3153567" src="res/commandimagelist/sc_glueescapedirectionleft.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153567" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150019" xml-lang="en-US" l10n="U" oldref="7">Exit Direction Left</paragraph>
</tablecell>
</tablerow>
</table>
+
<bookmark xml-lang="en-US" branch="hid/SID_GLUE_ESCDIR_TOP" id="bm_id193286" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:GlueEscapeDirectionTop" id="bm_id3155931" localize="false"/><paragraph role="heading" id="hd_id3149881" xml-lang="en-US" level="2" l10n="U" oldref="9">Exit Direction Top</paragraph>
-<paragraph role="paragraph" id="par_id3147370" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid=".uno:GlueEscapeDirectionTop">Connector attaches to the top edge of the selected glue point.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GlueEscapeDirectionTop" id="bm_id3155931" localize="false"/>
+<paragraph role="heading" id="hd_id3149881" xml-lang="en-US" level="2" l10n="U" oldref="9">Exit Direction Top</paragraph>
+<paragraph role="paragraph" id="par_id3147370" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid=".uno:GlueEscapeDirectionTop">Connector attaches to the top edge of the selected gluepoint.</ahelp></paragraph>
<table id="tbl_id3145246">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153042" xml-lang="en-US" l10n="E">
-<image id="img_id3148386" src="res/commandimagelist/sc_glueescapedirectiontop.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3148386" xml-lang="en-US">Icon</alt>
+<image id="img_id3148386" src="res/commandimagelist/sc_glueescapedirectiontop.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148386" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150929" xml-lang="en-US" l10n="U" oldref="10">Exit Direction Top</paragraph>
</tablecell>
</tablerow>
</table>
+
<bookmark xml-lang="en-US" branch="hid/SID_GLUE_ESCDIR_RIGHT" id="bm_id2959816" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:GlueEscapeDirectionRight" id="bm_id3149025" localize="false"/><paragraph role="heading" id="hd_id3150265" xml-lang="en-US" level="2" l10n="U" oldref="12">Exit Direction Right</paragraph>
-<paragraph role="paragraph" id="par_id3149030" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid=".uno:GlueEscapeDirectionRight">Connector attaches to the right edge of the selected glue point.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GlueEscapeDirectionRight" id="bm_id3149025" localize="false"/>
+<paragraph role="heading" id="hd_id3150265" xml-lang="en-US" level="2" l10n="U" oldref="12">Exit Direction Right</paragraph>
+<paragraph role="paragraph" id="par_id3149030" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid=".uno:GlueEscapeDirectionRight">Connector attaches to the right edge of the selected gluepoint.</ahelp></paragraph>
<table id="tbl_id3147541">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155401" xml-lang="en-US" l10n="E">
-<image id="img_id3156256" src="res/commandimagelist/sc_glueescapedirectionright.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3156256" xml-lang="en-US">Icon</alt>
+<image id="img_id3156256" src="res/commandimagelist/sc_glueescapedirectionright.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156256" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="U" oldref="13">Exit Direction Right</paragraph>
</tablecell>
</tablerow>
</table>
+
<bookmark xml-lang="en-US" branch="hid/SID_GLUE_ESCDIR_BOTTOM" id="bm_id5611028" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:GlueEscapeDirectionBottom" id="bm_id3083450" localize="false"/><paragraph role="heading" id="hd_id3147173" xml-lang="en-US" level="2" l10n="U" oldref="15">Exit Direction Bottom</paragraph>
-<paragraph role="paragraph" id="par_id3149710" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".uno:GlueEscapeDirectionBottom">Connector attaches to the bottom edge of the selected glue point.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GlueEscapeDirectionBottom" id="bm_id3083450" localize="false"/>
+<paragraph role="heading" id="hd_id3147173" xml-lang="en-US" level="2" l10n="U" oldref="15">Exit Direction Bottom</paragraph>
+<paragraph role="paragraph" id="par_id3149710" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".uno:GlueEscapeDirectionBottom">Connector attaches to the bottom edge of the selected gluepoint.</ahelp></paragraph>
<table id="tbl_id3149447">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145204" xml-lang="en-US" l10n="E">
-<image id="img_id3150756" src="res/commandimagelist/sc_glueescapedirectionbottom.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3150756" xml-lang="en-US">Icon</alt>
+<image id="img_id3150756" src="res/commandimagelist/sc_glueescapedirectionbottom.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150756" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153218" xml-lang="en-US" l10n="U" oldref="16">Exit Direction Bottom</paragraph>
</tablecell>
</tablerow>
</table>
+
<bookmark xml-lang="en-US" branch="hid/SID_GLUE_PERCENT" id="bm_id8979968" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:GluePercent" id="bm_id3147565" localize="false"/><paragraph role="heading" id="hd_id3150875" xml-lang="en-US" level="2" l10n="U" oldref="18">Glue Point Relative</paragraph>
-<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid=".uno:GluePercent">Maintains the relative position of a selected glue point when you resize an object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GluePercent" id="bm_id3147565" localize="false"/>
+<paragraph role="heading" id="hd_id3150875" xml-lang="en-US" level="2" l10n="U" oldref="18">Glue Point Relative</paragraph>
+<paragraph role="paragraph" id="par_id3147571" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid=".uno:GluePercent">Maintains the relative position of a selected gluepoint when you resize an object.</ahelp></paragraph>
<table id="tbl_id3155850">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153622" xml-lang="en-US" l10n="E">
-<image id="img_id3153149" src="res/commandimagelist/sc_gluepercent.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3153149" xml-lang="en-US">Icon</alt>
+<image id="img_id3153149" src="res/commandimagelist/sc_gluepercent.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153149" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149286" xml-lang="en-US" l10n="U" oldref="19">Glue Point Relative</paragraph>
</tablecell>
</tablerow>
</table>
+
<bookmark xml-lang="en-US" branch="hid/SID_GLUE_HORZALIGN_LEFT" id="bm_id3118101" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:GlueHorzAlignLeft" id="bm_id3159181" localize="false"/><paragraph role="heading" id="hd_id3149755" xml-lang="en-US" level="2" l10n="CHG" oldref="21">Glue Point Horizontal Left</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GlueHorzAlignLeft" id="bm_id3159181" localize="false"/>
+<paragraph role="heading" id="hd_id3149755" xml-lang="en-US" level="2" l10n="CHG" oldref="21">Glue Point Horizontal Left</paragraph>
<paragraph role="paragraph" id="par_id3147252" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid=".uno:GlueHorzAlignLeft">When the object is resized, the current gluepoint remains fixed to the left edge of the object.</ahelp></paragraph>
<table id="tbl_id3151176">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154934" xml-lang="en-US" l10n="E">
-<image id="img_id3148829" src="res/commandimagelist/sc_gluehorzalignleft.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3148829" xml-lang="en-US">Icon</alt>
+<image id="img_id3148829" src="res/commandimagelist/sc_gluehorzalignleft.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148829" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3158405" xml-lang="en-US" l10n="CHG" oldref="22">Glue Point Horizontal Left</paragraph>
</tablecell>
</tablerow>
</table>
+
<bookmark xml-lang="en-US" branch="hid/SID_GLUE_HORZALIGN_CENTER" id="bm_id4926781" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:GlueHorzAlignCenter" id="bm_id3145419" localize="false"/><paragraph role="heading" id="hd_id3154214" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Glue Point Horizontal Center</paragraph>
-<paragraph role="paragraph" id="par_id3147510" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid=".uno:GlueHorzAlignCenter">When the object is resized, the current glue point remains fixed to the center of the object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GlueHorzAlignCenter" id="bm_id3145419" localize="false"/>
+<paragraph role="heading" id="hd_id3154214" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Glue Point Horizontal Center</paragraph>
+<paragraph role="paragraph" id="par_id3147510" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid=".uno:GlueHorzAlignCenter">When the object is resized, the current gluepoint remains fixed to the center of the object.</ahelp></paragraph>
<table id="tbl_id3153583">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148910" xml-lang="en-US" l10n="E">
-<image id="img_id3148919" src="res/commandimagelist/sc_gluehorzaligncenter.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3148919" xml-lang="en-US">Icon</alt>
+<image id="img_id3148919" src="res/commandimagelist/sc_gluehorzaligncenter.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148919" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150706" xml-lang="en-US" l10n="CHG" oldref="25">Glue Point Horizontal Center</paragraph>
</tablecell>
</tablerow>
</table>
+
<bookmark xml-lang="en-US" branch="hid/SID_GLUE_HORZALIGN_RIGHT" id="bm_id8396997" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:GlueHorzAlignRight" id="bm_id3153686" localize="false"/><paragraph role="heading" id="hd_id3153748" xml-lang="en-US" level="2" l10n="CHG" oldref="27">Glue Point Horizontal Right</paragraph>
-<paragraph role="paragraph" id="par_id3154096" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid=".uno:GlueHorzAlignRight">When the object is resized, the current glue point remains fixed to the right edge of the object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GlueHorzAlignRight" id="bm_id3153686" localize="false"/>
+<paragraph role="heading" id="hd_id3153748" xml-lang="en-US" level="2" l10n="CHG" oldref="27">Glue Point Horizontal Right</paragraph>
+<paragraph role="paragraph" id="par_id3154096" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid=".uno:GlueHorzAlignRight">When the object is resized, the current gluepoint remains fixed to the right edge of the object.</ahelp></paragraph>
<table id="tbl_id3152945">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148627" xml-lang="en-US" l10n="E">
-<image id="img_id3149808" src="res/commandimagelist/sc_gluehorzalignright.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3149808" xml-lang="en-US">Icon</alt>
+<image id="img_id3149808" src="res/commandimagelist/sc_gluehorzalignright.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149808" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154799" xml-lang="en-US" l10n="CHG" oldref="28">Glue Point Horizontal Right</paragraph>
</tablecell>
</tablerow>
</table>
+
<bookmark xml-lang="en-US" branch="hid/SID_GLUE_VERTALIGN_TOP" id="bm_id7693264" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:GlueVertAlignTop" id="bm_id3150630" localize="false"/><paragraph role="heading" id="hd_id3153540" xml-lang="en-US" level="2" l10n="CHG" oldref="30">Glue Point Vertical Top</paragraph>
-<paragraph role="paragraph" id="par_id3149930" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid=".uno:GlueVertAlignTop">When the object is resized, the current glue point remains fixed to the top edge of the object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GlueVertAlignTop" id="bm_id3150630" localize="false"/>
+<paragraph role="heading" id="hd_id3153540" xml-lang="en-US" level="2" l10n="CHG" oldref="30">Glue Point Vertical Top</paragraph>
+<paragraph role="paragraph" id="par_id3149930" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid=".uno:GlueVertAlignTop">When the object is resized, the current gluepoint remains fixed to the top edge of the object.</ahelp></paragraph>
<table id="tbl_id3148693">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154481" xml-lang="en-US" l10n="E">
-<image id="img_id3154571" src="res/commandimagelist/sc_gluevertaligntop.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3154571" xml-lang="en-US">Icon</alt>
+<image id="img_id3154571" src="res/commandimagelist/sc_gluevertaligntop.png" width="0.423cm" height="0.423cm"><alt id="alt_id3154571" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148681" xml-lang="en-US" l10n="CHG" oldref="31">Glue Point Vertical Top</paragraph>
</tablecell>
</tablerow>
</table>
+
<bookmark xml-lang="en-US" branch="hid/SID_GLUE_VERTALIGN_CENTER" id="bm_id4116647" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:GlueVertAlignCenter" id="bm_id3152961" localize="false"/><paragraph role="heading" id="hd_id3153678" xml-lang="en-US" level="2" l10n="CHG" oldref="33">Glue Point Vertical Center</paragraph>
-<paragraph role="paragraph" id="par_id3151310" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid=".uno:GlueVertAlignCenter">When the object is resized, the current glue point remains fixed to the vertical center of the object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GlueVertAlignCenter" id="bm_id3152961" localize="false"/>
+<paragraph role="heading" id="hd_id3153678" xml-lang="en-US" level="2" l10n="CHG" oldref="33">Glue Point Vertical Center</paragraph>
+<paragraph role="paragraph" id="par_id3151310" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid=".uno:GlueVertAlignCenter">When the object is resized, the current gluepoint remains fixed to the vertical center of the object.</ahelp></paragraph>
<table id="tbl_id3153780">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150996" xml-lang="en-US" l10n="E">
-<image id="img_id3151106" src="res/commandimagelist/sc_gluevertaligncenter.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3151106" xml-lang="en-US">Icon</alt>
+<image id="img_id3151106" src="res/commandimagelist/sc_gluevertaligncenter.png" width="0.423cm" height="0.423cm"><alt id="alt_id3151106" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146130" xml-lang="en-US" l10n="CHG" oldref="34">Glue Point Vertical Center</paragraph>
</tablecell>
</tablerow>
</table>
+
<bookmark xml-lang="en-US" branch="hid/SID_GLUE_VERTALIGN_BOTTOM" id="bm_id7499485" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:GlueVertAlignBottom" id="bm_id3155900" localize="false"/><paragraph role="heading" id="hd_id3147529" xml-lang="en-US" level="2" l10n="CHG" oldref="36">Glue Point Vertical Bottom</paragraph>
-<paragraph role="paragraph" id="par_id3148397" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid=".uno:GlueVertAlignBottom">When the object is resized, the current glue point remains fixed to the bottom edge of the object.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:GlueVertAlignBottom" id="bm_id3155900" localize="false"/>
+<paragraph role="heading" id="hd_id3147529" xml-lang="en-US" level="2" l10n="CHG" oldref="36">Glue Point Vertical Bottom</paragraph>
+<paragraph role="paragraph" id="par_id3148397" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid=".uno:GlueVertAlignBottom">When the object is resized, the current gluepoint remains fixed to the bottom edge of the object.</ahelp></paragraph>
<table id="tbl_id3150832">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150644" xml-lang="en-US" l10n="E">
-<image id="img_id3154192" src="res/commandimagelist/sc_gluevertalignbottom.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3154192" xml-lang="en-US">Icon</alt>
+<image id="img_id3154192" src="res/commandimagelist/sc_gluevertalignbottom.png" width="0.423cm" height="0.423cm"><alt id="alt_id3154192" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156204" xml-lang="en-US" l10n="CHG" oldref="37">Glue Point Vertical Bottom</paragraph>
</tablecell>
</tablerow>
</table>
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/simpress/02/10080000.xhp b/helpcontent2/source/text/simpress/02/10080000.xhp
index 1cba0ebbd1..6a781faf8c 100644
--- a/helpcontent2/source/text/simpress/02/10080000.xhp
+++ b/helpcontent2/source/text/simpress/02/10080000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 10080000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -57,9 +57,7 @@
<paragraph role="heading" id="hd_id3149875" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/02/10080000.xhp" name="Curve">Curve</link></paragraph>
<paragraph role="paragraph" id="par_id3147301" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:LineToolbox">The Curve icon on the Drawing bar opens the <emph>Lines</emph> toolbar, where you can add lines and shapes to the current slide.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3157873" xml-lang="en-US" l10n="U" oldref="3">If you hold the Shift key down, the movement of the mouse is limited to multiples of 45 degrees. If you hold down the <switchinline select="sys"><caseinline select="MAC">Options
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key, the new point will not be connected to the last point. This allows you to create objects that consist of curves that are not connected together. If you draw a smaller object while holding down the <switchinline select="sys"><caseinline select="MAC">Options
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key into a larger object that you have not closed yet, the smaller object is subtracted from the larger one, thus appearing as a hole in the larger one.</paragraph>
+<paragraph role="paragraph" id="par_id3157873" xml-lang="en-US" l10n="U" oldref="3">If you hold the Shift key down, the movement of the mouse is limited to multiples of 45 degrees. If you hold down the <switchinline select="sys"><caseinline select="MAC">Options</caseinline><defaultinline>Alt</defaultinline></switchinline> key, the new point will not be connected to the last point. This allows you to create objects that consist of curves that are not connected together. If you draw a smaller object while holding down the <switchinline select="sys"><caseinline select="MAC">Options</caseinline><defaultinline>Alt</defaultinline></switchinline> key into a larger object that you have not closed yet, the smaller object is subtracted from the larger one, thus appearing as a hole in the larger one.</paragraph>
<paragraph role="paragraph" id="par_id3153083" xml-lang="en-US" l10n="CHG" oldref="8">Closed shapes automatically receive the fill that is displayed in the <emph>Area Style/Filling</emph> box on <emph>Line and Filling</emph> bar. </paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_BEZIER_FILL" id="bm_id9220187" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:BezierFill" id="bm_id3153734" localize="false"/>
@@ -161,8 +159,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:Polygon_Diagonal_Unfill" id="bm_id3150347" localize="false"/>
<paragraph role="heading" id="hd_id3153668" xml-lang="en-US" level="2" l10n="U" oldref="26">Polygon (45°)</paragraph>
-<paragraph role="paragraph" id="par_id3150354" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid=".uno:Polygon_Diagonal_Unfill">Draws a line composed of a series of straight line segments, that are constrained by angles of 45 degree. Drag to draw a line segment, click to define the endpoint of the line segment, and then drag to draw a new line segment. Double-click to finish drawing the line. To create a closed shape, hold down <switchinline select="sys"><caseinline select="MAC">Options
-</caseinline><defaultinline>Alt</defaultinline></switchinline> and double-click.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150354" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid=".uno:Polygon_Diagonal_Unfill">Draws a line composed of a series of straight line segments, that are constrained by angles of 45 degree. Drag to draw a line segment, click to define the endpoint of the line segment, and then drag to draw a new line segment. Double-click to finish drawing the line. To create a closed shape, hold down <switchinline select="sys"><caseinline select="MAC">Options</caseinline><defaultinline>Alt</defaultinline></switchinline> and double-click.</ahelp></paragraph>
<table id="tbl_id3150978">
<tablerow>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/02/10100000.xhp b/helpcontent2/source/text/simpress/02/10100000.xhp
index cef9a07515..eb7cc6998f 100644
--- a/helpcontent2/source/text/simpress/02/10100000.xhp
+++ b/helpcontent2/source/text/simpress/02/10100000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 10100000.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,32 +30,29 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsimpress0210100000xml" indexer="include" status="PUBLISH">
+<topic id="textsimpress0210100000xml" indexer="include">
<title id="tit" xml-lang="en-US">Connectors</title>
<filename>/text/simpress/02/10100000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-11T14:23:33">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="verbinder">
-<bookmark xml-lang="en-US" branch="hid/SID_DRAWTBX_CONNECTORS" id="bm_id6113909" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_DRAWTBX_CONNECTORS" id="bm_id6113909" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorToolbox" id="bm_id3147436" localize="false"/>
<paragraph role="heading" id="hd_id3149664" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/02/10100000.xhp" name="Connectors">Connectors</link></paragraph>
<table id="tbl_id3154512">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155445" xml-lang="en-US" l10n="E">
-<image id="img_id3149018" src="res/commandimagelist/sc_connector.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149018" xml-lang="en-US">Icon</alt>
+<image id="img_id3149018" src="res/commandimagelist/sc_connector.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149018" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154702" xml-lang="en-US" l10n="U" oldref="3">Connector</paragraph>
</tablecell>
</tablerow>
@@ -62,7 +60,7 @@
<paragraph role="paragraph" id="par_id3148488" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:ConnectorToolbox">Open the <emph>Connectors</emph> toolbar, where you can add connectors to objects in the current slide. A connector is a line that joins objects, and remains attached when the objects are moved. If you copy an object with a connector, the connector is also copied.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US" l10n="U" oldref="122">There are four types of connector lines:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3145584" xml-lang="en-US" l10n="U" oldref="123">Standard (90-degree angle bends)</paragraph>
</listitem>
@@ -77,485 +75,486 @@
</listitem>
</list>
</section>
-<section id="syverbinder">
-</section>
-<paragraph role="paragraph" id="par_id3148604" xml-lang="en-US" l10n="U" oldref="4">When you click a connector and move your mouse pointer over a filled object, or the edge of an unfilled object, connection points appear. A connection point is a fixed point where you can attach a connector line. If you want, you can add a custom connection point, called a <link href="text/simpress/02/10030200.xhp" name="glue point">glue point</link>, to an object.</paragraph>
-<paragraph role="paragraph" id="par_id3154762" xml-lang="en-US" l10n="U" oldref="5">To draw a connector line, click a connection point on an object, drag to a connection point on another object, and then release. You can also drag to an empty part of you document and click. The unattached end of the connector is locked in place, until you drag the end to a different location. To detach a connector, drag either end of the connector line to a different location.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TOOL_CONNECTOR" id="bm_id9771135" localize="false"/><!-- HID added by script -->
+<paragraph role="paragraph" id="par_id3148604" xml-lang="en-US" l10n="U" oldref="4">When you click a connector and move your mouse pointer over a filled object, or the edge of an unfilled object, gluepoints appear. A gluepoint is a fixed point where you can attach a connector line. You can add custom <link href="text/simpress/02/10030200.xhp" name="glue point">gluepoints</link> to an object.</paragraph>
+<paragraph role="paragraph" id="par_id3154762" xml-lang="en-US" l10n="U" oldref="5">To draw a connector line, click a gluepoint on an object, drag to a gluepoint on another object, and then release. You can also drag to an empty part of you document and click. The unattached end of the connector is locked in place, until you drag the end to a different location. To detach a connector, drag either end of the connector line to a different location.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TOOL_CONNECTOR" id="bm_id9771135" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Connector" id="bm_id3150397" localize="false"/>
<paragraph role="heading" id="hd_id3147297" xml-lang="en-US" level="2" l10n="U" oldref="9">Connector</paragraph>
-<paragraph role="paragraph" id="par_id3166468" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid=".uno:Connector">Draws a connector with one or more 90-degree angle bends. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3166468" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid=".uno:Connector">Draws a connector with one or more 90-degree angle bends. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3150655">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150743" xml-lang="en-US" l10n="E">
-<image id="img_id3153037" src="res/commandimagelist/sc_connector.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153037" xml-lang="en-US">Icon</alt>
+<image id="img_id3153037" src="res/commandimagelist/sc_connector.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153037" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153084" xml-lang="en-US" l10n="U" oldref="11">Connector</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_ARROW_START" id="bm_id5873530" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_ARROW_START" id="bm_id5873530" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorArrowStart" id="bm_id3153108" localize="false"/>
<paragraph role="heading" id="hd_id3145597" xml-lang="en-US" level="2" l10n="U" oldref="12">Connector Starts with Arrow</paragraph>
-<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid=".uno:ConnectorArrowStart">Draws a connector with one or more 90-degree angle bends and an arrow at the starting point. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid=".uno:ConnectorArrowStart">Draws a connector with one or more 90-degree angle bends and an arrow at the starting point. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3153566">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155930" xml-lang="en-US" l10n="E">
-<image id="img_id3150021" src="res/commandimagelist/sc_connectorarrowstart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150021" xml-lang="en-US">Icon</alt>
+<image id="img_id3150021" src="res/commandimagelist/sc_connectorarrowstart.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150021" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155434" xml-lang="en-US" l10n="U" oldref="14">Connector Starts with Arrow</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_ARROW_END" id="bm_id6972811" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_ARROW_END" id="bm_id6972811" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorArrowEnd" id="bm_id3145348" localize="false"/>
<paragraph role="heading" id="hd_id3145248" xml-lang="en-US" level="2" l10n="U" oldref="15">Connector Ends with Arrow</paragraph>
-<paragraph role="paragraph" id="par_id3145353" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".uno:ConnectorArrowEnd">Draws a connector with one or more 90-degree angle bends and an arrow at the endpoint. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145353" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".uno:ConnectorArrowEnd">Draws a connector with one or more 90-degree angle bends and an arrow at the endpoint. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3145295">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150930" xml-lang="en-US" l10n="E">
-<image id="img_id3150936" src="res/commandimagelist/sc_connectorarrowend.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150936" xml-lang="en-US">Icon</alt>
+<image id="img_id3150936" src="res/commandimagelist/sc_connectorarrowend.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150936" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3109843" xml-lang="en-US" l10n="U" oldref="17">Connector Ends with Arrow </paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_ARROWS" id="bm_id8192463" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_ARROWS" id="bm_id8192463" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorArrows" id="bm_id3155368" localize="false"/>
<paragraph role="heading" id="hd_id3154865" xml-lang="en-US" level="2" l10n="U" oldref="18">Connector with Arrows</paragraph>
-<paragraph role="paragraph" id="par_id3155374" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid=".uno:ConnectorArrows">Draws a connector with one or more 90-degree angle bends and arrows at both ends. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155374" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid=".uno:ConnectorArrows">Draws a connector with one or more 90-degree angle bends and arrows at both ends. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3153919">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155987" xml-lang="en-US" l10n="E">
-<image id="img_id3153720" src="res/commandimagelist/sc_connectorarrows.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153720" xml-lang="en-US">Icon</alt>
+<image id="img_id3153720" src="res/commandimagelist/sc_connectorarrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153720" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149709" xml-lang="en-US" l10n="U" oldref="20">Connector with Arrows</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CIRCLE_START" id="bm_id7199750" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CIRCLE_START" id="bm_id7199750" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorCircleStart" id="bm_id3150968" localize="false"/>
<paragraph role="heading" id="hd_id3149452" xml-lang="en-US" level="2" l10n="U" oldref="21">Connector Starts with Circle</paragraph>
-<paragraph role="paragraph" id="par_id3151183" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid=".uno:ConnectorCircleStart">Draws a connector with one or more 90-degree angle bends and a circle at the starting point. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151183" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid=".uno:ConnectorCircleStart">Draws a connector with one or more 90-degree angle bends and a circle at the starting point. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3145208">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147565" xml-lang="en-US" l10n="E">
-<image id="img_id3147572" src="res/commandimagelist/sc_connectorcirclestart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147572" xml-lang="en-US">Icon</alt>
+<image id="img_id3147572" src="res/commandimagelist/sc_connectorcirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147572" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153219" xml-lang="en-US" l10n="U" oldref="23">Connector Starts with Circle</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CIRCLE_END" id="bm_id5628898" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CIRCLE_END" id="bm_id5628898" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorCircleEnd" id="bm_id3154049" localize="false"/>
<paragraph role="heading" id="hd_id3155847" xml-lang="en-US" level="2" l10n="U" oldref="24">Connector Ends with Circle</paragraph>
-<paragraph role="paragraph" id="par_id3154054" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid=".uno:ConnectorCircleEnd">Draws a connector with one or more 90-degree angle bends and a circle at the endpoint. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154054" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid=".uno:ConnectorCircleEnd">Draws a connector with one or more 90-degree angle bends and a circle at the endpoint. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3153627">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3143234" xml-lang="en-US" l10n="E">
-<image id="img_id3149289" src="res/commandimagelist/sc_connectorcircleend.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149289" xml-lang="en-US">Icon</alt>
+<image id="img_id3149289" src="res/commandimagelist/sc_connectorcircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149289" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3159186" xml-lang="en-US" l10n="U" oldref="26">Connector Ends with Circle </paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CIRCLES" id="bm_id5676907" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CIRCLES" id="bm_id5676907" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorCircles" id="bm_id3154692" localize="false"/>
<paragraph role="heading" id="hd_id3151172" xml-lang="en-US" level="2" l10n="U" oldref="27">Connector with Circles</paragraph>
-<paragraph role="paragraph" id="par_id3154698" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid=".uno:ConnectorCircles">Draws a connector with one or more 90-degree angle bends and circles at both ends. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154698" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid=".uno:ConnectorCircles">Draws a connector with one or more 90-degree angle bends and circles at both ends. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3154938">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3158400" xml-lang="en-US" l10n="E">
-<image id="img_id3154203" src="res/commandimagelist/sc_connectortoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154203" xml-lang="en-US">Icon</alt>
+<image id="img_id3154203" src="res/commandimagelist/sc_connectortoolbox.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154203" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147509" xml-lang="en-US" l10n="U" oldref="29">Connector with Circles</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINES" id="bm_id6535420" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINES" id="bm_id6535420" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorLines" id="bm_id3153579" localize="false"/>
<paragraph role="heading" id="hd_id3154265" xml-lang="en-US" level="2" l10n="U" oldref="30">Line Connector</paragraph>
-<paragraph role="paragraph" id="par_id3148906" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid=".uno:ConnectorLines">Draws a connector that bends near a connection point. Click a connection point on an object, drag to a connection point on another object, and then release. To adjust the length of the line segment between a bend point and a connection point, click the connector and drag the bend point.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3148906" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid=".uno:ConnectorLines">Draws a connector that bends near a gluepoint. Click a gluepoint on an object, drag to a gluepoint on another object, and then release. To adjust the length of the line segment between a bend point and a gluepoint, click the connector and drag the bend point.</ahelp></paragraph>
<table id="tbl_id3148930">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150705" xml-lang="en-US" l10n="E">
-<image id="img_id3153679" src="res/commandimagelist/sc_connectorlines.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153679" xml-lang="en-US">Icon</alt>
+<image id="img_id3153679" src="res/commandimagelist/sc_connectorlines.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153679" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="32">Line Connector</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINES_ARROW_START" id="bm_id1992210" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINES_ARROW_START" id="bm_id1992210" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorLinesArrowStart" id="bm_id3153742" localize="false"/>
<paragraph role="heading" id="hd_id3159274" xml-lang="en-US" level="2" l10n="U" oldref="33">Line Connector Starts with Arrow</paragraph>
-<paragraph role="paragraph" id="par_id3153747" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid=".uno:ConnectorLinesArrowStart">Draws a connector that starts with an arrow and bends near a connection point. Click a connection point on an object, drag to a connection point on another object, and then release. To adjust the length of the line segment between a bend point and a connection point, click the connector and drag the bend point.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153747" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid=".uno:ConnectorLinesArrowStart">Draws a connector that starts with an arrow and bends near a gluepoint. Click a gluepoint on an object, drag to a gluepoint on another object, and then release. To adjust the length of the line segment between a bend point and a gluepoint, click the connector and drag the bend point.</ahelp></paragraph>
<table id="tbl_id3148624">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154610" xml-lang="en-US" l10n="E">
-<image id="img_id3150629" src="res/commandimagelist/sc_connectorlinesarrowstart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150629" xml-lang="en-US">Icon</alt>
+<image id="img_id3150629" src="res/commandimagelist/sc_connectorlinesarrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150629" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154798" xml-lang="en-US" l10n="U" oldref="35">Line Connector Starts with Arrow</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINES_ARROW_END" id="bm_id8377087" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINES_ARROW_END" id="bm_id8377087" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorLinesArrowEnd" id="bm_id3149594" localize="false"/>
<paragraph role="heading" id="hd_id3153539" xml-lang="en-US" level="2" l10n="U" oldref="36">Line Connector Ends with Arrow</paragraph>
-<paragraph role="paragraph" id="par_id3148686" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid=".uno:ConnectorLinesArrowEnd">Draws a connector that ends with an arrow and bends near a connection point. Click a connection point on an object, drag to a connection point on another object, and then release. To adjust the length of the line segment between a bend point and a connection point, click the connector and drag the bend point.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3148686" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid=".uno:ConnectorLinesArrowEnd">Draws a connector that ends with an arrow and bends near a gluepoint. Click a gluepoint on an object, drag to a gluepoint on another object, and then release. To adjust the length of the line segment between a bend point and a gluepoint, click the connector and drag the bend point.</ahelp></paragraph>
<table id="tbl_id3151110">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150347" xml-lang="en-US" l10n="E">
-<image id="img_id3150357" src="res/commandimagelist/sc_connectorlinesarrowend.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150357" xml-lang="en-US">Icon</alt>
+<image id="img_id3150357" src="res/commandimagelist/sc_connectorlinesarrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150357" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152962" xml-lang="en-US" l10n="U" oldref="38">Line Connector Ends with Arrow</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINES_ARROWS" id="bm_id356433" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINES_ARROWS" id="bm_id356433" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorLinesArrows" id="bm_id3148680" localize="false"/>
<paragraph role="heading" id="hd_id3153678" xml-lang="en-US" level="2" l10n="U" oldref="39">Line Connector with Arrows</paragraph>
-<paragraph role="paragraph" id="par_id3158436" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid=".uno:ConnectorLinesArrows">Draws a connector that bends near a connection point and has arrows at both ends. Click a connection point on an object, drag to a connection point on another object, and then release. To adjust the length of the line segment between a bend point and a connection point, click the connector and drag the bend point.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3158436" xml-lang="en-US" l10n="U" oldref="40"><ahelp hid=".uno:ConnectorLinesArrows">Draws a connector that bends near a gluepoint and has arrows at both ends. Click a gluepoint on an object, drag to a gluepoint on another object, and then release. To adjust the length of the line segment between a bend point and a gluepoint, click the connector and drag the bend point.</ahelp></paragraph>
<table id="tbl_id3154481">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150972" xml-lang="en-US" l10n="E">
-<image id="img_id3150982" src="res/commandimagelist/sc_connectorlinesarrows.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150982" xml-lang="en-US">Icon</alt>
+<image id="img_id3150982" src="res/commandimagelist/sc_connectorlinesarrows.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150982" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="41">Line Connector with Arrows</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINES_CIRCLE_START" id="bm_id9750013" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINES_CIRCLE_START" id="bm_id9750013" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorLinesCircleStart" id="bm_id3150838" localize="false"/>
<paragraph role="heading" id="hd_id3150827" xml-lang="en-US" level="2" l10n="U" oldref="42">Line Connector Starts with Circle</paragraph>
-<paragraph role="paragraph" id="par_id3149338" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid=".uno:ConnectorLinesCircleStart">Draws a connector that starts with a circle and bends near a connection point. Click a connection point on an object, drag to a connection point on another object, and then release. To adjust the length of the line segment between a bend point and a connection point, click the connector and drag the bend point.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149338" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid=".uno:ConnectorLinesCircleStart">Draws a connector that starts with a circle and bends near a gluepoint. Click a gluepoint on an object, drag to a gluepoint on another object, and then release. To adjust the length of the line segment between a bend point and a gluepoint, click the connector and drag the bend point.</ahelp></paragraph>
<table id="tbl_id3156201">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151274" xml-lang="en-US" l10n="E">
-<image id="img_id3151284" src="res/commandimagelist/sc_connectorlinescirclestart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151284" xml-lang="en-US">Icon</alt>
+<image id="img_id3151284" src="res/commandimagelist/sc_connectorlinescirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151284" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154136" xml-lang="en-US" l10n="U" oldref="44">Line Connector Starts with Circle</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINES_CIRCLE_END" id="bm_id4405805" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINES_CIRCLE_END" id="bm_id4405805" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorLinesCircleEnd" id="bm_id3155181" localize="false"/>
<paragraph role="heading" id="hd_id3146932" xml-lang="en-US" level="2" l10n="U" oldref="45">Line Connector Ends with Circle</paragraph>
-<paragraph role="paragraph" id="par_id3155187" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid=".uno:ConnectorLinesCircleEnd">Draws a connector that ends with a circle and bends near a connection point. Click a connection point on an object, drag to a connection point on another object, and then release. To adjust the length of the line segment between a bend point and a connection point, click the connector and drag the bend point.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155187" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid=".uno:ConnectorLinesCircleEnd">Draws a connector that ends with a circle and bends near a gluepoint. Click a gluepoint on an object, drag to a gluepoint on another object, and then release. To adjust the length of the line segment between a bend point and a gluepoint, click the connector and drag the bend point.</ahelp></paragraph>
<table id="tbl_id3149305">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="E">
-<image id="img_id3151326" src="res/commandimagelist/sc_connectorlinescircleend.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151326" xml-lang="en-US">Icon</alt>
+<image id="img_id3151326" src="res/commandimagelist/sc_connectorlinescircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151326" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152582" xml-lang="en-US" l10n="U" oldref="47">Line Connector Ends with Circle</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINES_CIRCLES" id="bm_id4623889" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINES_CIRCLES" id="bm_id4623889" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorLinesCircles" id="bm_id3159113" localize="false"/>
<paragraph role="heading" id="hd_id3159102" xml-lang="en-US" level="2" l10n="U" oldref="48">Line Connector with Circles</paragraph>
-<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid=".uno:ConnectorLinesCircles">Draws a connector that bends near a connection point and has circles at both ends. Click a connection point on an object, drag to a connection point on another object, and then release. To adjust the length of the line segment between a bend point and a connection point, click the connector and drag the bend point.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid=".uno:ConnectorLinesCircles">Draws a connector that bends near a gluepoint and has circles at both ends. Click a gluepoint on an object, drag to a gluepoint on another object, and then release. To adjust the length of the line segment between a bend point and a gluepoint, click the connector and drag the bend point.</ahelp></paragraph>
<table id="tbl_id3143283">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151262" xml-lang="en-US" l10n="E">
-<image id="img_id3154834" src="res/commandimagelist/sc_connectorlinecircles.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154834" xml-lang="en-US">Icon</alt>
+<image id="img_id3154834" src="res/commandimagelist/sc_connectorlinecircles.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154834" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149690" xml-lang="en-US" l10n="U" oldref="50">Line Connector with Circles</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINE" id="bm_id1601366" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINE" id="bm_id1601366" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorLine" id="bm_id3149787" localize="false"/>
<paragraph role="heading" id="hd_id3153759" xml-lang="en-US" level="2" l10n="U" oldref="51">Straight Connector</paragraph>
-<paragraph role="paragraph" id="par_id3149793" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid=".uno:ConnectorLine">Draws a straight line connector. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149793" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid=".uno:ConnectorLine">Draws a straight line connector. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3156362">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148981" xml-lang="en-US" l10n="E">
-<image id="img_id3154223" src="res/commandimagelist/sc_connectorline.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154223" xml-lang="en-US">Icon</alt>
+<image id="img_id3154223" src="res/commandimagelist/sc_connectorline.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154223" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154901" xml-lang="en-US" l10n="U" oldref="53">Straight Connector</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINE_ARROW_START" id="bm_id6481055" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINE_ARROW_START" id="bm_id6481055" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorLineArrowStart" id="bm_id3149428" localize="false"/>
<paragraph role="heading" id="hd_id3149037" xml-lang="en-US" level="2" l10n="U" oldref="54">Straight Connector Starts with Arrow</paragraph>
-<paragraph role="paragraph" id="par_id3149435" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid=".uno:ConnectorLineArrowStart">Draws a straight line connector with an arrow at the starting point. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149435" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid=".uno:ConnectorLineArrowStart">Draws a straight line connector with an arrow at the starting point. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3147585">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152775" xml-lang="en-US" l10n="E">
-<image id="img_id3156188" src="res/commandimagelist/sc_connectorlinearrowstart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156188" xml-lang="en-US">Icon</alt>
+<image id="img_id3156188" src="res/commandimagelist/sc_connectorlinearrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3156188" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148932" xml-lang="en-US" l10n="U" oldref="56">Straight Connector Starts with Arrow </paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINE_ARROW_END" id="bm_id6335155" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINE_ARROW_END" id="bm_id6335155" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorLineArrowEnd" id="bm_id3147332" localize="false"/>
<paragraph role="heading" id="hd_id3147321" xml-lang="en-US" level="2" l10n="U" oldref="57">Straight Connector Ends with Arrow</paragraph>
-<paragraph role="paragraph" id="par_id3155135" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid=".uno:ConnectorLineArrowEnd">Draws a straight line connector with an arrow at the endpoint. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155135" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid=".uno:ConnectorLineArrowEnd">Draws a straight line connector with an arrow at the endpoint. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3153516">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147072" xml-lang="en-US" l10n="E">
-<image id="img_id3147082" src="res/commandimagelist/sc_connectorlinearrowend.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147082" xml-lang="en-US">Icon</alt>
+<image id="img_id3147082" src="res/commandimagelist/sc_connectorlinearrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3147082" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154520" xml-lang="en-US" l10n="U" oldref="59">Straight Connector Ends with Arrow</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINE_ARROWS" id="bm_id5984332" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINE_ARROWS" id="bm_id5984332" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorLineArrows" id="bm_id3154390" localize="false"/>
<paragraph role="heading" id="hd_id3154379" xml-lang="en-US" level="2" l10n="U" oldref="60">Straight Connector with Arrows</paragraph>
-<paragraph role="paragraph" id="par_id3148650" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid=".uno:ConnectorLineArrows">Draws a straight line connector with arrows at both ends. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3148650" xml-lang="en-US" l10n="U" oldref="61"><ahelp hid=".uno:ConnectorLineArrows">Draws a straight line connector with arrows at both ends. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3153354">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151027" xml-lang="en-US" l10n="E">
-<image id="img_id3151037" src="res/commandimagelist/sc_connectorlinearrows.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151037" xml-lang="en-US">Icon</alt>
+<image id="img_id3151037" src="res/commandimagelist/sc_connectorlinearrows.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151037" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149172" xml-lang="en-US" l10n="U" oldref="62">Straight Connector with Arrows</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINE_CIRCLE_START" id="bm_id3534264" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINE_CIRCLE_START" id="bm_id3534264" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorLineCircleStart" id="bm_id3151290" localize="false"/>
<paragraph role="heading" id="hd_id3150581" xml-lang="en-US" level="2" l10n="U" oldref="63">Straight Connector Starts with Circle</paragraph>
-<paragraph role="paragraph" id="par_id3151297" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid=".uno:ConnectorLineCircleStar">Draws a straight line connector with a circle at the starting point. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151297" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid=".uno:ConnectorLineCircleStar">Draws a straight line connector with a circle at the starting point. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3154923">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156370" xml-lang="en-US" l10n="E">
-<image id="img_id3156380" src="res/commandimagelist/sc_connectorlinecirclestart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156380" xml-lang="en-US">Icon</alt>
+<image id="img_id3156380" src="res/commandimagelist/sc_connectorlinecirclestart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3156380" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145780" xml-lang="en-US" l10n="U" oldref="65">Straight Connector Starts with Circle</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINE_CIRCLE_END" id="bm_id9058483" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINE_CIRCLE_END" id="bm_id9058483" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorLineCircleEnd" id="bm_id3155118" localize="false"/>
<paragraph role="heading" id="hd_id3148758" xml-lang="en-US" level="2" l10n="U" oldref="66">Straight Connector Ends with Circle</paragraph>
-<paragraph role="paragraph" id="par_id3155124" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid=".uno:ConnectorLineCircleEnd">Draws a straight line connector with a circle at the endpoint. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155124" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid=".uno:ConnectorLineCircleEnd">Draws a straight line connector with a circle at the endpoint. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3154068">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155912" xml-lang="en-US" l10n="E">
-<image id="img_id3155922" src="res/commandimagelist/sc_connectorlinecircleend.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155922" xml-lang="en-US">Icon</alt>
+<image id="img_id3155922" src="res/commandimagelist/sc_connectorlinecircleend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3155922" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153201" xml-lang="en-US" l10n="U" oldref="68">Straight Connector Ends with Circle</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINE_CIRCLES" id="bm_id4648702" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_LINE_CIRCLES" id="bm_id4648702" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorLineCircles" id="bm_id3149534" localize="false"/>
<paragraph role="heading" id="hd_id3148881" xml-lang="en-US" level="2" l10n="U" oldref="69">Straight Connector with Circles</paragraph>
-<paragraph role="paragraph" id="par_id3149540" xml-lang="en-US" l10n="U" oldref="70"><ahelp hid=".uno:ConnectorLineCircles">Draws a straight line connector with circles at both ends. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149540" xml-lang="en-US" l10n="U" oldref="70"><ahelp hid=".uno:ConnectorLineCircles">Draws a straight line connector with circles at both ends. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3155865">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150112" xml-lang="en-US" l10n="E">
-<image id="img_id3150122" src="res/commandimagelist/sc_connectorlinecircles.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150122" xml-lang="en-US">Icon</alt>
+<image id="img_id3150122" src="res/commandimagelist/sc_connectorlinecircles.png" width="0.566cm" height="0.566cm"><alt id="alt_id3150122" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3158387" xml-lang="en-US" l10n="U" oldref="71">Straight Connector with Circles</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CURVE" id="bm_id8076453" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CURVE" id="bm_id8076453" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorCurve" id="bm_id3153692" localize="false"/>
<paragraph role="heading" id="hd_id3147475" xml-lang="en-US" level="2" l10n="U" oldref="72">Curved Connector</paragraph>
-<paragraph role="paragraph" id="par_id3153698" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid=".uno:ConnectorCurve">Draws a curved line connector. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153698" xml-lang="en-US" l10n="U" oldref="73"><ahelp hid=".uno:ConnectorCurve">Draws a curved line connector. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3159165">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146139" xml-lang="en-US" l10n="E">
-<image id="img_id3146149" src="res/commandimagelist/sc_connectorcurve.png" width="0.222inch" height="0.222inch"><alt id="alt_id3146149" xml-lang="en-US">Icon</alt>
+<image id="img_id3146149" src="res/commandimagelist/sc_connectorcurve.png" width="0.566cm" height="0.566cm"><alt id="alt_id3146149" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145259" xml-lang="en-US" l10n="U" oldref="74">Curved Connector</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CURVE_ARROW_START" id="bm_id3147481" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CURVE_ARROW_START" id="bm_id3147481" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorCurveArrowStart" id="bm_id3149562" localize="false"/>
<paragraph role="heading" id="hd_id3149551" xml-lang="en-US" level="2" l10n="U" oldref="75">Curved Connector Starts with Arrow</paragraph>
-<paragraph role="paragraph" id="par_id3149568" xml-lang="en-US" l10n="U" oldref="76"><ahelp hid=".uno:ConnectorCurveArrowStart">Draws a curved line connector with an arrow at the starting point. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149568" xml-lang="en-US" l10n="U" oldref="76"><ahelp hid=".uno:ConnectorCurveArrowStart">Draws a curved line connector with an arrow at the starting point. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3145119">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146914" xml-lang="en-US" l10n="E">
-<image id="img_id3154807" src="res/commandimagelist/sc_connectorcurvearrowstart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154807" xml-lang="en-US">Icon</alt>
+<image id="img_id3154807" src="res/commandimagelist/sc_connectorcurvearrowstart.png" width="0.566cm" height="0.566cm"><alt id="alt_id3154807" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153265" xml-lang="en-US" l10n="U" oldref="77">Curved Connector Starts with Arrow</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CURVE_ARROW_END" id="bm_id4116114" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CURVE_ARROW_END" id="bm_id4116114" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorCurveArrowEnd" id="bm_id3145073" localize="false"/>
<paragraph role="heading" id="hd_id3147552" xml-lang="en-US" level="2" l10n="U" oldref="78">Curved Connector Ends with Arrow</paragraph>
-<paragraph role="paragraph" id="par_id3145079" xml-lang="en-US" l10n="U" oldref="79"><ahelp hid=".uno:ConnectorCurveArrowEnd">Draws a curved line connector with an arrow at the endpoint. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145079" xml-lang="en-US" l10n="U" oldref="79"><ahelp hid=".uno:ConnectorCurveArrowEnd">Draws a curved line connector with an arrow at the endpoint. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3155833">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145215" xml-lang="en-US" l10n="E">
-<image id="img_id3145225" src="res/commandimagelist/sc_connectorcurvearrowend.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145225" xml-lang="en-US">Icon</alt>
+<image id="img_id3145225" src="res/commandimagelist/sc_connectorcurvearrowend.png" width="0.566cm" height="0.566cm"><alt id="alt_id3145225" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153087" xml-lang="en-US" l10n="U" oldref="80">Curved Connector Ends with Arrow</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CURVE_ARROWS" id="bm_id5275722" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CURVE_ARROWS" id="bm_id5275722" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorCurveArrows" id="bm_id3154948" localize="false"/>
<paragraph role="heading" id="hd_id3153103" xml-lang="en-US" level="2" l10n="U" oldref="81">Curved Connector with Arrows</paragraph>
-<paragraph role="paragraph" id="par_id3154954" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid=".uno:ConnectorCurveArrows">Draws a curved line connector with arrows at both ends. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154954" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid=".uno:ConnectorCurveArrows">Draws a curved line connector with arrows at both ends. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3147422">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148438" xml-lang="en-US" l10n="E">
-<image id="img_id3148448" src="res/commandimagelist/sc_connectorcurvearrows.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148448" xml-lang="en-US">Icon</alt>
+<image id="img_id3148448" src="res/commandimagelist/sc_connectorcurvearrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3148448" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145304" xml-lang="en-US" l10n="U" oldref="83">Curved Connector with Arrows</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CURVE_CIRCLE_START" id="bm_id3001520" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CURVE_CIRCLE_START" id="bm_id3001520" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorCurveCircleStart" id="bm_id3153794" localize="false"/>
<paragraph role="heading" id="hd_id3145320" xml-lang="en-US" level="2" l10n="U" oldref="84">Curved Connector Starts with Circle</paragraph>
-<paragraph role="paragraph" id="par_id3153800" xml-lang="en-US" l10n="U" oldref="85"><ahelp hid=".uno:ConnectorCurveCircleStart">Draws a curved line connector with a circle at the starting point. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153800" xml-lang="en-US" l10n="U" oldref="85"><ahelp hid=".uno:ConnectorCurveCircleStart">Draws a curved line connector with a circle at the starting point. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3150952">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153291" xml-lang="en-US" l10n="E">
-<image id="img_id3153301" src="res/commandimagelist/sc_connectorcurvecirclestart.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153301" xml-lang="en-US">Icon</alt>
+<image id="img_id3153301" src="res/commandimagelist/sc_connectorcurvecirclestart.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153301" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154596" xml-lang="en-US" l10n="U" oldref="86">Curved Connector Starts with Circle</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CURVE_CIRCLE_END" id="bm_id8884002" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CURVE_CIRCLE_END" id="bm_id8884002" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorCurveCircleEnd" id="bm_id3153970" localize="false"/>
<paragraph role="heading" id="hd_id3154311" xml-lang="en-US" level="2" l10n="U" oldref="87">Curved Connector Ends with Circle</paragraph>
-<paragraph role="paragraph" id="par_id3153977" xml-lang="en-US" l10n="U" oldref="88"><ahelp hid=".uno:ConnectorCurveCircleEnd">Draws a curved line connector with a circle at the endpoint. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153977" xml-lang="en-US" l10n="U" oldref="88"><ahelp hid=".uno:ConnectorCurveCircleEnd">Draws a curved line connector with a circle at the endpoint. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3157886">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154724" xml-lang="en-US" l10n="E">
-<image id="img_id3156097" src="res/commandimagelist/sc_connectorcurvecircleend.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156097" xml-lang="en-US">Icon</alt>
+<image id="img_id3156097" src="res/commandimagelist/sc_connectorcurvecircleend.png" width="0.423cm" height="0.423cm"><alt id="alt_id3156097" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149322" xml-lang="en-US" l10n="U" oldref="89">Curved Connector Ends with Circle</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CURVE_CIRCLES" id="bm_id168872" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_CONNECTOR_CURVE_CIRCLES" id="bm_id168872" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConnectorCurveCircles" id="bm_id3150461" localize="false"/>
<paragraph role="heading" id="hd_id3150450" xml-lang="en-US" level="2" l10n="U" oldref="90">Curved Connector with Circles</paragraph>
-<paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="91"><ahelp hid=".uno:ConnectorCurveCircles">Draws a curved line connector with circles at both ends. Click a connection point on an object, drag to a connection point on another object, and then release.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156117" xml-lang="en-US" l10n="U" oldref="91"><ahelp hid=".uno:ConnectorCurveCircles">Draws a curved line connector with circles at both ends. Click a gluepoint on an object, drag to a gluepoint on another object, and then release.</ahelp></paragraph>
<table id="tbl_id3150275">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155588" xml-lang="en-US" l10n="E">
-<image id="img_id3155598" src="res/commandimagelist/sc_connectorcurvecircles.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155598" xml-lang="en-US">Icon</alt>
+<image id="img_id3155598" src="res/commandimagelist/sc_connectorcurvecircles.png" width="0.423cm" height="0.423cm"><alt id="alt_id3155598" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149766" xml-lang="en-US" l10n="U" oldref="92">Curved Connector with Circles</paragraph>
</tablecell>
</tablerow>
</table>
+<section id="relatedtopics">
+<embed href="text/simpress/guide/orgchart.xhp#orgchart"/>
+</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/simpress/02/13030000.xhp b/helpcontent2/source/text/simpress/02/13030000.xhp
index cd825585d9..ffa9ed0d7f 100644
--- a/helpcontent2/source/text/simpress/02/13030000.xhp
+++ b/helpcontent2/source/text/simpress/02/13030000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 13030000.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -49,8 +49,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/.uno:AnimationMode" id="bm_id3146121" localize="false"/>
<paragraph role="heading" id="hd_id3149666" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/02/13030000.xhp" name="Allow Effects">Allow Effects</link></paragraph>
-<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:AnimationMode">Plays a preview of an animation effect that is assigned to an object, when you click the object in the slide. To select an object for editing, hold down the <switchinline select="sys"><caseinline select="MAC">Options
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key when you click.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:AnimationMode">Plays a preview of an animation effect that is assigned to an object, when you click the object in the slide. To select an object for editing, hold down the <switchinline select="sys"><caseinline select="MAC">Options</caseinline><defaultinline>Alt</defaultinline></switchinline> key when you click.</ahelp></paragraph>
</section>
<section id="syeffekt">
<table id="tbl_id3154756">
diff --git a/helpcontent2/source/text/simpress/02/13040000.xhp b/helpcontent2/source/text/simpress/02/13040000.xhp
index 8fe4119bcc..5f36d877fb 100644
--- a/helpcontent2/source/text/simpress/02/13040000.xhp
+++ b/helpcontent2/source/text/simpress/02/13040000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 13040000.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -50,8 +50,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_ACTIONMODE" id="bm_id3693928" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:ActionMode" id="bm_id3145297" localize="false"/>
<paragraph role="heading" id="hd_id3148386" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/02/13040000.xhp" name="Allow Interaction">Allow Interaction</link></paragraph>
-<paragraph role="paragraph" id="par_id3150266" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ActionMode">Runs a preview of the interaction that is assigned to an object, when you click the object in the slide. To select an object for editing, hold down the <switchinline select="sys"><caseinline select="MAC">Options
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key when you click.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150266" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ActionMode">Runs a preview of the interaction that is assigned to an object, when you click the object in the slide. To select an object for editing, hold down the <switchinline select="sys"><caseinline select="MAC">Options</caseinline><defaultinline>Alt</defaultinline></switchinline> key when you click.</ahelp></paragraph>
</section>
<section id="syinter">
<table id="tbl_id3155817">
diff --git a/helpcontent2/source/text/simpress/02/makefile.mk b/helpcontent2/source/text/simpress/02/makefile.mk
index 85b9e5fd3b..aeaaa92ef5 100644
--- a/helpcontent2/source/text/simpress/02/makefile.mk
+++ b/helpcontent2/source/text/simpress/02/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.10.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/simpress/04/01020000.xhp b/helpcontent2/source/text/simpress/04/01020000.xhp
index 042cb12aa2..5d9230ca60 100755
--- a/helpcontent2/source/text/simpress/04/01020000.xhp
+++ b/helpcontent2/source/text/simpress/04/01020000.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01020000.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -196,7 +196,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155848" xml-lang="en-US" l10n="CHG" oldref="42"> Alt+Page Down </paragraph>
+<paragraph role="tablecontent" id="hd_id3155848" xml-lang="en-US" l10n="CHG" oldref="42"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Page Down</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3149984" xml-lang="en-US" l10n="CHG" oldref="43">Go to next slide without playing effects.</paragraph>
@@ -220,7 +220,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151172" xml-lang="en-US" l10n="CHG" oldref="46"> Alt+Page Up </paragraph>
+<paragraph role="tablecontent" id="hd_id3151172" xml-lang="en-US" l10n="CHG" oldref="46"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Page Up</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3153906" xml-lang="en-US" l10n="CHG" oldref="47">Go to the previous slide without playing effects.</paragraph>
@@ -332,8 +332,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154127" xml-lang="en-US" l10n="U" oldref="73">Shift+<switchinline select="sys"><caseinline select="MAC">Command+Option
-</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+A</paragraph>
+<paragraph role="tablecontent" id="hd_id3154127" xml-lang="en-US" l10n="U" oldref="73">Shift+<switchinline select="sys"><caseinline select="MAC">Command+Option</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+A</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3151325" xml-lang="en-US" l10n="U" oldref="74">Ungroup selected group.</paragraph>
@@ -452,18 +451,15 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151304" xml-lang="en-US" l10n="U" oldref="100"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> Key</paragraph>
+<paragraph role="tablecontent" id="hd_id3151304" xml-lang="en-US" l10n="U" oldref="100"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> Key</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3156274" xml-lang="en-US" l10n="U" oldref="101">Hold down <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> to draw or resize objects by dragging from the center of the object outward.</paragraph>
+<paragraph role="tablecontent" id="par_id3156274" xml-lang="en-US" l10n="U" oldref="101">Hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> to draw or resize objects by dragging from the center of the object outward.</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3147314" xml-lang="en-US" l10n="U" oldref="102"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key+click</paragraph>
+<paragraph role="tablecontent" id="hd_id3147314" xml-lang="en-US" l10n="U" oldref="102"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key+click</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3155122" xml-lang="en-US" l10n="U" oldref="103">Select the object behind the currently selected object.</paragraph>
@@ -471,8 +467,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149008" xml-lang="en-US" l10n="U" oldref="104"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift+click</paragraph>
+<paragraph role="tablecontent" id="hd_id3149008" xml-lang="en-US" l10n="U" oldref="104"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift+click</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3156368" xml-lang="en-US" l10n="U" oldref="105">Select the object in front of the currently selected object.</paragraph>
diff --git a/helpcontent2/source/text/simpress/04/makefile.mk b/helpcontent2/source/text/simpress/04/makefile.mk
index d96e990287..80f3816836 100644
--- a/helpcontent2/source/text/simpress/04/makefile.mk
+++ b/helpcontent2/source/text/simpress/04/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/simpress/guide/gluepoints.xhp b/helpcontent2/source/text/simpress/guide/gluepoints.xhp
new file mode 100644
index 0000000000..3ac8fba818
--- /dev/null
+++ b/helpcontent2/source/text/simpress/guide/gluepoints.xhp
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: gluepoints.xhp,v $
+ * $Revision: 1.1.2.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+<topic id="textsimpressguidegluepointsxhp" indexer="include">
+<title id="tit" xml-lang="en-US">Using Gluepoints</title>
+<filename>/text/simpress/guide/gluepoints.xhp</filename>
+</topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id0919200803534995"><bookmark_value>glue points;using</bookmark_value>
+</bookmark>
+<paragraph role="heading" id="par_idN1065F" xml-lang="en-US" level="1" l10n="NEW"><variable id="gluepoints"><link href="text/simpress/guide/gluepoints.xhp">Using Gluepoints</link>
+</variable></paragraph>
+<paragraph role="paragraph" id="par_id0919200803040964" xml-lang="en-US" l10n="NEW">In Impress and Draw, you can connect each two shapes with a line called a <link href="text/simpress/02/10100000.xhp">connector</link>. When you draw a connector between shapes, the connector will be attached to a gluepoint on each shape. Each shape has some default gluepoints, and the positions of the default gluepoints depend on the specific shape. You can add your own custom gluepoints to a shape and then attach connectors to the custom gluepoints.</paragraph>
+<paragraph role="heading" id="par_id0919200803041099" xml-lang="en-US" level="2" l10n="NEW">To add and edit gluepoints</paragraph>
+<list type="ordered">
+<listitem>
+<paragraph role="paragraph" id="par_id091920080304108" xml-lang="en-US" l10n="NEW">Do one of the following:</paragraph>
+</listitem>
+</list>
+<list type="ordered">
+<listitem>
+<paragraph role="paragraph" id="par_id0919200803041082" xml-lang="en-US" l10n="NEW">Click the <emph>Glue Point</emph> icon on the Drawing toolbar.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0919200803041186" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Edit - Glue Points</item>.</paragraph>
+</listitem>
+</list>
+<list type="ordered">
+<listitem>
+<paragraph role="paragraph" id="par_id0919200803041160" xml-lang="en-US" l10n="NEW">Click the <emph>Insert Glue Point</emph> icon on the Gluepoints toolbar.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id0919200803041115" xml-lang="en-US" l10n="NEW">Click inside the shape where you want to add the new gluepoint.</paragraph>
+<paragraph role="paragraph" id="par_id0919200803041133" xml-lang="en-US" l10n="NEW">If the shape is filled, you can click anywhere inside the shape. If the shape is unfilled, you can click the border to insert a glue point. Once inserted, you can drag the glue point to another position inside the shape.</paragraph>
+</listitem>
+</list>
+<paragraph role="paragraph" id="par_id0919200803041250" xml-lang="en-US" l10n="NEW">With the four icons next to the <emph>Insert Glue Point</emph> icon, you choose the directions which will be permitted for a connector at this gluepoint. You can choose one or more directions for a particular gluepoint.</paragraph>
+<paragraph role="paragraph" id="par_id0919200803041298" xml-lang="en-US" l10n="NEW">If the <emph>Glue Point Relative</emph> icon is active, the gluepoint moves when you resize the object to keep its position relative to the object borders.</paragraph>
+<paragraph role="paragraph" id="par_id0919200803041223" xml-lang="en-US" l10n="NEW">If the <emph>Glue Point Relative</emph> icon is not active, the icons next to it are no longer grayed out. With these icons you can decide where a gluepoint will be placed when the size of the object is changed.</paragraph>
+<section id="relatedtopics">
+<embed href="text/simpress/guide/orgchart.xhp#orgchart"/>
+</section>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/simpress/guide/keyboard.xhp b/helpcontent2/source/text/simpress/guide/keyboard.xhp
index fb89a1fc5a..48d2b02ef7 100644
--- a/helpcontent2/source/text/simpress/guide/keyboard.xhp
+++ b/helpcontent2/source/text/simpress/guide/keyboard.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: keyboard.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -63,11 +63,11 @@
</paragraph>
<paragraph role="heading" id="hd_id3153035" xml-lang="en-US" level="3" l10n="U" oldref="19">Advance to the next slide without playing object animation effects</paragraph>
<paragraph role="paragraph" id="par_id3155263" xml-lang="en-US" l10n="CHG" oldref="20">
-<item type="keycode">Alt+PageDown</item>
+<item type="keycode"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+PageDown</item>
</paragraph>
<paragraph role="heading" id="hd_id3154558" xml-lang="en-US" level="3" l10n="U" oldref="3">Return to previous slide</paragraph>
<paragraph role="paragraph" id="par_id3145590" xml-lang="en-US" l10n="CHG" oldref="2">
-<item type="keycode">Alt+PageUp</item>
+<item type="keycode"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+PageUp</item>
</paragraph>
<paragraph role="heading" id="hd_id3153003" xml-lang="en-US" level="3" l10n="U" oldref="12">Go to a specific slide</paragraph>
<paragraph role="paragraph" id="par_id3154501" xml-lang="en-US" l10n="U" oldref="13">Type the page number of the slide, and then press <item type="keycode">Enter</item>.</paragraph>
diff --git a/helpcontent2/source/text/simpress/guide/main.xhp b/helpcontent2/source/text/simpress/guide/main.xhp
index 087aaf34a3..a8af807585 100755
--- a/helpcontent2/source/text/simpress/guide/main.xhp
+++ b/helpcontent2/source/text/simpress/guide/main.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: main.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsimpressguidemainxml" indexer="include" status="PUBLISH">
+<topic id="textsimpressguidemainxml" indexer="include">
<title id="tit" xml-lang="en-US">Instructions for Using $[officename] Impress</title>
<filename>/text/simpress/guide/main.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-09-26T14:27:36">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3156386"><bookmark_value>$[officename] Impress instructions</bookmark_value>
@@ -87,6 +83,7 @@
<embed href="text/simpress/guide/change_scale.xhp#change_scale"/>
<embed href="text/simpress/guide/line_draw.xhp#line_draw"/>
<embed href="text/simpress/guide/line_edit.xhp#line_edit"/>
+<embed href="text/simpress/guide/gluepoints.xhp#gluepoints"/>
<embed href="text/simpress/guide/page_copy.xhp#page_copy"/>
<embed href="text/simpress/guide/table_insert.xhp#table_insert"/>
<embed href="text/simpress/guide/text2curve.xhp#text2curve"/>
diff --git a/helpcontent2/source/text/simpress/guide/makefile.mk b/helpcontent2/source/text/simpress/guide/makefile.mk
index df7d1e5617..0cd15d045b 100644
--- a/helpcontent2/source/text/simpress/guide/makefile.mk
+++ b/helpcontent2/source/text/simpress/guide/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.10.4.4 $
#
# This file is part of OpenOffice.org.
#
@@ -57,6 +57,7 @@ XHPFILES = \
background.xhp \
change_scale.xhp \
footer.xhp \
+ gluepoints.xhp \
html_export.xhp \
html_import.xhp \
individual.xhp \
diff --git a/helpcontent2/source/text/simpress/guide/select_object.xhp b/helpcontent2/source/text/simpress/guide/select_object.xhp
index 5c8d2dad5a..d7b45299a0 100755
--- a/helpcontent2/source/text/simpress/guide/select_object.xhp
+++ b/helpcontent2/source/text/simpress/guide/select_object.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: select_object.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -52,9 +52,7 @@
</variable></paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3159238" xml-lang="en-US" l10n="CHG" oldref="9">To select an object that is covered by other objects, hold down <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline> and click through the objects until you reach the underlying object. To cycle through the objects in reverse order, hold down <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift when you click.</paragraph>
+<paragraph role="listitem" id="par_id3159238" xml-lang="en-US" l10n="CHG" oldref="9">To select an object that is covered by other objects, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and click through the objects until you reach the underlying object. To cycle through the objects in reverse order, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift when you click.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150213" xml-lang="en-US" l10n="U" oldref="10">To select an object that is covered by another object using the keyboard, press Tab to cycle through the objects on the slide. To cycle through the objects in reverse order, press Shift+Tab.</paragraph>
diff --git a/helpcontent2/source/text/simpress/guide/table_insert.xhp b/helpcontent2/source/text/simpress/guide/table_insert.xhp
index 38b55c517a..dd6f1140ed 100644
--- a/helpcontent2/source/text/simpress/guide/table_insert.xhp
+++ b/helpcontent2/source/text/simpress/guide/table_insert.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: table_insert.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsimpressguidetable_insertxml" indexer="include" status="PUBLISH">
+<topic id="textsimpressguidetable_insertxml" indexer="include">
<title id="tit" xml-lang="en-US">Including Spreadsheets in Slides</title>
<filename>/text/simpress/guide/table_insert.xhp</filename>
</topic>
@@ -50,16 +48,52 @@
<paragraph role="heading" id="hd_id3154022" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="table_insert"><link href="text/simpress/guide/table_insert.xhp" name="Including Spreadsheets in Slides">Including Spreadsheets in Slides</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id4231086" xml-lang="en-US" l10n="NEW">You can apply different methods to insert spreadsheet cells into your Impress slides or Draw pages:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_id9209875" xml-lang="en-US" l10n="NEW">Insert a native table - you enter the data into the cells and apply fancy formatting using the Table Design section on the Tasks pane</paragraph>
+<paragraph role="paragraph" id="par_id9209875" xml-lang="en-US" l10n="NEW">Insert a native table - you enter the data into the cells and apply fancy formatting using the Table Design section on the Tasks pane.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3044526" xml-lang="en-US" l10n="NEW">Insert a new table as an OLE object or insert an existing file as an OLE object - you can specify the link to a file to be a live link to the latest data saved in a spreadsheet file</paragraph>
+<paragraph role="paragraph" id="par_id3044526" xml-lang="en-US" l10n="NEW">Insert a new table as an OLE object or insert an existing file as an OLE object - you can specify the link to a file to be a live link to the latest data saved in a spreadsheet file.</paragraph>
</listitem>
</list><comment>Insert table dialog - Number of columns</comment>
-<bookmark xml-lang="en-US" branch="hid/1238308866" id="bm_id2396008" localize="false"/><paragraph role="paragraph" id="par_id137333" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the number of columns for the new table.</ahelp></paragraph><comment>Insert table dialog - Number of rows</comment>
-<bookmark xml-lang="en-US" branch="hid/1238308868" id="bm_id7334818" localize="false"/><paragraph role="paragraph" id="par_id8626667" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the number of rows for the new table.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_SVX_NEWTABLE_DLG_NF_COLUMNS" id="bm_id0916200804233391" localize="false"/>
+<paragraph role="paragraph" id="par_id137333" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the number of columns for the new table.</ahelp></paragraph><comment>Insert table dialog - Number of rows</comment>
+<bookmark xml-lang="en-US" branch="hid/svx_NumericField_RID_SVX_NEWTABLE_DLG_NF_ROWS" id="bm_id0916200804240464" localize="false"/>
+<paragraph role="paragraph" id="par_id8626667" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the number of rows for the new table.</ahelp></paragraph><comment>Contextmenu of a table in Impress and Draw</comment><comment>Cell</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:CellMenu" id="bm_id0916200803192795" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200803551581" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Define the vertical alignment of selected or all cell contents. Split or merge cells.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TABLE_MERGE_CELLS" id="bm_id0916200803370158" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200803551553" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">All selected cells are merged into one cell.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TABLE_SPLIT_CELLS" id="bm_id0916200803375165" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200803551535" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The selected cell is split into several cells. You see the Split Cells dialog box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TABLE_VERT_NONE" id="bm_id0916200803224438" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200803551651" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The cell contents are align at the top of the cells.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TABLE_VERT_CENTER" id="bm_id091620080323379" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200803551697" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The cell contents are aligned vertically centered in the cells.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TABLE_VERT_BOTTOM" id="bm_id0916200803242358" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200803551632" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The cell contents are aligned at the bottom of the cells.</ahelp></paragraph><comment>Row</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:RowMenu" id="bm_id0916200803255185" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200803551734" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Choose commands for the selected or all rows.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TABLE_DISTRIBUTE_ROWS" id="bm_id0916200803565265" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200804080035" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Distributes the height of the selected or all rows to the same size. The height of the table is not changed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TABLE_SELECT_ROW" id="bm_id0916200804004173" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200804080063" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">If currently no cell is selected, all rows will be selected. If currently cells are selected, all rows containing the selected cells will be selected.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TABLE_INSERT_ROW" id="bm_id0916200804032566" localize="false"/>
+<paragraph role="paragraph" id="par_id091620080408008" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">If currently no cell is selected, a new row will be inserted at the bottom of the table. If currently cells are selected, as many new rows as the selection has will be inserted below the selection.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TABLE_DELETE_ROW" id="bm_id0916200804073670" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200804080050" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">All rows of the current selection will be deleted.</ahelp></paragraph><comment>Column</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:ColumnMenu" id="bm_id0916200804101754" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200804163012" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Choose commands for the selected or all columns.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TABLE_DISTRIBUTE_COLUMNS" id="bm_id0916200804110358" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200804163092" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Distributes the width of the selected or all columns to the same size. The width of the table is not changed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TABLE_SELECT_COL" id="bm_id0916200804114925" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200804163046" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">If currently no cell is selected, all columns will be selected. If currently cells are selected, all columns containing the selected cells will be selected.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TABLE_INSERT_COL" id="bm_id0916200804122650" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200804163128" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">If currently no cell is selected, a new column will be inserted at the right border of the table. If currently cells are selected, as many new columns as the selection has will be inserted right of the selection.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_TABLE_DELETE_COL" id="bm_id091620080413440" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200804163127" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">All columns of the current selection will be deleted.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:AlignObjetMenu" id="bm_id0916200804143882" localize="false"/><comment>sic</comment>
+<paragraph role="paragraph" id="par_id0916200804163151" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Align the table within the page or slide.</ahelp></paragraph>
<paragraph role="heading" id="hd_id8594317" xml-lang="en-US" level="2" l10n="NEW">Inserting a native table</paragraph>
<list type="ordered">
<listitem>
@@ -72,10 +106,15 @@
<paragraph role="paragraph" id="par_id2748496" xml-lang="en-US" l10n="NEW">Double-click the table and enter or paste the data into the cells. </paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id8270210" xml-lang="en-US" l10n="NEW">Right-click a cell to open the context menu and choose additional commands regarding the cell's contents.</paragraph>
+<paragraph role="paragraph" id="par_id8270210" xml-lang="en-US" l10n="NEW">Select some cell contents and right-click to open the context menu. Choose commands to change the cell's contents, like font size and line spacing.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id6820276" xml-lang="en-US" l10n="NEW">Right-click the table border to open the table's context menu. Use the table's context menu to enter a name and description for the table, or to distribute the rows or columns equally, among other commands.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id6820276" xml-lang="en-US" l10n="NEW">Right-double-click the table border to open the table's context menu. Use the context menu to insert or delete rows and columns, among other commands.</paragraph>
+<paragraph role="paragraph" id="par_id0916200803551725" xml-lang="en-US" l10n="NEW">Select some cells and right-click to open a context menu, where you can insert or delete rows and columns, among other commands. </paragraph>
+<paragraph role="paragraph" id="par_id091620080355171" xml-lang="en-US" l10n="NEW">To select a rectangular area of cells, point to a cell in one corner of the rectangle, hold down the mouse button, and drag the mouse to the opposite corner of the rectangle, then release the mouse button. </paragraph>
+<paragraph role="paragraph" id="par_id0916200803551880" xml-lang="en-US" l10n="NEW">To select one cell, point to that cell, hold down the mouse button, and drag the mouse to the next cell and back, then release the mouse button.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3151075" xml-lang="en-US" level="2" l10n="CHG" oldref="2">Inserting a new spreadsheet as an OLE object</paragraph>
diff --git a/helpcontent2/source/text/simpress/main0103.xhp b/helpcontent2/source/text/simpress/main0103.xhp
index d73eb5a11c..dccda2938f 100755
--- a/helpcontent2/source/text/simpress/main0103.xhp
+++ b/helpcontent2/source/text/simpress/main0103.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: main0103.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -56,7 +56,7 @@
<embed href="text/simpress/01/03150000.xhp#hintergrund"/>
<embed href="text/simpress/01/03180000.xhp#anzeigequali"/>
<embed href="text/simpress/01/taskpanel.xhp#taskpanel"/>
-<embed href="text/simpress/01/slidesorter.xhp#slidesorter"/><comment>UFI: removed masterlayouts link</comment><embed href="text/shared/01/03990000.xhp#symbolleisten"/>
+<embed href="text/simpress/01/slidesorter.xhp#slidesorter"/><comment>UFI: removed masterlayouts link</comment>
<embed href="text/shared/01/03060000.xhp#taskleiste"/>
<embed href="text/shared/01/03040000.xhp#ime"/>
<embed href="text/simpress/01/03060000.xhp#lineale"/>
diff --git a/helpcontent2/source/text/simpress/main0210.xhp b/helpcontent2/source/text/simpress/main0210.xhp
index c9fab0abd9..ca35e20a8b 100755
--- a/helpcontent2/source/text/simpress/main0210.xhp
+++ b/helpcontent2/source/text/simpress/main0210.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: main0210.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -52,10 +52,7 @@
<paragraph role="heading" id="hd_id3155962" xml-lang="en-US" level="3" l10n="U" oldref="3">Select</paragraph>
<paragraph role="paragraph" id="par_id3148488" xml-lang="en-US" l10n="CHG" oldref="4">To select an object on the current slide, click the <emph>Select</emph> tool (white arrow) on the Drawing bar, and then click the object.</paragraph>
<paragraph role="paragraph" id="par_id3148610" xml-lang="en-US" l10n="U" oldref="5">To select more than one object, hold down Shift while you click.</paragraph>
-<paragraph role="paragraph" id="par_id3148699" xml-lang="en-US" l10n="U" oldref="6">To select an object that is behind another object, hold <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then click the object. To select the next underlying object in the stacking, hold <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then click again. To return the selection to the previously selected object, hold down Shift + <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then click.</paragraph>
+<paragraph role="paragraph" id="par_id3148699" xml-lang="en-US" l10n="U" oldref="6">To select an object that is behind another object, hold <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then click the object. To select the next underlying object in the stacking, hold <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then click again. To return the selection to the previously selected object, hold down Shift + <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then click.</paragraph>
<paragraph role="paragraph" id="par_id3154651" xml-lang="en-US" l10n="U" oldref="7">To add text to a selected object, double-click the object and type or enter your text.</paragraph>
<paragraph role="paragraph" id="par_id3153812" xml-lang="en-US" l10n="U" oldref="12">To remove a selection, click anywhere outside the selected object, or press Escape.</paragraph>
</section>
@@ -74,7 +71,6 @@
<embed href="text/simpress/02/10080000.xhp#kurve"/>
<embed href="text/simpress/00/00000004.xhp#sykurve"/>
<embed href="text/simpress/02/10100000.xhp#verbinder"/>
-<embed href="text/simpress/02/10100000.xhp#syverbinder"/>
<embed href="text/simpress/02/10090000.xhp#objekte"/>
<embed href="text/simpress/02/10090000.xhp#syobjekte"/>
<embed href="text/shared/02/basicshapes.xhp#basicshapes"/>
diff --git a/helpcontent2/source/text/simpress/makefile.mk b/helpcontent2/source/text/simpress/makefile.mk
index abad1ae946..aa079f444a 100644
--- a/helpcontent2/source/text/simpress/makefile.mk
+++ b/helpcontent2/source/text/simpress/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/smath/00/makefile.mk b/helpcontent2/source/text/smath/00/makefile.mk
index 6a159c7bfd..9e3797e301 100644
--- a/helpcontent2/source/text/smath/00/makefile.mk
+++ b/helpcontent2/source/text/smath/00/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/smath/01/06010000.xhp b/helpcontent2/source/text/smath/01/06010000.xhp
index 3bdde8982d..ed0f9df679 100755
--- a/helpcontent2/source/text/smath/01/06010000.xhp
+++ b/helpcontent2/source/text/smath/01/06010000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 06010000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsmath0106010000xml" indexer="include" status="PUBLISH">
+<topic id="textsmath0106010000xml" indexer="include">
<title id="tit" xml-lang="en-US">Catalog</title>
<filename>/text/smath/01/06010000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-11T14:08:22">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="symbol">
@@ -59,7 +57,7 @@
</variable></paragraph>
</section>
<section id="howtoget">
- <embed href="text/smath/00/00000004.xhp#etssbl"/>
+<embed href="text/smath/00/00000004.xhp#etssbl"/>
</section>
<bookmark xml-lang="en-US" branch="hid/STARMATH_LISTBOX_RID_SYMBOLDIALOG_1" id="bm_id3145388" localize="false"/>
<paragraph role="heading" id="hd_id3150202" xml-lang="en-US" level="2" l10n="U" oldref="4">Symbol Set</paragraph>
@@ -69,6 +67,6 @@
<bookmark xml-lang="en-US" branch="hid/STARMATH_PUSHBUTTON_RID_SYMBOLDIALOG_1" id="bm_id3146964" localize="false"/>
<paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="2" l10n="U" oldref="8">Edit</paragraph>
<paragraph role="paragraph" id="par_id3153811" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="STARMATH_PUSHBUTTON_RID_SYMBOLDIALOG_1">Click here to open the <link href="text/smath/01/06010100.xhp" name="Edit Symbols">Edit Symbols</link> dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_PUSHBUTTON_RID_SYMBOLDIALOG_2" id="bm_id3149053" localize="false"/><embed href="text/shared/00/00000001.xhp#uebernehmen"/>
+<embed href="text/shared/00/00000001.xhp#uebernehmen"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/smath/01/makefile.mk b/helpcontent2/source/text/smath/01/makefile.mk
index 25eda987fd..0b48a36f61 100644
--- a/helpcontent2/source/text/smath/01/makefile.mk
+++ b/helpcontent2/source/text/smath/01/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.9.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/smath/02/makefile.mk b/helpcontent2/source/text/smath/02/makefile.mk
index f2e8453ff1..877cfbf794 100644
--- a/helpcontent2/source/text/smath/02/makefile.mk
+++ b/helpcontent2/source/text/smath/02/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/smath/04/makefile.mk b/helpcontent2/source/text/smath/04/makefile.mk
index 06a89d4593..ed8b1dd086 100644
--- a/helpcontent2/source/text/smath/04/makefile.mk
+++ b/helpcontent2/source/text/smath/04/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/smath/guide/makefile.mk b/helpcontent2/source/text/smath/guide/makefile.mk
index ee1ac1f17d..681acddea4 100644
--- a/helpcontent2/source/text/smath/guide/makefile.mk
+++ b/helpcontent2/source/text/smath/guide/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.10.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/smath/main0103.xhp b/helpcontent2/source/text/smath/main0103.xhp
index 28bff77528..37fb0e4988 100755
--- a/helpcontent2/source/text/smath/main0103.xhp
+++ b/helpcontent2/source/text/smath/main0103.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: main0103.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,7 +54,6 @@
<embed href="text/smath/01/03060000.xhp#allesanzeigen"/>
<embed href="text/smath/01/03070000.xhp#aktualisieren"/>
<embed href="text/smath/01/03080000.xhp#neuzeichnen"/>
-<embed href="text/shared/01/03990000.xhp#symbolleisten"/>
<embed href="text/smath/01/03090000.xhp#auswahl"/>
<embed href="text/shared/01/03060000.xhp#taskleiste"/>
<embed href="text/shared/01/03040000.xhp#ime"/>
diff --git a/helpcontent2/source/text/smath/makefile.mk b/helpcontent2/source/text/smath/makefile.mk
index 5d0d892d4d..4b12d5f87d 100644
--- a/helpcontent2/source/text/smath/makefile.mk
+++ b/helpcontent2/source/text/smath/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/swriter/00/00000405.xhp b/helpcontent2/source/text/swriter/00/00000405.xhp
index 8045441b7c..ae349c9ef0 100644
--- a/helpcontent2/source/text/swriter/00/00000405.xhp
+++ b/helpcontent2/source/text/swriter/00/00000405.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 00000405.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,19 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0000000405xml" indexer="exclude" status="PUBLISH">
+<topic id="textswriter0000000405xml" indexer="exclude">
<title id="tit" xml-lang="en-US">Format Menu</title>
<filename>/text/swriter/00/00000405.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-04-11T16:32:44">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="hd_id3150758" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Menu</paragraph>
@@ -118,12 +115,12 @@
<section id="syeigenschaften">
<table id="tbl_id3155964">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150557" xml-lang="en-US" l10n="E">
-<image id="img_id3149214" src="res/commandimagelist/sc_framedialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149214" xml-lang="en-US">Icon</alt>
+<image id="img_id3149214" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149214" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147740" xml-lang="en-US" l10n="U" oldref="50">Graphics Properties</paragraph>
</tablecell>
</tablerow>
@@ -183,46 +180,6 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3148823" xml-lang="en-US" l10n="CHG" oldref="78"><variable id="zelle">Right-click in a table, choose <emph>Cell</emph>
</variable></paragraph>
-<section id="verbindenze">
-<paragraph role="paragraph" id="par_id3154351" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>Table - Merge Cells</emph>
-</paragraph>
-<paragraph role="paragraph" id="par_id3154370" xml-lang="en-US" l10n="U" oldref="80">On the <emph>Table</emph> Bar, click</paragraph>
-<section id="syzellenverbinden">
-<table id="tbl_id3154636">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153996" xml-lang="en-US" l10n="E">
-<image id="img_id3154002" src="res/commandimagelist/sc_mergecells.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154002" xml-lang="en-US">Icon</alt>
- </image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150662" xml-lang="en-US" l10n="U" oldref="81">Merge Cells</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</section>
-</section>
-<section id="teilenz">
-<paragraph role="paragraph" id="par_id3154024" xml-lang="en-US" l10n="U" oldref="82">Choose <emph>Table - Split Cells</emph>
-</paragraph>
-<paragraph role="paragraph" id="par_id3154042" xml-lang="en-US" l10n="U" oldref="83">On the <emph>Table</emph> Bar, click</paragraph>
-<section id="syzellenteilen">
-<table id="tbl_id3149972">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147270" xml-lang="en-US" l10n="E">
-<image id="img_id3147275" src="res/commandimagelist/sc_splitcell.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147275" xml-lang="en-US">Icon</alt>
- </image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150616" xml-lang="en-US" l10n="U" oldref="84">Split Cells</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</section>
-</section>
<paragraph role="paragraph" id="par_id3149617" xml-lang="en-US" l10n="U" oldref="85"><variable id="schtzenze">In the context menu of a cell, choose <emph>Cell - Protect</emph>
</variable></paragraph>
<section id="schutzaufhz">
@@ -230,12 +187,6 @@
</paragraph>
<paragraph role="paragraph" id="par_id3145656" xml-lang="en-US" l10n="U" oldref="145">Open context menu in Navigator for tables</paragraph>
</section>
-<paragraph role="paragraph" id="par_id3145671" xml-lang="en-US" l10n="U" oldref="120"><variable id="zelleoben">In the context menu of a cell, choose <emph>Cell - Top</emph>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149525" xml-lang="en-US" l10n="U" oldref="121"><variable id="zellemitte">In the context menu of a cell, choose <emph>Cell - Center</emph>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149201" xml-lang="en-US" l10n="U" oldref="122"><variable id="zelleunten">In the context menu of a cell, choose <emph>Cell - Bottom</emph>
-</variable></paragraph>
<paragraph role="paragraph" id="par_id3148716" xml-lang="en-US" l10n="U" oldref="87"><variable id="zeile">In the context menu of a cell, choose <emph>Row</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3155345" xml-lang="en-US" l10n="U" oldref="88"><variable id="hoehez">In the context menu of a cell, choose <emph>Row - Height</emph>
@@ -247,12 +198,12 @@
<section id="syoptimalzeile">
<table id="tbl_id3150845">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145222" xml-lang="en-US" l10n="E">
-<image id="img_id3145228" src="res/commandimagelist/sc_setoptimalrowheight.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145228" xml-lang="en-US">Icon</alt>
+<image id="img_id3145228" src="res/commandimagelist/sc_setoptimalrowheight.png" width="0.423cm" height="0.423cm"><alt id="alt_id3145228" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153545" xml-lang="en-US" l10n="U" oldref="91">Optimal Row Height</paragraph>
</tablecell>
</tablerow>
@@ -260,26 +211,6 @@
</section>
</section>
-<section id="verteilenzeile">
-<paragraph role="paragraph" id="par_id3153569" xml-lang="en-US" l10n="U" oldref="92">Choose <emph>Table - Autofit - Distribute Rows Equally</emph>
-</paragraph>
-<paragraph role="paragraph" id="par_id3153755" xml-lang="en-US" l10n="U" oldref="93">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
-<section id="syverteilenzeile">
-<table id="tbl_id3154064">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145297" xml-lang="en-US" l10n="E">
-<image id="img_id3155994" src="res/commandimagelist/sc_distributerows.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155994" xml-lang="en-US">Icon</alt>
- </image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153206" xml-lang="en-US" l10n="U" oldref="94">Distribute Rows Equally</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</section>
-</section>
<paragraph role="paragraph" id="par_id3145095" xml-lang="en-US" l10n="U" oldref="95"><variable id="selektierenz">Choose <emph>Table - Select - Row</emph>
</variable></paragraph>
<section id="loschenz">
@@ -289,12 +220,12 @@
<section id="syzeileloeschen">
<table id="tbl_id3146892">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147555" xml-lang="en-US" l10n="E">
-<image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150361" xml-lang="en-US">Icon</alt>
+<image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150361" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156248" xml-lang="en-US" l10n="U" oldref="101">Delete Row</paragraph>
</tablecell>
</tablerow>
@@ -304,7 +235,8 @@
</section>
<paragraph role="paragraph" id="par_id3149383" xml-lang="en-US" l10n="U" oldref="102"><variable id="spalte">In the context menu of a cell, choose <emph>Column</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149406" xml-lang="en-US" l10n="U" oldref="103"><variable id="breites">In the context menu of a cell, choose <emph>Column - Width</emph>
+<paragraph role="paragraph" id="par_id3149406" xml-lang="en-US" l10n="U" oldref="103"><variable id="breites">In the context menu of a cell, choose <emph>Column </emph>
+<emph>- Width</emph>
</variable></paragraph>
<section id="optibrs">
<paragraph role="paragraph" id="par_id3154752" xml-lang="en-US" l10n="U" oldref="104">Choose <emph>Table - Autofit - Optimal Column Width</emph>
@@ -313,12 +245,12 @@
<section id="syoptimalspalte">
<table id="tbl_id3156030">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3157881" xml-lang="en-US" l10n="E">
-<image id="img_id3157888" src="res/commandimagelist/sc_setoptimalcolumnwidthdirect.png" width="0.222inch" height="0.222inch"><alt id="alt_id3157888" xml-lang="en-US">Icon</alt>
+<image id="img_id3157888" src="res/commandimagelist/sc_setoptimalcolumnwidthdirect.png" width="0.423cm" height="0.423cm"><alt id="alt_id3157888" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150524" xml-lang="en-US" l10n="U" oldref="106">Optimal Column Width</paragraph>
</tablecell>
</tablerow>
@@ -326,26 +258,6 @@
</section>
</section>
-<section id="verteilenspalte">
-<paragraph role="paragraph" id="par_id3159219" xml-lang="en-US" l10n="U" oldref="107">Choose <emph>Table - Autofit - Distribute Columns Equally</emph>
-</paragraph>
-<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="108">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
-<section id="syverteilentext">
-<table id="tbl_id3148462">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145179" xml-lang="en-US" l10n="E">
-<image id="img_id3145186" src="res/commandimagelist/sc_distributecolumns.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145186" xml-lang="en-US">Icon</alt>
- </image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151364" xml-lang="en-US" l10n="U" oldref="109">Space Columns Equally</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</section>
-</section>
<paragraph role="paragraph" id="par_id3153172" xml-lang="en-US" l10n="U" oldref="110"><variable id="spaltesel">Choose <emph>Table - Select - Column</emph>
</variable></paragraph>
<section id="einfgens">
@@ -356,22 +268,22 @@
<paragraph role="paragraph" id="par_id3150813" xml-lang="en-US" l10n="U" oldref="112">On <emph>Table</emph> Bar, click</paragraph>
<table id="tbl_id3156198">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150279" xml-lang="en-US" l10n="E">
-<image id="img_id3150286" src="res/commandimagelist/sc_insertcolumns.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150286" xml-lang="en-US">Icon</alt>
+<image id="img_id3150286" src="res/commandimagelist/sc_insertcolumns.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150286" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150872" xml-lang="en-US" l10n="U" oldref="113">Insert Column</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150895" xml-lang="en-US" l10n="E">
-<image id="img_id3150902" src="res/commandimagelist/sc_insertrows.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150902" xml-lang="en-US">Icon</alt>
+<image id="img_id3150902" src="res/commandimagelist/sc_insertrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150902" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="U" oldref="98">Insert Row</paragraph>
</tablecell>
</tablerow>
@@ -385,12 +297,12 @@
<section id="syspalteloeschen">
<table id="tbl_id3150954">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3153600" xml-lang="en-US" l10n="E">
-<image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153607" xml-lang="en-US">Icon</alt>
+<image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153607" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3154423" xml-lang="en-US" l10n="U" oldref="116">Delete Column</paragraph>
</tablecell>
</tablerow>
@@ -404,12 +316,12 @@
<section id="syeigenschaftenobjekt">
<table id="tbl_id3153367">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151276" xml-lang="en-US" l10n="E">
-<image id="img_id3151283" src="res/commandimagelist/sc_framedialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151283" xml-lang="en-US">Icon</alt>
+<image id="img_id3151283" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151283" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145157" xml-lang="en-US" l10n="U" oldref="119">Object Properties</paragraph>
</tablecell>
</tablerow>
@@ -420,12 +332,12 @@
<section id="syeigenschaftenrahmen">
<table id="tbl_id3145600">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3152973" xml-lang="en-US" l10n="E">
-<image id="img_id3152980" src="res/commandimagelist/sc_framedialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152980" xml-lang="en-US">Icon</alt>
+<image id="img_id3152980" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3152980" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3147367" xml-lang="en-US" l10n="U" oldref="158">Frame Properties</paragraph>
</tablecell>
</tablerow>
diff --git a/helpcontent2/source/text/swriter/00/makefile.mk b/helpcontent2/source/text/swriter/00/makefile.mk
index 2088fd0c20..ed5a45b95b 100644
--- a/helpcontent2/source/text/swriter/00/makefile.mk
+++ b/helpcontent2/source/text/swriter/00/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/swriter/01/01160300.xhp b/helpcontent2/source/text/swriter/01/01160300.xhp
index a3480318c9..899a85cc58 100644
--- a/helpcontent2/source/text/swriter/01/01160300.xhp
+++ b/helpcontent2/source/text/swriter/01/01160300.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01160300.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -27,7 +27,7 @@
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ * for a copy of the LGPLv3 License.
*
************************************************************************-->
diff --git a/helpcontent2/source/text/swriter/01/02120000.xhp b/helpcontent2/source/text/swriter/01/02120000.xhp
index 75b923172e..60f744997d 100644
--- a/helpcontent2/source/text/swriter/01/02120000.xhp
+++ b/helpcontent2/source/text/swriter/01/02120000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 02120000.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0102120000xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0102120000xml" indexer="include">
<title id="tit" xml-lang="en-US">AutoText</title>
<filename>/text/swriter/01/02120000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-07-11T09:47:15">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="autotext">
@@ -54,7 +50,7 @@
</section>
<paragraph role="tip" id="par_id3143277" xml-lang="en-US" l10n="CHG" oldref="52">You can also click the arrow next to the <emph>AutoText</emph> icon on the <emph>Insert</emph> bar, and then choose the AutoText that you want to insert.</paragraph>
<section id="howtoget">
- <embed href="text/swriter/00/00000402.xhp#autotext"/>
+<embed href="text/swriter/00/00000402.xhp#autotext"/>
</section>
<embed href="text/swriter/guide/autotext.xhp#autotext"/>
<paragraph role="heading" id="hd_id3148982" xml-lang="en-US" level="2" l10n="U" oldref="4">AutoText</paragraph>
@@ -95,7 +91,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_MD_GLOS_RENAME" id="bm_id3150779" localize="false"/>
<paragraph role="heading" id="hd_id3150768" xml-lang="en-US" level="3" l10n="U" oldref="23">Rename</paragraph>
<paragraph role="paragraph" id="par_id3150786" xml-lang="en-US" l10n="CHG" oldref="24"><ahelp hid="." visibility="hidden">Opens the Rename AutoText dialog, where you can change the name of the selected AutoText entry.</ahelp>Opens the <link href="text/swriter/01/02120100.xhp" name="Rename Text Block">Rename AutoText</link> dialog, where you can change the name of the selected AutoText entry.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_MD_GLOS_DELETE" id="bm_id3148722" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
<bookmark xml-lang="en-US" branch="hid/HID_MD_GLOS_EDIT" id="bm_id3155352" localize="false"/>
<paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="3" l10n="U" oldref="35">Edit</paragraph>
<paragraph role="paragraph" id="par_id3155358" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="HID_MD_GLOS_EDIT">Opens the selected AutoText entry for editing in a separate document. Make the changes that you want, choose <emph>File - Save AutoText</emph>, and then choose <emph>File - Close</emph>.</ahelp></paragraph>
@@ -127,7 +123,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_GLOS_GROUP_TREE" id="bm_id3154131" localize="false"/>
<paragraph role="heading" id="hd_id3154120" xml-lang="en-US" level="3" l10n="U" oldref="81">Selection list</paragraph>
<paragraph role="paragraph" id="par_id3154137" xml-lang="en-US" l10n="U" oldref="58"><ahelp hid="HID_GLOS_GROUP_TREE">Lists the existing AutoText categories and the corresponding paths.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_BIB_BASE_PB_DELETE" id="bm_id6168401" localize="false"/><embed href="text/shared/00/00000001.xhp#loeschen1"/>
+<embed href="text/shared/00/00000001.xhp#loeschen1"/>
<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:DLG_GLOSSARY:PB_PATH" id="bm_id3154845" localize="false"/>
<paragraph role="heading" id="hd_id3145615" xml-lang="en-US" level="2" l10n="U" oldref="56">Path</paragraph>
<paragraph role="paragraph" id="par_id3154852" xml-lang="en-US" l10n="CHG" oldref="57"><ahelp hid="." visibility="hidden">Opens the Edit Paths dialog, where you can select the directory to store AutoText.</ahelp>Opens the <link href="text/shared/optionen/01010301.xhp" name="Edit Paths">Edit Paths</link> dialog, where you can select the directory to store AutoText.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04060000.xhp b/helpcontent2/source/text/swriter/01/04060000.xhp
index 8981a8a35c..980f3fdf1a 100644
--- a/helpcontent2/source/text/swriter/01/04060000.xhp
+++ b/helpcontent2/source/text/swriter/01/04060000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04060000.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -64,16 +64,13 @@
<paragraph role="paragraph" id="par_id3152962" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:LISTBOX:DLG_CAPTION:BOX_FORMAT">Select the type of numbering that you want to use in the caption.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_CAPTION:EDT_TEXT" id="bm_id3155905" localize="false"/>
<paragraph role="heading" id="hd_id3155893" xml-lang="en-US" level="3" l10n="CHG" oldref="9">Caption</paragraph>
-<paragraph role="paragraph" id="par_id3149688" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:DLG_CAPTION:EDT_TEXT">Type the text that you want to appear after the caption number.</ahelp> For example, if you want to label your objects as "Object 1: Text", type a colon (:), a space, and then the text.</paragraph>
+<paragraph role="paragraph" id="par_id3149688" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:DLG_CAPTION:EDT_TEXT">Type the text that you want to appear after the caption number.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw_Edit_DLG_CAPTION_EDT_SEP" id="bm_id7607959" localize="false"/>
<paragraph role="heading" id="par_idN1068A" xml-lang="en-US" level="3" l10n="NEW">Separator</paragraph>
<paragraph role="paragraph" id="par_idN10690" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter optional text characters to appear between the number and the caption text.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_CAPTION_BOX_POS" id="bm_id4664754" localize="false"/><comment>moved help id to here</comment>
<paragraph role="heading" id="hd_id3154199" xml-lang="en-US" level="3" l10n="U" oldref="11">Position</paragraph>
<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:LISTBOX:DLG_CAPTION:BOX_POS">Adds the caption above or below the selected item. This option is only available for some objects.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_CAPTION:ED_OBJECT_NAME" id="bm_id3151258" localize="false"/>
-<paragraph role="heading" id="hd_id3149109" xml-lang="en-US" level="3" l10n="U" oldref="42">Object name</paragraph>
-<paragraph role="paragraph" id="par_id3148969" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SW:EDIT:DLG_CAPTION:ED_OBJECT_NAME">Type a name for the caption object, so that you can use the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link> to quickly jump to the caption in your document.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149043" xml-lang="en-US" level="2" l10n="U" oldref="29"><link href="text/swriter/01/04060100.xhp" name="Options">Options</link></paragraph>
<embed href="text/swriter/01/04060100.xhp#optionentext"/>
<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_CAPTION_BTN_AUTOCAPTION" id="bm_id72939" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/04090001.xhp b/helpcontent2/source/text/swriter/01/04090001.xhp
index 60c1cca858..867458bf87 100644
--- a/helpcontent2/source/text/swriter/01/04090001.xhp
+++ b/helpcontent2/source/text/swriter/01/04090001.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04090001.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,164 +32,170 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriter0104090001xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104090001xml" indexer="include">
<title id="tit" xml-lang="en-US">Document</title>
<filename>/text/swriter/01/04090001.xhp</filename>
</topic>
</meta>
<body>
<section id="dokument">
-<bookmark xml-lang="en-US" branch="hid/HID_FLD_DOK" id="bm_id3145246" localize="false"/><paragraph role="heading" id="hd_id3150017" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090001.xhp" name="Document">Document</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FLD_DOK" id="bm_id3145246" localize="false"/>
+<paragraph role="heading" id="hd_id3150017" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090001.xhp" name="Document">Document</link></paragraph>
<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="2">Fields are used to insert information about the current document, for example, file name, template, statistics, user data, date, and time.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#felddokument"/>
+<embed href="text/swriter/00/00000404.xhp#felddokument"/>
</section>
<paragraph role="note" id="par_id3154470" xml-lang="en-US" l10n="U" oldref="3">For the HTML export and import of date and time fields, <link href="text/swriter/01/04090007.xhp#datumuhrzeit" name="special $[officename] formats">special $[officename] formats</link> are used.</paragraph>
<section id="feldtyp">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE" id="bm_id3153666" localize="false"/><paragraph role="heading" id="hd_id3151312" xml-lang="en-US" level="2" l10n="U" oldref="4">Type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE" id="bm_id3153666" localize="false"/>
+<paragraph role="heading" id="hd_id3151312" xml-lang="en-US" level="2" l10n="U" oldref="4">Type</paragraph>
<paragraph role="paragraph" id="par_id3153672" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp> The following fields are available:</paragraph>
</section>
<table id="tbl_id3149686">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155182" xml-lang="en-US" l10n="U" oldref="6">Type</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3143272" xml-lang="en-US" l10n="U" oldref="7">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151248" xml-lang="en-US" l10n="U" oldref="10">Author</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148975" xml-lang="en-US" l10n="U" oldref="11">Inserts the name of the user who first saved the document. </paragraph>
<paragraph role="tablecontent" id="par_id3147093" xml-lang="en-US" l10n="CHG" oldref="66">To view the name of the author, choose <emph>File - Properties</emph>, click the <emph>General</emph> tab, and then look at the <emph>Created </emph>line. The name of the author is appended to the <emph>Created</emph> line only if the <emph>Apply user data</emph> check box is selected.<comment>we must define the difference of (first) Author and (current) User somewhere, so it is here next to the Author index entry</comment></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145759" xml-lang="en-US" l10n="U" oldref="18">Chapter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149172" xml-lang="en-US" l10n="U" oldref="19">Inserts the chapter number and/or the chapter name.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145771" xml-lang="en-US" l10n="U" oldref="14">Date</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151370" xml-lang="en-US" l10n="CHG" oldref="15">Inserts the current date. You can insert the date as a fixed field - <item type="literal">Date (fixed)</item> - that does not change, or as a dynamic field - <item type="literal">Date</item> - that it is updated automatically. To manually update the <item type="literal">Date</item> field, press F9.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150699" xml-lang="en-US" l10n="U" oldref="12">File name</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150122" xml-lang="en-US" l10n="U" oldref="13">Inserts the filename and/or the directory path of the current document, as well as the filename without extension.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147495" xml-lang="en-US" l10n="U" oldref="20">Page</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145264" xml-lang="en-US" l10n="U" oldref="21">Inserts the page number of the current, previous, or next page.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150561" xml-lang="en-US" l10n="U" oldref="8">Sender</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146341" xml-lang="en-US" l10n="U" oldref="9">Inserts fields containing user data. You can change the user-data that is displayed by choosing<link href="text/shared/optionen/01010100.xhp" name="Tools - Options - $[officename] - User Data"><emph>Tools - Options - $[officename] - User Data</emph></link>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148863" xml-lang="en-US" l10n="U" oldref="22">Statistics</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151091" xml-lang="en-US" l10n="U" oldref="23">Inserts document statistics, such as page and word counts, as a field. To view the statistics of a document, choose <emph>File - Properties</emph>, and then click the<emph> Statistics tab. </emph>
</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153302" xml-lang="en-US" l10n="U" oldref="16">Templates</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156123" xml-lang="en-US" l10n="U" oldref="17">Inserts the filename, the path, or the filename without the file extension of the current template. You can also insert the names of the "Category" and the "Style" formats used in the current template. To view the names of the template categories and the styles used in the templates, choose <emph>File - Templates -</emph><link href="text/shared/01/01110100.xhp" name="Organize"><emph>Organize</emph></link>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146939" xml-lang="en-US" l10n="U" oldref="24">Time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154340" xml-lang="en-US" l10n="CHG" oldref="25">Inserts the current time. You can insert the time as a fixed field - <item type="literal">Time (fixed)</item> - that does not change, or as a dynamic field - <item type="literal">Time</item> - that it is updated automatically. To manually update the <item type="literal">Time</item> field, press F9.</paragraph>
</tablecell>
</tablerow>
</table>
+
<section id="hinweis">
<paragraph role="note" id="par_id3154631" xml-lang="en-US" l10n="U" oldref="26">The following fields can only be inserted if the corresponding field type is selected in the <emph>Type </emph>list.</paragraph>
</section>
<section id="auswahl">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION" id="bm_id3150671" localize="false"/><paragraph role="heading" id="hd_id3150660" xml-lang="en-US" level="2" l10n="CHG" oldref="27">Select<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION" id="bm_id3150671" localize="false"/>
+<paragraph role="heading" id="hd_id3150660" xml-lang="en-US" level="2" l10n="CHG" oldref="27">Select<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
<paragraph role="paragraph" id="par_id3150678" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
<paragraph role="tip" id="par_id3155537" xml-lang="en-US" l10n="U" oldref="53">To quickly insert a field from the list, hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and double-click the field.</paragraph>
<table id="tbl_id3148722">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155359" xml-lang="en-US" l10n="U" oldref="30">Fields</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154220" xml-lang="en-US" l10n="U" oldref="31">Function</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145107" xml-lang="en-US" l10n="U" oldref="32">Previous page</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149595" xml-lang="en-US" l10n="U" oldref="33">Inserts the page number of the previous page in the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146896" xml-lang="en-US" l10n="U" oldref="34">Next page </paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148923" xml-lang="en-US" l10n="U" oldref="35">Inserts the page number of the next page in the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156032" xml-lang="en-US" l10n="U" oldref="36">Page Number </paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159212" xml-lang="en-US" l10n="U" oldref="37">Inserts the current page number.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="paragraph" id="par_id3159229" xml-lang="en-US" l10n="U" oldref="38">In the <emph>Format</emph>, click the numbering format that you want to use.</paragraph>
<paragraph role="paragraph" id="par_id3145188" xml-lang="en-US" l10n="U" oldref="39">If you want, you can enter an <emph>Offset </emph>for the displayed page number. With an <emph>Offset</emph> value of 1, the field will display a number that is 1 more than the current page number, but only if a page with that number exists. On the last page of the document, this same field will be empty.</paragraph>
</section>
<section id="korrektur">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DOK:ED_DOKVALUE" id="bm_id3150903" localize="false"/><paragraph role="heading" id="hd_id3150891" xml-lang="en-US" level="2" l10n="U" oldref="45">Offset</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DOK:ED_DOKVALUE" id="bm_id3150903" localize="false"/>
+<paragraph role="heading" id="hd_id3150891" xml-lang="en-US" level="2" l10n="U" oldref="45">Offset</paragraph>
<paragraph role="paragraph" id="par_id3155312" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SW:EDIT:TP_FLD_DOK:ED_DOKVALUE">Enter the offset value that you want to apply to a page number field, for example "+1".</ahelp></paragraph>
</section>
<paragraph role="tip" id="par_id3154948" xml-lang="en-US" l10n="U" oldref="54">If you want to change the actual page number and not the displayed number, do not use the <emph>Offset</emph> value. To change page numbers, read the <link href="text/swriter/guide/pagenumbers.xhp" name="Page Numbers"><emph>Page Numbers</emph></link> guide.</paragraph>
<section id="format">
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT" id="bm_id3145607" localize="false"/><paragraph role="heading" id="hd_id3145595" xml-lang="en-US" level="2" l10n="U" oldref="41">Format</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT" id="bm_id3145607" localize="false"/>
+<paragraph role="heading" id="hd_id3145595" xml-lang="en-US" level="2" l10n="U" oldref="41">Format</paragraph>
<paragraph role="paragraph" id="par_id3145613" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3150138" xml-lang="en-US" l10n="U" oldref="49"><variable id="datumuhrzeitformat">When you click "Additional formats", the <link href="text/shared/01/05020300.xhp" name="Number Format"><emph>Number Format</emph></link> dialog opens, where you can define a custom format.
@@ -200,38 +205,43 @@
<paragraph role="paragraph" id="par_id3148682" xml-lang="en-US" l10n="U" oldref="56">The following number range formats are for paragraphs formatted with numbered or bulleted lists:</paragraph>
<table id="tbl_id3149976">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150006" xml-lang="en-US" l10n="U" oldref="57">Category and number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155386" xml-lang="en-US" l10n="U" oldref="58">The format contains everything between the beginning of the paragraph and directly after the number-range field</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146919" xml-lang="en-US" l10n="U" oldref="59">Caption text</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155929" xml-lang="en-US" l10n="U" oldref="60">The format contains the text following the number-range field up to the end of the paragraph</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148733" xml-lang="en-US" l10n="U" oldref="61">Number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148755" xml-lang="en-US" l10n="U" oldref="62">The format only contains the reference number</paragraph>
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FLD_DOK:CB_DOKFIXEDCONTENT" id="bm_id3153014" localize="false"/><embed href="text/swriter/01/04090004.xhp#inhaltfix"/>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKLEVEL" id="bm_id3153038" localize="false"/><paragraph role="heading" id="hd_id3153026" xml-lang="en-US" level="2" l10n="U" oldref="43">Layer</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FLD_DOK:CB_DOKFIXEDCONTENT" id="bm_id3153014" localize="false"/>
+<paragraph role="paragraph" id="par_id0902200804313432" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Inserts the field as static content, that is, the field cannot be updated.</ahelp></paragraph>
+<embed href="text/swriter/01/04090004.xhp#inhaltfix"/>
+<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKLEVEL" id="bm_id3153038" localize="false"/>
+<paragraph role="heading" id="hd_id3153026" xml-lang="en-US" level="2" l10n="U" oldref="43">Layer</paragraph>
<paragraph role="paragraph" id="par_id3154580" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKLEVEL">Select the chapter heading level that you want to include in the selected field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF" id="bm_id3154610" localize="false"/><paragraph role="heading" id="hd_id3154598" xml-lang="en-US" level="2" l10n="U" oldref="51">Offset in days/minutes</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF" id="bm_id3154610" localize="false"/>
+<paragraph role="heading" id="hd_id3154598" xml-lang="en-US" level="2" l10n="U" oldref="51">Offset in days/minutes</paragraph>
<paragraph role="paragraph" id="par_id3154899" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF">Enter the offset that you want to apply to a date or time field.</ahelp></paragraph>
<section id="wert">
<paragraph role="heading" id="hd_id3154922" xml-lang="en-US" level="2" l10n="U" oldref="47">Value</paragraph>
-<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF">Enter the contents that you want to add to a user-defined fields.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF">Enter the contents that you want to add to a user-defined field.</ahelp></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04090002.xhp b/helpcontent2/source/text/swriter/01/04090002.xhp
index 350987f79d..3f7672a83d 100644
--- a/helpcontent2/source/text/swriter/01/04090002.xhp
+++ b/helpcontent2/source/text/swriter/01/04090002.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04090002.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriter0104090002xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104090002xml" indexer="include">
<title id="tit" xml-lang="en-US">Cross-references</title>
<filename>/text/swriter/01/04090002.xhp</filename>
</topic>
@@ -46,7 +44,8 @@
<section id="referenzen">
<bookmark xml-lang="en-US" branch="hid/FN_INSERT_REF_FIELD" id="bm_id8981346" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertReferenceField" id="bm_id3149038" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FLD_REF" id="bm_id3149042" localize="false"/><paragraph role="heading" id="hd_id3153641" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/01/04090002.xhp" name="Cross-references">Cross-references</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FLD_REF" id="bm_id3149042" localize="false"/>
+<paragraph role="heading" id="hd_id3153641" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/01/04090002.xhp" name="Cross-references">Cross-references</link></paragraph>
<paragraph role="paragraph" id="par_id3155142" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="reftext"><ahelp hid=".">This is where you insert the references or referenced fields into the current document. References are referenced fields within the same document or within sub-documents of a master document.</ahelp>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3159197" xml-lang="en-US" l10n="U" oldref="19">The advantage of entering a cross-reference as a field is that you do not have to adjust the references manually every time you change the document. Just update the fields with F9 and the references in the document are updated too.</paragraph>
@@ -55,188 +54,205 @@
<embed href="text/swriter/00/00000404.xhp#feldreferenzen"/>
</section>
<embed href="text/swriter/guide/references.xhp#references"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFTYPE" id="bm_id3145772" localize="false"/><paragraph role="heading" id="hd_id4333628" xml-lang="en-US" level="2" l10n="NEW">Type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFTYPE" id="bm_id3145772" localize="false"/>
+<paragraph role="heading" id="hd_id4333628" xml-lang="en-US" level="2" l10n="NEW">Type</paragraph>
<paragraph role="paragraph" id="par_id4516129" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Lists the available field types. To add a field to your document, click a field type, click a field in the Selection list, and then click Insert.</ahelp> The following fields are available:</paragraph>
<table id="tbl_id3145784">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3151380" xml-lang="en-US" l10n="U" oldref="3">Type</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="4">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155862" xml-lang="en-US" l10n="U" oldref="5">Set Reference</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147422" xml-lang="en-US" l10n="U" oldref="6">Set target for a referenced field. Under <emph>Name</emph>, enter a name for the reference. When inserting the reference, the name will then appear as an identification in the list box <emph>Selection</emph>.</paragraph>
<paragraph role="tablecontent" id="par_id3149556" xml-lang="en-US" l10n="U" oldref="7">In an HTML document, reference fields entered this way will be ignored. For the target in HTML documents, you have to <link href="text/swriter/01/04040000.xhp" name="insert a bookmark">insert a bookmark</link>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150548" xml-lang="en-US" l10n="U" oldref="8">Insert Reference</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147746" xml-lang="en-US" l10n="U" oldref="9">Inserting a reference to another position in the document. The corresponding text position has to be defined with "Set Reference" first. Otherwise, inserting a reference by choosing a field name under <emph>Selection</emph> is not possible.</paragraph>
<paragraph role="tablecontent" id="par_id3146344" xml-lang="en-US" l10n="U" oldref="16">In master documents, you can also reference from one sub-document to another. Note that the reference name will not appear in the selection field and has to be entered "by hand".</paragraph>
<paragraph role="tablecontent" id="par_id3149847" xml-lang="en-US" l10n="U" oldref="10">In an HTML document, reference fields entered this way will be ignored. For referenced fields in HTML documents, you have to <link href="text/shared/01/05020400.xhp" name="insert a hyperlink">insert a hyperlink</link>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id2408825" xml-lang="en-US" l10n="NEW">Headings</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id9988402" xml-lang="en-US" l10n="NEW">The Selection box shows a list of all headings in the order of their appearance in the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id6401257" xml-lang="en-US" l10n="NEW">Numbered Paragraphs</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id5841242" xml-lang="en-US" l10n="NEW">The Selection box shows a list of all numbered headings and numbered paragraphs in the order of their appearance in the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id306711" xml-lang="en-US" l10n="NEW">Bookmarks</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150907" xml-lang="en-US" l10n="U" oldref="11">After inserting a bookmark in the document with <emph>Insert - Bookmark</emph>, the bookmarks entry on the <emph>References</emph> tab becomes usable. Bookmarks are used to mark certain text passages in a document. In a text document, you can use the bookmarks, for example, to jump from one passage in the document to another.</paragraph>
<paragraph role="tablecontent" id="par_id3155080" xml-lang="en-US" l10n="U" oldref="12">In an HTML document, these bookmarks become anchors &lt;A name&gt;, which determine the target of hyperlinks for example.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
+<paragraph role="tablecontent" id="par_id0818200811011072" xml-lang="en-US" l10n="NEW">Footnotes</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id0818200811011049" xml-lang="en-US" l10n="NEW">If your documents contains a footnote, you can select the Footnotes entry. A reference to a footnote returns the footnote number.</paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
<paragraph role="tablecontent" id="par_id6794030" xml-lang="en-US" l10n="NEW">(Inserted objects with captions)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id7096774" xml-lang="en-US" l10n="NEW">You can set references to objects that have captions applied. For example, insert a picture, right-click the picture, choose Caption. Now the object shows up as a numbered "Illustration" in the list.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="tip" id="par_id3154772" xml-lang="en-US" l10n="U" oldref="18">References are fields. To remove a reference, delete the field. If you set a longer text as a reference and you do not want to reenter it after deleting the reference, select the text and copy it to the clipboard. You can then reinsert it as "unformatted text" at the same position using the command <emph>Edit - Paste special</emph>. The text remains intact while the reference is deleted.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFSELECTION" id="bm_id3146957" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_REFSELECTION_TOOLTIP" id="bm_id1661427" localize="false"/><paragraph role="heading" id="hd_id5824152" xml-lang="en-US" level="2" l10n="NEW">Selection<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_REFSELECTION_TOOLTIP" id="bm_id1661427" localize="false"/>
+<paragraph role="heading" id="hd_id5824152" xml-lang="en-US" level="2" l10n="NEW">Selection<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
<paragraph role="paragraph" id="par_id7374187" xml-lang="en-US" l10n="CHG"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, select a format in the "Insert reference to" list, and then click <emph>Insert</emph>.</ahelp></paragraph>
<paragraph role="tip" id="par_id7729728" xml-lang="en-US" l10n="NEW">To quickly insert a field from the list, hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and double-click the field.</paragraph>
<section id="format">
<paragraph role="paragraph" id="par_id2171086" xml-lang="en-US" l10n="CHG">In the <emph>Insert reference to</emph> list, click the format that you want to use.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT" id="bm_id3154344" localize="false"/><paragraph role="heading" id="hd_id3154333" xml-lang="en-US" level="2" l10n="CHG" oldref="21">Insert reference to</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT" id="bm_id3154344" localize="false"/>
+<paragraph role="heading" id="hd_id3154333" xml-lang="en-US" level="2" l10n="CHG" oldref="21">Insert reference to</paragraph>
<paragraph role="paragraph" id="par_id3148786" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT">Select the format that you want to use for the selected reference field.</ahelp> The following formats are available:</paragraph>
<table id="tbl_id3150090">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id7576525" xml-lang="en-US" l10n="NEW">Format</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id641193" xml-lang="en-US" l10n="NEW">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150039" xml-lang="en-US" l10n="U" oldref="23">Page</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153134" xml-lang="en-US" l10n="U" oldref="24">Inserts the number of the page containing the reference target.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150681" xml-lang="en-US" l10n="U" oldref="27">Reference</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154040" xml-lang="en-US" l10n="U" oldref="28">Inserts the complete reference target text.</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3154040" xml-lang="en-US" l10n="CHG" oldref="28">Inserts the complete reference target text. For footnotes the footnote number is inserted.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149972" xml-lang="en-US" l10n="U" oldref="29">Above/Below</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149619" xml-lang="en-US" l10n="U" oldref="30">Inserts "above" or "below", depending on the location of the reference target relative to the position of the reference field.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148705" xml-lang="en-US" l10n="U" oldref="31">As Page Style</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148728" xml-lang="en-US" l10n="U" oldref="32">Inserts the number of the page containing the reference target using the format specified in the page style.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id5699942" xml-lang="en-US" l10n="NEW">Number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id6420484" xml-lang="en-US" l10n="NEW">Inserts the number of the heading or numbered paragraph, including superior levels depending on the context. See note below this table for more information.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id6986602" xml-lang="en-US" l10n="NEW">Number (no context)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id616779" xml-lang="en-US" l10n="NEW">Inserts only the number of the heading or numbered paragraph.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id791039" xml-lang="en-US" l10n="NEW">Number (full context)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id1953489" xml-lang="en-US" l10n="NEW">Inserts the number of the heading or numbered paragraph, including all superior levels.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154635" xml-lang="en-US" l10n="U" oldref="25">Chapter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149646" xml-lang="en-US" l10n="U" oldref="26">Inserts the number of the chapter containing the reference target.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155553" xml-lang="en-US" l10n="U" oldref="33">Category and Number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155356" xml-lang="en-US" l10n="U" oldref="34">Inserts the category (caption type) and the number of the reference target. This option is only available when the reference target is an object with a caption.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154224" xml-lang="en-US" l10n="U" oldref="35">Caption Text</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145105" xml-lang="en-US" l10n="U" oldref="36">Inserts the caption label of the reference target. This option is only available when the reference target is an object with a caption.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149587" xml-lang="en-US" l10n="U" oldref="37">Numbering</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146883" xml-lang="en-US" l10n="U" oldref="38">Inserts the caption number of the reference target. This option is only available when the reference target is an object with a caption.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="note" id="par_id757469" xml-lang="en-US" l10n="NEW">The "Number" format inserts the number of the heading or numbered paragraph. The superior levels are included depending on the context, as necessary. </paragraph>
<paragraph role="note" id="par_id5189062" xml-lang="en-US" l10n="CHG">For example, when you are in a chapter 1, subchapter 2, subpart 5, this may be numbered as 1.2.5. When you insert here a reference to text in the previous subpart "1.2.4" and you apply the "Number" format, then the reference will be shown as "4". If in this example the numbering is set to show more sublevels, the same reference will be shown as "2.4" or "1.2.4", depending on the setting. If you use the "Number (full context)" format, you will always see "1.2.4", no matter how the numbered paragraph is formatted.</paragraph>
</section>
<section id="name">
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_REF:ED_REFNAME" id="bm_id3156253" localize="false"/><paragraph role="heading" id="hd_id3156242" xml-lang="en-US" level="2" l10n="U" oldref="13">Name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_REF:ED_REFNAME" id="bm_id3156253" localize="false"/>
+<paragraph role="heading" id="hd_id3156242" xml-lang="en-US" level="2" l10n="U" oldref="13">Name</paragraph>
<paragraph role="paragraph" id="par_id3156259" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:EDIT:TP_FLD_REF:ED_REFNAME">Type the name of the user-defined field that you want to create.</ahelp> To set a target, click "Set Reference" in the <emph>Type</emph> list, type a name in this box, and then click <emph>Insert</emph>. To reference the new target, click the target name in the <emph>Selection</emph> list.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3156032" xml-lang="en-US" l10n="U" oldref="17">In a master document, targets that are in different sub-documents are not displayed in the<emph> Selection</emph> list. If you want to insert a reference to the target, you must type the path and the name in the <emph>Name </emph>box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_REF:ED_REFVALUE" id="bm_id3159204" localize="false"/><embed href="text/swriter/01/04090001.xhp#wert"/>
+<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_REF:ED_REFVALUE" id="bm_id3159204" localize="false"/>
+<paragraph role="paragraph" id="par_id0903200802250745" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the contents that you want to add to a user-defined fields.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#wert"/>
<paragraph role="paragraph" id="par_id3159216" xml-lang="en-US" l10n="U" oldref="15">If you select text in the document, and then insert a reference, the selected text becomes the contents of the field that you insert.</paragraph><comment>Value box (always disabled)</comment>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_REF:ED_REFVALUE" id="bm_id5684377" localize="false"/><paragraph role="paragraph" id="par_id6501968" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Edit the value.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_FLD_REF:ED_REFVALUE" id="bm_id5684377" localize="false"/>
+<paragraph role="paragraph" id="par_id6501968" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Edit the value.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04090003.xhp b/helpcontent2/source/text/swriter/01/04090003.xhp
index 223501d55e..5a0fbc53ff 100644
--- a/helpcontent2/source/text/swriter/01/04090003.xhp
+++ b/helpcontent2/source/text/swriter/01/04090003.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04090003.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0104090003xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104090003xml" indexer="include">
<title id="tit" xml-lang="en-US">Functions</title>
<filename>/text/swriter/01/04090003.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-05-09T13:24:43">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="funktionen">
@@ -52,85 +50,89 @@
<paragraph role="paragraph" id="par_id3151242" xml-lang="en-US" l10n="U" oldref="2">Depending on the field type that you select, you can assign conditions to certain functions. For example, you can define a field that executes a macro when you click the field in the document, or a condition that, when met, hides a field. You can also define placeholder fields that insert graphics, tables, frames and other objects into your document when needed.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#feldfunktionen"/>
+<embed href="text/swriter/00/00000404.xhp#feldfunktionen"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_FUNC_LB_FUNCTYPE" id="bm_id3146964" localize="false"/><embed href="text/swriter/01/04090001.xhp#feldtyp"/>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_FUNC_LB_FUNCTYPE" id="bm_id3146964" localize="false"/>
+<paragraph role="paragraph" id="par_id0902200804352037" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#feldtyp"/>
<table id="tbl_id3147403">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150537" xml-lang="en-US" l10n="U" oldref="3">Type</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155623" xml-lang="en-US" l10n="U" oldref="4">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152999" xml-lang="en-US" l10n="U" oldref="5">Conditional text</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149881" xml-lang="en-US" l10n="U" oldref="6">Inserts text if a certain <link href="text/swriter/01/04090200.xhp" name="condition">condition</link> is met. For example, enter "sun eq 1" in the <emph>Condition</emph> box, and then the text that you want to insert when the variable "sun" equals "1" in the <emph>Then </emph>box. If you want, you can also enter the text that you want to display when this condition is not met in the <emph>Else</emph> box. To define the variable "sun", click the <link href="text/swriter/01/04090005.xhp" name="Variables"><emph>Variables</emph></link> tab, select "Set variable", type "sun" in the<emph> Name</emph> box, and its value in the<emph> Value</emph> box.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153719" xml-lang="en-US" l10n="U" oldref="47">Input list</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147564" xml-lang="en-US" l10n="U" oldref="48">Inserts a text field that displays one item from a list. You can add, edit, and remove items, and change their order in the list. Click an <emph>Input list</emph> field in your document or press Ctrl+Shift+F9 to display the <link href="text/swriter/01/04090003.xhp" name="Choose Item"><emph>Choose Item</emph></link> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153146" xml-lang="en-US" l10n="U" oldref="7">Input field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149287" xml-lang="en-US" l10n="U" oldref="8">Inserts a text field that you can open by <link href="text/swriter/01/04090100.xhp" name="clicking">clicking</link> it in the document. You can then change the text that is displayed.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154691" xml-lang="en-US" l10n="U" oldref="9">Execute macro</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147515" xml-lang="en-US" l10n="U" oldref="10">Inserts a text field that runs a macro when you click the field in the document. To assign a macro to the field, click the <emph>Macro</emph> button. </paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152946" xml-lang="en-US" l10n="U" oldref="11">Placeholder</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="12">Inserts a placeholder field in the document, for example, for graphics. When you click a placeholder field in the document, you are prompted to insert the item that is missing.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150973" xml-lang="en-US" l10n="U" oldref="13">Hidden text</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147524" xml-lang="en-US" l10n="CHG" oldref="14">Inserts a text field that is hidden when the condition that you specify is met. To use this function, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden text</emph> check box.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154480" xml-lang="en-US" l10n="U" oldref="15">Hidden Paragraph</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153677" xml-lang="en-US" l10n="CHG" oldref="16">Hides a paragraph when the condition that you specify is met. To use this function, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden paragraph</emph> check box.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154192" xml-lang="en-US" l10n="U" oldref="39">Combine characters </paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159199" xml-lang="en-US" l10n="U" oldref="42">Combines up to 6 characters, so that they behave as a single character. This feature is only available when Asian fonts are supported.</paragraph>
</tablecell>
</tablerow>
</table>
<embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_FUNC_LB_FUNCFORMAT" id="bm_id3149307" localize="false"/><embed href="text/swriter/01/04090001.xhp#format"/>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_FUNC_LB_FUNCFORMAT" id="bm_id3149307" localize="false"/>
+<paragraph role="paragraph" id="par_id0902200804352213" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#format"/>
<paragraph role="paragraph" id="par_id3151329" xml-lang="en-US" l10n="U" oldref="17">For function fields, the format field is only used for fields of the type placeholder. Here, the format determines the object for which the placeholder stands.</paragraph>
<section id="bedingung">
<paragraph role="heading" id="hd_id3149494" xml-lang="en-US" level="2" l10n="U" oldref="18">Condition</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04090004.xhp b/helpcontent2/source/text/swriter/01/04090004.xhp
index 8506f7d889..ef527495f2 100644
--- a/helpcontent2/source/text/swriter/01/04090004.xhp
+++ b/helpcontent2/source/text/swriter/01/04090004.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04090004.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0104090004xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104090004xml" indexer="include">
<title id="tit" xml-lang="en-US">DocInformation</title>
<filename>/text/swriter/01/04090004.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-05T12:15:02">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="dokumentinfo">
@@ -51,104 +47,110 @@
<paragraph role="paragraph" id="par_id3149692" xml-lang="en-US" l10n="U" oldref="2">DocInformation fields contain information about the properties of a document, such as the date a document was created. To view the properties of a document, choose <emph>File - Properties</emph>.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#felddokumentinfo"/>
+<embed href="text/swriter/00/00000404.xhp#felddokumentinfo"/>
</section>
<paragraph role="note" id="par_id3148982" xml-lang="en-US" l10n="U" oldref="3">When you export and import an HTML document containing DocInformation fields, <link href="text/swriter/01/04090007.xhp#dokumentinfo" name="special $[officename] formats">special $[officename] formats</link> are used.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FIELD_DINF_TYPE" id="bm_id3153639" localize="false"/><embed href="text/swriter/01/04090001.xhp#feldtyp"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FIELD_DINF_TYPE" id="bm_id3153639" localize="false"/>
+<paragraph role="paragraph" id="par_id0902200804290053" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the Select list, and then click Insert.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#feldtyp"/>
<table id="tbl_id3149039">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155140" xml-lang="en-US" l10n="U" oldref="4">Type</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149176" xml-lang="en-US" l10n="U" oldref="5">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145774" xml-lang="en-US" l10n="U" oldref="6">Modified</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155915" xml-lang="en-US" l10n="U" oldref="7">Inserts the name of the author, and the date, or the time of the last save.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150108" xml-lang="en-US" l10n="U" oldref="8">Editing time</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="9">Inserts the amount of time spent on editing a document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="10">Description</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147490" xml-lang="en-US" l10n="U" oldref="11">Inserts the comment as entered in the <emph>Description </emph>tab of the <emph>File Properties </emph>dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145262" xml-lang="en-US" l10n="U" oldref="12">Document number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150556" xml-lang="en-US" l10n="U" oldref="13">Inserts the version number of the current document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146326" xml-lang="en-US" l10n="U" oldref="14">Created</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149833" xml-lang="en-US" l10n="U" oldref="15">Inserts the name of the author, and the date, or the time when the document was created.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148856" xml-lang="en-US" l10n="U" oldref="16">Info 0 - 3</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154784" xml-lang="en-US" l10n="U" oldref="17">Inserts the contents of the info fields found on the <emph>User Defined </emph>tab of the <link href="text/shared/01/01100300.xhp" name="File - Properties"><emph>File - Properties</emph></link> dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150177" xml-lang="en-US" l10n="U" oldref="18">Last printed</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156094" xml-lang="en-US" l10n="U" oldref="19">Inserts the name of the author, and the date or time that the document was last printed.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156122" xml-lang="en-US" l10n="U" oldref="20">Keywords</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150912" xml-lang="en-US" l10n="U" oldref="21">Inserts the keywords as entered in the <emph>Description </emph>tab of the <emph>File Properties </emph>dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154328" xml-lang="en-US" l10n="U" oldref="22">Subject</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146942" xml-lang="en-US" l10n="U" oldref="23">Inserts the subject as entered in the <emph>Description </emph>tab of the <emph>File Properties </emph>dialog.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150092" xml-lang="en-US" l10n="U" oldref="24">Title</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150033" xml-lang="en-US" l10n="U" oldref="25">Inserts the title as entered in the <emph>Description </emph>tab of the <emph>File Properties </emph>dialog.</paragraph>
</tablecell>
</tablerow>
</table>
<embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFSELECTION" id="bm_id3154623" localize="false"/><embed href="text/swriter/01/04090001.xhp#auswahl"/>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFSELECTION" id="bm_id3154623" localize="false"/>
+<paragraph role="paragraph" id="par_id0902200804290272" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#auswahl"/>
<paragraph role="note" id="par_id3149956" xml-lang="en-US" l10n="U" oldref="26">For the "Created", "Modified", and "Last printed" field types, you can include the author, date, and time of the corresponding operation.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFFORMAT" id="bm_id3166051" localize="false"/><embed href="text/swriter/01/04090001.xhp#format"/>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFFORMAT" id="bm_id3166051" localize="false"/>
+<paragraph role="paragraph" id="par_id0902200804290382" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#format"/>
<embed href="text/swriter/01/04090001.xhp#datumuhrzeitformat"/>
<section id="inhaltfix">
<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT" id="bm_id3149620" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/04090005.xhp b/helpcontent2/source/text/swriter/01/04090005.xhp
index 4b5e159a7c..b3fe90aa31 100644
--- a/helpcontent2/source/text/swriter/01/04090005.xhp
+++ b/helpcontent2/source/text/swriter/01/04090005.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04090005.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriter0104090005xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104090005xml" indexer="include">
<title id="tit" xml-lang="en-US">Variables</title>
<filename>/text/swriter/01/04090005.xhp</filename>
</topic>
@@ -46,105 +44,116 @@
<section id="variablen">
<bookmark xml-lang="en-US" branch="index" id="bm_id8526261"><bookmark_value>user-defined fields, restriction</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/HID_FLD_VAR" id="bm_id3151266" localize="false"/><paragraph role="heading" id="hd_id3153716" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090005.xhp" name="Variables">Variables</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FLD_VAR" id="bm_id3151266" localize="false"/>
+<paragraph role="heading" id="hd_id3153716" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090005.xhp" name="Variables">Variables</link></paragraph>
<paragraph role="paragraph" id="par_id3150764" xml-lang="en-US" l10n="U" oldref="2">Variable fields let you add dynamic content to your document. For example, you can use a variable to reset the page numbering.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#feldvariablen"/>
+<embed href="text/swriter/00/00000404.xhp#feldvariablen"/>
</section>
<paragraph role="warning" id="par_id3149759" xml-lang="en-US" l10n="U" oldref="3">User-defined fields are only available in the current document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARTYPE" id="bm_id3154692" localize="false"/><embed href="text/swriter/01/04090001.xhp#feldtyp"/>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARTYPE" id="bm_id3154692" localize="false"/>
+<paragraph role="paragraph" id="par_id0903200802243625" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#feldtyp"/>
<table id="tbl_id3145416">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3150703" xml-lang="en-US" l10n="U" oldref="4">Type</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154096" xml-lang="en-US" l10n="U" oldref="5">Description</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149803" xml-lang="en-US" l10n="U" oldref="6">Set Variable</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150996" xml-lang="en-US" l10n="U" oldref="7">Defines a variable and its value. You can change the value of a variable by clicking in front of the variable field, and then choosing <emph>Edit - Field</emph>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154571" xml-lang="en-US" l10n="U" oldref="8">Show Variable</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153669" xml-lang="en-US" l10n="U" oldref="9">Inserts the current value of the variable that you click in the <emph>Selection </emph>list.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147531" xml-lang="en-US" l10n="U" oldref="10">DDE field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149684" xml-lang="en-US" l10n="U" oldref="11">Inserts a <link href="text/shared/00/00000005.xhp#dde" name="DDE">DDE</link> link into the document, that you can update as often as you want through the assigned name.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3159196" xml-lang="en-US" l10n="U" oldref="12">Insert Formula</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151322" xml-lang="en-US" l10n="U" oldref="13">Inserts a fixed number, or the result of a formula.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149494" xml-lang="en-US" l10n="U" oldref="14">Input field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154829" xml-lang="en-US" l10n="U" oldref="15">Inserts a new value for a variable or a User Field.</paragraph>
<paragraph role="tablecontent" id="par_id3149098" xml-lang="en-US" l10n="U" oldref="37">The value of a variable in an Input field is only valid from where the field is inserted and onwards. To change the value of the variable later in the document, insert another Input field of the same name, but with a different value. However, the value of a User Field is changed globally.</paragraph>
<paragraph role="tablecontent" id="par_id3151255" xml-lang="en-US" l10n="U" oldref="38">The variables are displayed in the <emph>Selection</emph> field. When you click the <emph>Insert</emph> button, the dialog<link href="text/swriter/01/04090100.xhp" name="Input Field"><emph>Input Field</emph></link> appears, where you can enter the new value or additional text as a remark.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149034" xml-lang="en-US" l10n="U" oldref="16">Number range</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152772" xml-lang="en-US" l10n="U" oldref="17">Inserts automatic numbering for tables, graphics, or text frames.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147073" xml-lang="en-US" l10n="U" oldref="18">Set page variable</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154389" xml-lang="en-US" l10n="U" oldref="19">Inserts a reference point in the document, after which the page count restarts. Select "on" to enable the reference point, and "off" to disable it. You can also enter an offset to start the page count at a different number.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156267" xml-lang="en-US" l10n="U" oldref="20">Show Page Variable</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150588" xml-lang="en-US" l10n="U" oldref="21">Displays the number of pages from the "Set page variable" reference point to this field.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145779" xml-lang="en-US" l10n="U" oldref="22">User Field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151377" xml-lang="en-US" l10n="U" oldref="23">Inserts a custom global variable. You can use the User Field to define a variable for a condition statement. When you change a User Field, all instances of the variable in the document are updated.</paragraph>
</tablecell>
</tablerow>
</table>
<embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARNUMFORMAT" id="bm_id3148875" localize="false"/><embed href="text/swriter/01/04090001.xhp#format"/>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARNUMFORMAT" id="bm_id3148875" localize="false"/>
+<paragraph role="paragraph" id="par_id0903200802243892" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click the format that you want to apply to the selected field, or click "Additional formats" to define a custom format.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#format"/>
<paragraph role="paragraph" id="par_id3148886" xml-lang="en-US" l10n="U" oldref="25">For user-defined fields, click the format that you want to apply in the <emph>Format </emph>list, or click "Additional formats" to define a custom format.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARNAME" id="bm_id3150108" localize="false"/><embed href="text/swriter/01/04090002.xhp#name"/>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARVALUE" id="bm_id3150119" localize="false"/><embed href="text/swriter/01/04090001.xhp#wert"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARFORMAT" id="bm_id3155871" localize="false"/><paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_LISTBOX_TP_FLD_VAR_LB_VARFORMAT">In the <emph>Format</emph> list, define if the value is inserted as text or a number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARSELECTION" id="bm_id3150684" localize="false"/><paragraph role="heading" id="hd_id3888363" xml-lang="en-US" level="2" l10n="NEW">Selection<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARNAME" id="bm_id3150108" localize="false"/>
+<paragraph role="paragraph" id="par_id0903200802243880" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Type the name of the user-defined field that you want to create.</ahelp></paragraph>
+<embed href="text/swriter/01/04090002.xhp#name"/>
+<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARVALUE" id="bm_id3150119" localize="false"/>
+<paragraph role="paragraph" id="par_id0903200802243951" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the contents that you want to add to a user-defined field.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#wert"/>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARFORMAT" id="bm_id3155871" localize="false"/>
+<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW_LISTBOX_TP_FLD_VAR_LB_VARFORMAT">In the <emph>Format</emph> list, define if the value is inserted as text or a number.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARSELECTION" id="bm_id3150684" localize="false"/>
+<paragraph role="heading" id="hd_id3888363" xml-lang="en-US" level="2" l10n="NEW">Selection<comment>on "Document" and "DocInformation" tab page this is called "Select", on the other tab pages "Selection"</comment></paragraph>
<paragraph role="paragraph" id="par_id7453535" xml-lang="en-US" l10n="NEW"><ahelp hid="SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION">Lists the available fields for the field type selected in the <emph>Type </emph>list. To insert a field, click the field, and then click <emph>Insert</emph>.</ahelp></paragraph>
<paragraph role="tip" id="par_id3326822" xml-lang="en-US" l10n="NEW">To quickly insert a field from the list, hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and double-click the field.</paragraph>
@@ -155,35 +164,41 @@
<embed href="text/swriter/01/04090003.xhp#hinweis"/>
<embed href="text/swriter/01/04090001.xhp#korrektur"/>
<section id="unsichtbar">
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_FLD_VAR_CB_VARINVISIBLE" id="bm_id3156226" localize="false"/><paragraph role="heading" id="hd_id3149229" xml-lang="en-US" level="2" l10n="U" oldref="29">Invisible</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_FLD_VAR_CB_VARINVISIBLE" id="bm_id3156226" localize="false"/>
+<paragraph role="heading" id="hd_id3149229" xml-lang="en-US" level="2" l10n="U" oldref="29">Invisible</paragraph>
<paragraph role="paragraph" id="par_id3156233" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW_CHECKBOX_TP_FLD_VAR_CB_VARINVISIBLE">Hides the field contents in the document.</ahelp> The field is inserted as a thin gray mark in the document. This option is only available for the "Set Variable" and "User Field" field types.</paragraph>
</section>
<paragraph role="heading" id="hd_id3146326" xml-lang="en-US" level="2" l10n="U" oldref="39">Chapter numbering</paragraph>
<paragraph role="paragraph" id="par_id3146340" xml-lang="en-US" l10n="U" oldref="40">Sets the options for resetting chapter numbers.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARCHAPTERLEVEL" id="bm_id3149829" localize="false"/><paragraph role="heading" id="hd_id3147456" xml-lang="en-US" level="3" l10n="U" oldref="41">Level</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FLD_VAR_LB_VARCHAPTERLEVEL" id="bm_id3149829" localize="false"/>
+<paragraph role="heading" id="hd_id3147456" xml-lang="en-US" level="3" l10n="U" oldref="41">Level</paragraph>
<paragraph role="paragraph" id="par_id3149836" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SW_LISTBOX_TP_FLD_VAR_LB_VARCHAPTERLEVEL">Choose the heading or chapter level at which to restart numbering in the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARSEPARATOR" id="bm_id3147605" localize="false"/><paragraph role="heading" id="hd_id3147594" xml-lang="en-US" level="3" l10n="U" oldref="43">Separator</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_EDIT_TP_FLD_VAR_ED_VARSEPARATOR" id="bm_id3147605" localize="false"/>
+<paragraph role="heading" id="hd_id3147594" xml-lang="en-US" level="3" l10n="U" oldref="43">Separator</paragraph>
<paragraph role="paragraph" id="par_id3148846" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="SW_EDIT_TP_FLD_VAR_ED_VARSEPARATOR">Type the character that you want to use as a separator between the heading or chapter levels.</ahelp></paragraph>
<section id="uebernehmen">
-<bookmark xml-lang="en-US" branch="hid/HID_FLDVAR_APPLY" id="bm_id3147069" localize="false"/><paragraph role="heading" id="hd_id3147057" xml-lang="en-US" level="2" l10n="U" oldref="31">Apply</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FLDVAR_APPLY" id="bm_id3147069" localize="false"/>
+<paragraph role="heading" id="hd_id3147057" xml-lang="en-US" level="2" l10n="U" oldref="31">Apply</paragraph>
<paragraph role="paragraph" id="par_id3155562" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="HID_FLDVAR_APPLY">Adds the user-defined field to the <emph>Selection</emph> list.</ahelp></paragraph>
<embed href="text/swriter/02/14040000.xhp#syuebernehmen"/>
</section>
<section id="loeschen">
-<bookmark xml-lang="en-US" branch="hid/HID_FLDVAR_DELETE" id="bm_id3151092" localize="false"/><paragraph role="heading" id="hd_id3151080" xml-lang="en-US" level="2" l10n="U" oldref="33">Delete</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FLDVAR_DELETE" id="bm_id3151092" localize="false"/>
+<paragraph role="heading" id="hd_id3151080" xml-lang="en-US" level="2" l10n="U" oldref="33">Delete</paragraph>
<paragraph role="paragraph" id="par_id3154769" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="HID_FLDVAR_DELETE">Removes the user-defined field from the selection list. You can only remove fields that are not used in the current document.</ahelp> To remove a field that is used in the current document from the list, first delete all instances of the field in the document, and then remove it from the list.</paragraph>
<table id="tbl_id3154080">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145318" xml-lang="en-US" l10n="E">
-<image id="img_id3153293" src="svx/res/nu02.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153293" xml-lang="en-US">Icon</alt>
+<image id="img_id3153293" src="svx/res/nu02.png" width="0.423cm" height="0.423cm"><alt id="alt_id3153293" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150169" xml-lang="en-US" l10n="U" oldref="35">Delete</paragraph>
</tablecell>
</tablerow>
</table>
+
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04090006.xhp b/helpcontent2/source/text/swriter/01/04090006.xhp
index 6a62a570e2..012cf7d292 100644
--- a/helpcontent2/source/text/swriter/01/04090006.xhp
+++ b/helpcontent2/source/text/swriter/01/04090006.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04090006.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,96 +32,107 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriter0104090006xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104090006xml" indexer="include">
<title id="tit" xml-lang="en-US">Database</title>
<filename>/text/swriter/01/04090006.xhp</filename>
</topic>
</meta>
<body>
<section id="datenbank">
-<bookmark xml-lang="en-US" branch="hid/HID_FLD_DB" id="bm_id3151315" localize="false"/><paragraph role="heading" id="hd_id3153536" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090006.xhp" name="Database">Database</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FLD_DB" id="bm_id3151315" localize="false"/>
+<paragraph role="heading" id="hd_id3153536" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04090006.xhp" name="Database">Database</link></paragraph>
<paragraph role="paragraph" id="par_id3154471" xml-lang="en-US" l10n="U" oldref="2">You can insert fields from any database, for example, address fields, into your document.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#felddatenbank"/>
+<embed href="text/swriter/00/00000404.xhp#felddatenbank"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBTYPE" id="bm_id3154566" localize="false"/><embed href="text/swriter/01/04090001.xhp#feldtyp"/>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBTYPE" id="bm_id3154566" localize="false"/>
+<paragraph role="paragraph" id="par_id090220080439090" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Lists the available field types. To add a field to your document, click a field type, click a field in the <emph>Select </emph>list, and then click <emph>Insert</emph>.</ahelp></paragraph>
+<embed href="text/swriter/01/04090001.xhp#feldtyp"/>
<table id="tbl_id3155894">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3154196" xml-lang="en-US" l10n="U" oldref="3">Field type</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3149484" xml-lang="en-US" l10n="U" oldref="4">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149096" xml-lang="en-US" l10n="U" oldref="5">Any Record</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151257" xml-lang="en-US" l10n="U" oldref="6">Inserts the contents of the database field that you specify in the <emph>Record Number</emph> box as a mail merge field if the <link href="text/swriter/01/04090200.xhp" name="Condition"><emph>Condition</emph></link> that you enter is met. Only records selected by a multiple selection in the data source view are considered.</paragraph>
<paragraph role="tablecontent" id="par_id3147100" xml-lang="en-US" l10n="U" oldref="7">You can use this field to insert several records into a document. Simply insert the <emph>Any Record</emph> field in front of the form letter fields that use a certain record.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153632" xml-lang="en-US" l10n="U" oldref="8">Database Name</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152776" xml-lang="en-US" l10n="U" oldref="9">Inserts the name of the database table selected in the <emph>Database selection </emph>box. The "Database Name" field is a global field, that is, if you insert a different database name in your document, the contents of all previously inserted "Database Name" fields are updated.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149167" xml-lang="en-US" l10n="U" oldref="15">Mail merge field</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145779" xml-lang="en-US" l10n="U" oldref="16">Inserts the name of a database field as a placeholder, so that you can create a mail merge document. The field content is automatically inserted when you print the form letter.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151372" xml-lang="en-US" l10n="U" oldref="12">Next record</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150114" xml-lang="en-US" l10n="U" oldref="13">Inserts the contents of the next mail merge field in your document, if the condition that you define is met. The records that you want to include must be selected in the data source view.</paragraph>
<paragraph role="tablecontent" id="par_id3155861" xml-lang="en-US" l10n="U" oldref="14">You can use the "Next record" field to insert the contents of consecutive records between the mail merge fields in a document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147412" xml-lang="en-US" l10n="U" oldref="10">Record number</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147495" xml-lang="en-US" l10n="U" oldref="11">Inserts the number of the selected database record.</paragraph>
</tablecell>
</tablerow>
</table>
<embed href="text/swriter/01/04090001.xhp#hinweis"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DB_SELECTION_TLB" id="bm_id3145262" localize="false"/><paragraph role="heading" id="hd_id3149565" xml-lang="en-US" level="2" l10n="U" oldref="17">Database Selection</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DB_SELECTION_TLB" id="bm_id3145262" localize="false"/>
+<paragraph role="heading" id="hd_id3149565" xml-lang="en-US" level="2" l10n="U" oldref="17">Database Selection</paragraph>
<paragraph role="paragraph" id="par_id3145268" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="HID_DB_SELECTION_TLB">Select the database table or the database query that you want the field to refer to.</ahelp> You can include fields from more than one database or query in a document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DB:ED_DBCONDITION" id="bm_id3150559" localize="false"/><embed href="text/swriter/01/04090003.xhp#bedingung"/>
+<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DB:ED_DBCONDITION" id="bm_id3150559" localize="false"/>
+<paragraph role="paragraph" id="par_id0902200804391084" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For fields linked to a condition, enter the criteria here.</ahelp></paragraph>
+<embed href="text/swriter/01/04090003.xhp#bedingung"/>
<paragraph role="paragraph" id="par_id3147739" xml-lang="en-US" l10n="U" oldref="19">If you want, you can assign a condition that must be met before the contents of the "Any Record" and "Next Record" fields are inserted. The default condition is "True", that is, the condition is always true if you do not change the condition text.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER" id="bm_id3149831" localize="false"/><paragraph role="heading" id="hd_id3146336" xml-lang="en-US" level="2" l10n="U" oldref="20">Record number</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER" id="bm_id3149831" localize="false"/>
+<paragraph role="heading" id="hd_id3146336" xml-lang="en-US" level="2" l10n="U" oldref="20">Record number</paragraph>
<paragraph role="paragraph" id="par_id3149836" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER">Enter the number of the record that you want to insert when the condition that you specify is met.</ahelp> The record number corresponds to the current selection in the data source view. For example, if you select the last 5 records in a database containing 10 records, the number of the first record will be 1, and not 6.</paragraph>
<paragraph role="note" id="par_id3153305" xml-lang="en-US" l10n="U" oldref="22">If you refer to fields in a different database (or in a different table or query within the same database), $[officename] determines the record number relative to the current selection.</paragraph>
<paragraph role="heading" id="hd_id3156109" xml-lang="en-US" level="2" l10n="U" oldref="23">Format</paragraph>
<paragraph role="paragraph" id="par_id3156122" xml-lang="en-US" l10n="CHG" oldref="24"><ahelp hid=".">Select the format of the field that you want to insert. This option is available for numerical, boolean, date and time fields.</ahelp><comment>see #i64135</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT" id="bm_id3150915" localize="false"/><paragraph role="heading" id="hd_id3150904" xml-lang="en-US" level="3" l10n="U" oldref="25">From database</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT" id="bm_id3150915" localize="false"/>
+<paragraph role="heading" id="hd_id3150904" xml-lang="en-US" level="3" l10n="U" oldref="25">From database</paragraph>
<paragraph role="paragraph" id="par_id3150922" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT">Uses the format defined in the selected database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_FLD_DB_PB_ADDDB" id="bm_id5024262" localize="false"/><paragraph role="heading" id="par_idN1076E" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_FLD_DB_PB_ADDDB" id="bm_id5024262" localize="false"/>
+<paragraph role="heading" id="par_idN1076E" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
<paragraph role="paragraph" id="par_idN10772" xml-lang="en-US" l10n="NEW"><ahelp hid="878711313">Opens a file open dialog where you can select a database file (*.odb). The selected file is added to the Databases Selection list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT" id="bm_id3154326" localize="false"/><paragraph role="heading" id="hd_id3155084" xml-lang="en-US" level="3" l10n="U" oldref="27">User defined</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT" id="bm_id3154326" localize="false"/>
+<paragraph role="heading" id="hd_id3155084" xml-lang="en-US" level="3" l10n="U" oldref="27">User defined</paragraph>
<paragraph role="paragraph" id="par_id3154333" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT">Applies the format that you select in the <emph>List of user-defined formats</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBNUMFORMAT" id="bm_id3150084" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT" id="bm_id3150087" localize="false"/><paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="3" l10n="U" oldref="29">List of user-defined formats</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT" id="bm_id3150087" localize="false"/>
+<paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="3" l10n="U" oldref="29">List of user-defined formats</paragraph>
<paragraph role="paragraph" id="par_id3150093" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT">Lists the available user-defined formats.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_PRINT_AS_MERGE" id="bm_id1835383" localize="false"/><paragraph role="heading" id="par_idN107FF" xml-lang="en-US" level="2" l10n="NEW">Printing a form letter</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PRINT_AS_MERGE" id="bm_id1835383" localize="false"/>
+<paragraph role="heading" id="par_idN107FF" xml-lang="en-US" level="2" l10n="NEW">Printing a form letter</paragraph>
<paragraph role="paragraph" id="par_idN10803" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When you print a document that contains database fields, a dialog asks you if you want to print a form letter. If you answer Yes, the <link href="text/swriter/01/01150000.xhp">Mail Merge</link> dialog opens where you can select the database records to print.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10812" xml-lang="en-US" level="3" l10n="NEW">Do not show warning again</paragraph>
<paragraph role="paragraph" id="par_idN10816" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Suppresses this dialog from now on. There is no easy way to get it back!</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04120212.xhp b/helpcontent2/source/text/swriter/01/04120212.xhp
index 9dc8b424e1..5133002add 100755
--- a/helpcontent2/source/text/swriter/01/04120212.xhp
+++ b/helpcontent2/source/text/swriter/01/04120212.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04120212.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -61,7 +61,7 @@ DEDR: reviewed</lastedited>
<paragraph role="paragraph" id="par_id3153810" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_COLLECTSAME">Replaces identical index entries with a single entry that lists the page numbers where the entry occurs in the document. For example, the entries "View 10, View 43" are combined as "View 10, 43".</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_USEFF" id="bm_id3151393" localize="false"/>
<paragraph role="heading" id="hd_id3147403" xml-lang="en-US" level="3" l10n="U" oldref="7">Combine identical entries with p or pp</paragraph>
-<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_USEFF">Replaces identical index entries that occur on the same page, or consecutive pages, with a single entry that lists the page number with a "p" or "pp" where the entry first occurs. For example, the entries "View 10, View 11, View 12" are combined as "View 10pp", and "View 10, View 10" as "View 10p).</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_USEFF">Replaces identical index entries, which occur also on the directly following page or pages, with a single entry that lists the first page number and a "p" or "pp". For example, the entries "View 10, View 11, View 12" are combined as "View 10pp", and "View 10, View 11" as "View 10p".</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_TOX_SELECT_CB_USE_DASH" id="bm_id3149353" localize="false"/>
<paragraph role="heading" id="hd_id3157870" xml-lang="en-US" level="3" l10n="U" oldref="9">Combine with -</paragraph>
<paragraph role="paragraph" id="par_id3145825" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW_CHECKBOX_TP_TOX_SELECT_CB_USE_DASH">Replaces identical index entries that occur on consecutive pages with a single entry and the page range where the entry occurs. For example, the entries "View 10, View 11, View 12" are combined as "View 10-12".</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04130100.xhp b/helpcontent2/source/text/swriter/01/04130100.xhp
index 93c369b62d..25bd7255e4 100755
--- a/helpcontent2/source/text/swriter/01/04130100.xhp
+++ b/helpcontent2/source/text/swriter/01/04130100.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04130100.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -48,10 +48,8 @@
<bookmark_value>resizing;objects and frames, by keyboard</bookmark_value>
</bookmark><comment>MW changed "objects;"</comment><paragraph role="heading" id="hd_id3154506" xml-lang="en-US" level="1" l10n="U" oldref="1">Resizing and Moving Frames, Objects With the Keyboard</paragraph>
<paragraph role="paragraph" id="par_id3145248" xml-lang="en-US" l10n="U" oldref="2">You can resize and move selected frames and objects with the keyboard.</paragraph>
-<paragraph role="paragraph" id="par_id3148771" xml-lang="en-US" l10n="U" oldref="4">To move a selected frame or object, press an arrow key. To move by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
-<paragraph role="paragraph" id="par_id3150762" xml-lang="en-US" l10n="U" oldref="5">To resize a selected frame or object, first press Ctrl+Tab. Now one of the handles blinks to show that it is selected. To select another handle, press Ctrl+Tab again. Press an arrow key to resize the object by one grid unit. To resize by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
+<paragraph role="paragraph" id="par_id3148771" xml-lang="en-US" l10n="U" oldref="4">To move a selected frame or object, press an arrow key. To move by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
+<paragraph role="paragraph" id="par_id3150762" xml-lang="en-US" l10n="U" oldref="5">To resize a selected frame or object, first press Ctrl+Tab. Now one of the handles blinks to show that it is selected. To select another handle, press Ctrl+Tab again. Press an arrow key to resize the object by one grid unit. To resize by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="6">The increment by which you move an object with the keyboard is determined by the document grid. To change the properties of the document grid, choose <link href="text/shared/optionen/01050100.xhp" name="Tools - Options - Text document - Grid"><emph>Tools - Options - %PRODUCTNAME Writer - Grid</emph></link>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/keyboard.xhp#keyboard"/>
diff --git a/helpcontent2/source/text/swriter/01/04200000.xhp b/helpcontent2/source/text/swriter/01/04200000.xhp
index f2cb09919a..33bba3a007 100644
--- a/helpcontent2/source/text/swriter/01/04200000.xhp
+++ b/helpcontent2/source/text/swriter/01/04200000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 04200000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,33 +30,34 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0104200000xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0104200000xml" indexer="include">
<title id="tit" xml-lang="en-US">Insert Script</title>
<filename>/text/swriter/01/04200000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-14T14:56:02">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/SW:MODALDIALOG:DLG_JAVAEDIT" id="bm_id3083451" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/FN_JAVAEDIT" id="bm_id106266" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/FN_JAVAEDIT" id="bm_id106266" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertScript" id="bm_id3146320" localize="false"/>
<paragraph role="heading" id="hd_id3147402" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Script</paragraph>
<paragraph role="paragraph" id="par_id3155620" xml-lang="en-US" l10n="U" oldref="2"><variable id="scripttext"><ahelp hid=".uno:InsertScript">Inserts a script at the current cursor position in an HTML or text document.</ahelp>
</variable></paragraph>
<section id="howtoget">
- <embed href="text/swriter/00/00000404.xhp#einfscript"/>
+<embed href="text/swriter/00/00000404.xhp#einfscript"/>
</section>
<paragraph role="paragraph" id="par_id3149880" xml-lang="en-US" l10n="U" oldref="4">An inserted script is indicated by a small green rectangle. If you do not see the rectangle, choose <emph>Tools - Options - HTML Document</emph> - <link href="text/shared/optionen/01040200.xhp" name="View"><emph>View</emph></link>, and select the <emph>Notes </emph>check box. To edit a script, double-click the green rectangle.</paragraph>
<paragraph role="paragraph" id="par_id3150572" xml-lang="en-US" l10n="U" oldref="5">If your document contains more than one script, the <emph>Edit Script</emph> dialog contains previous and next buttons to jump from script to script.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_JAVAEDIT:BTN_PREV" id="bm_id3149710" localize="false"/><embed href="text/swriter/00/00000004.xhp#nopfli"/>
-<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_JAVAEDIT:BTN_NEXT" id="bm_id3150761" localize="false"/><embed href="text/swriter/00/00000004.xhp#nopfre"/>
+<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_JAVAEDIT:BTN_PREV" id="bm_id3149710" localize="false"/>
+<paragraph role="paragraph" id="par_id0903200802541668" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Jump to Previous Script.</ahelp></paragraph>
+<embed href="text/swriter/00/00000004.xhp#nopfli"/>
+<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_JAVAEDIT:BTN_NEXT" id="bm_id3150761" localize="false"/>
+<paragraph role="paragraph" id="par_id0903200802541770" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Jump to Next Script.</ahelp></paragraph>
+<embed href="text/swriter/00/00000004.xhp#nopfre"/>
<paragraph role="paragraph" id="par_id3151184" xml-lang="en-US" l10n="U" oldref="6">To specify if the script is printed at the end of the page or at the end of the document, choose <emph>File - Print - Options</emph>, and select the appropriate check box.</paragraph>
<paragraph role="heading" id="hd_id3154644" xml-lang="en-US" level="2" l10n="U" oldref="7">Contents</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_JAVAEDIT:ED_TYPE" id="bm_id3151177" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/05030200.xhp b/helpcontent2/source/text/swriter/01/05030200.xhp
index 19068abaad..1b8a1c8037 100755
--- a/helpcontent2/source/text/swriter/01/05030200.xhp
+++ b/helpcontent2/source/text/swriter/01/05030200.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05030200.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriter0105030200xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0105030200xml" indexer="include">
<title id="tit" xml-lang="en-US">Text Flow</title>
<filename>/text/swriter/01/05030200.xhp</filename>
</topic>
@@ -46,50 +44,67 @@
<section id="textfluss">
<bookmark xml-lang="en-US" branch="index" id="bm_id2502212"><bookmark_value>text flow;at breaks</bookmark_value>
<bookmark_value>paragraphs;keeping together at breaks</bookmark_value>
+<bookmark_value>protecting;text flow</bookmark_value>
<bookmark_value>widows</bookmark_value>
<bookmark_value>orphans</bookmark_value>
+<bookmark_value>block protect, see also widows or orphans</bookmark_value>
</bookmark><comment>mw added two index entries</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_PARAGRAPH_EXT" id="bm_id3147406" localize="false"/><paragraph role="heading" id="hd_id3083447" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FORMAT_PARAGRAPH_EXT" id="bm_id3147406" localize="false"/>
+<paragraph role="heading" id="hd_id3083447" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link></paragraph>
<paragraph role="paragraph" id="par_id3145824" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_PARAGRAPH_EXT">Specify hyphenation and pagination options.</ahelp></paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#textfss"/>
+<embed href="text/swriter/00/00000405.xhp#textfss"/>
</section>
<paragraph role="heading" id="hd_id3149882" xml-lang="en-US" level="2" l10n="U" oldref="3">Hyphenation</paragraph>
<paragraph role="paragraph" id="par_id3150564" xml-lang="en-US" l10n="U" oldref="4">Specify the <link href="text/swriter/guide/using_hyphen.xhp" name="hyphenation">hyphenation</link> options for text documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN" id="bm_id3147171" localize="false"/><paragraph role="heading" id="hd_id3153920" xml-lang="en-US" level="3" l10n="U" oldref="5">Automatically</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN" id="bm_id3147171" localize="false"/>
+<paragraph role="heading" id="hd_id3153920" xml-lang="en-US" level="3" l10n="U" oldref="5">Automatically</paragraph>
<paragraph role="paragraph" id="par_id3154640" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN">Automatically inserts hyphens where they are needed in a paragraph.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE" id="bm_id3149286" localize="false"/><paragraph role="heading" id="hd_id3150766" xml-lang="en-US" level="3" l10n="U" oldref="7">Characters at line end</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE" id="bm_id3149286" localize="false"/>
+<paragraph role="heading" id="hd_id3150766" xml-lang="en-US" level="3" l10n="U" oldref="7">Characters at line end</paragraph>
<paragraph role="paragraph" id="par_id3149291" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE">Enter the minimum number of characters to leave at the end of the line before a hyphen is inserted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER" id="bm_id3147508" localize="false"/><paragraph role="heading" id="hd_id3145413" xml-lang="en-US" level="3" l10n="U" oldref="9">Characters at line begin</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER" id="bm_id3147508" localize="false"/>
+<paragraph role="heading" id="hd_id3145413" xml-lang="en-US" level="3" l10n="U" oldref="9">Characters at line begin</paragraph>
<paragraph role="paragraph" id="par_id3147515" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER">Enter the minimum number of characters that must appear at the beginning of the line after the hyphen.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH" id="bm_id3153530" localize="false"/><paragraph role="heading" id="hd_id3149804" xml-lang="en-US" level="3" l10n="U" oldref="11">Maximum no. of consecutive hyphens</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH" id="bm_id3153530" localize="false"/>
+<paragraph role="heading" id="hd_id3149804" xml-lang="en-US" level="3" l10n="U" oldref="11">Maximum no. of consecutive hyphens</paragraph>
<paragraph role="paragraph" id="par_id3153536" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH">Enter the maximum number of consecutive lines that can be hyphenated.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="2" l10n="U" oldref="43">Breaks</paragraph>
<paragraph role="paragraph" id="par_id3154470" xml-lang="en-US" l10n="U" oldref="44">Specify the page or column <link href="text/swriter/guide/page_break.xhp" name="break">break</link> options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK" id="bm_id3154567" localize="false"/><paragraph role="heading" id="hd_id3152957" xml-lang="en-US" level="3" l10n="CHG" oldref="15">Insert<comment>UFI: #i30777#</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK" id="bm_id3154567" localize="false"/>
+<paragraph role="heading" id="hd_id3152957" xml-lang="en-US" level="3" l10n="CHG" oldref="15">Insert<comment>UFI: #i30777#</comment></paragraph>
<paragraph role="paragraph" id="par_id3154574" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK">Select this check box, and then select the break type that you want to use.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKTYPE" id="bm_id3154189" localize="false"/><paragraph role="heading" id="hd_id3149687" xml-lang="en-US" level="3" l10n="U" oldref="39">Type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKTYPE" id="bm_id3154189" localize="false"/>
+<paragraph role="heading" id="hd_id3149687" xml-lang="en-US" level="3" l10n="U" oldref="39">Type</paragraph>
<paragraph role="paragraph" id="par_id3154195" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKTYPE">Select the break type that you want to insert.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKPOSITION" id="bm_id3155180" localize="false"/><paragraph role="heading" id="hd_id3145766" xml-lang="en-US" level="3" l10n="U" oldref="40">Position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKPOSITION" id="bm_id3155180" localize="false"/>
+<paragraph role="heading" id="hd_id3145766" xml-lang="en-US" level="3" l10n="U" oldref="40">Position</paragraph>
<paragraph role="paragraph" id="par_id3155187" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_BREAKPOSITION">Select where you want to insert the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL" id="bm_id3149494" localize="false"/><paragraph role="heading" id="hd_id3149482" xml-lang="en-US" level="3" l10n="U" oldref="25">With Page Style</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL" id="bm_id3149494" localize="false"/>
+<paragraph role="heading" id="hd_id3149482" xml-lang="en-US" level="3" l10n="U" oldref="25">With Page Style</paragraph>
<paragraph role="paragraph" id="par_id3143275" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL">Select this check box, and then select the page style that you want to use for the first page after the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL" id="bm_id3154831" localize="false"/><paragraph role="heading" id="hd_id3149104" xml-lang="en-US" level="3" l10n="U" oldref="27">Page Style</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL" id="bm_id3154831" localize="false"/>
+<paragraph role="heading" id="hd_id3149104" xml-lang="en-US" level="3" l10n="U" oldref="27">Page Style</paragraph>
<paragraph role="paragraph" id="par_id3154837" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL">Select the formatting style to use for the first page after the break.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM" id="bm_id3151257" localize="false"/><paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="3" l10n="U" oldref="37">Page number</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM" id="bm_id3151257" localize="false"/>
+<paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="3" l10n="U" oldref="37">Page number</paragraph>
<paragraph role="paragraph" id="par_id3147089" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM">Enter the page number that you want to appear on the first page after the break. If you want to use the current page numbering, select "0".</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148978" xml-lang="en-US" level="2" l10n="U" oldref="13">Options</paragraph>
<paragraph role="paragraph" id="par_id3147219" xml-lang="en-US" l10n="U" oldref="14">Specify the text flow options for paragraphs that appear before and after a page break.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER" id="bm_id3149033" localize="false"/><paragraph role="heading" id="hd_id3153635" xml-lang="en-US" level="3" l10n="U" oldref="29">Do not split paragraph</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER" id="bm_id3149033" localize="false"/>
+<paragraph role="heading" id="hd_id3153635" xml-lang="en-US" level="3" l10n="U" oldref="29">Do not split paragraph</paragraph>
<paragraph role="paragraph" id="par_id3149040" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER">Shifts the entire paragraph to the next page or column after a break is inserted.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER" id="bm_id3152772" localize="false"/><paragraph role="heading" id="hd_id3147585" xml-lang="en-US" level="3" l10n="U" oldref="31">Keep with next paragraph</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER" id="bm_id3152772" localize="false"/>
+<paragraph role="heading" id="hd_id3147585" xml-lang="en-US" level="3" l10n="U" oldref="31">Keep with next paragraph</paragraph>
<paragraph role="paragraph" id="par_id3152779" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER">Keeps the current paragraph and the following paragraph together when a break or column break is inserted.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS" id="bm_id3153356" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS" id="bm_id3153361" localize="false"/><paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="33">Orphan control</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS" id="bm_id3153361" localize="false"/>
+<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="3" l10n="U" oldref="33">Orphan control</paragraph>
<paragraph role="paragraph" id="par_id3156279" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS">Specifies the minimum number of lines in a paragraph before a page break. Select this check box, and then enter a number in the <emph>Lines </emph>box.</ahelp> If the number of lines at the end of the page is less than the amount specified in the <emph>Lines </emph>box, the paragraph is shifted to the next page.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:TRISTATEBOX:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS" id="bm_id3145780" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS" id="bm_id3145784" localize="false"/><paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="3" l10n="U" oldref="35">Widow control</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS" id="bm_id3145784" localize="false"/>
+<paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="3" l10n="U" oldref="35">Widow control</paragraph>
<paragraph role="paragraph" id="par_id3155918" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS">Specifies the minimum number of lines in a paragraph in the first page after the break. Select this check box, and then enter a number in the <emph>Lines </emph>box.</ahelp> If the number of lines at the top of the page is less than the amount specified in the <emph>Lines </emph>box, the position of the break is adjusted.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="45"><link href="text/shared/00/00000005.xhp#schuster" name="Orphans">Orphans</link>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05040500.xhp b/helpcontent2/source/text/swriter/01/05040500.xhp
index 3a42e51602..6a6ee02e7b 100644
--- a/helpcontent2/source/text/swriter/01/05040500.xhp
+++ b/helpcontent2/source/text/swriter/01/05040500.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,8 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05040500.xhp,v $
- *
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +35,7 @@
<meta>
-<topic id="textswriter0105040500xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0105040500xml" indexer="include">
<title id="tit" xml-lang="en-US">Columns</title>
<filename>/text/swriter/01/05040500.xhp</filename>
</topic>
@@ -76,7 +74,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3149287" xml-lang="en-US" l10n="E">
-<image id="img_id3149750" src="res/sc06301.png" width="0.222in" height="0.222in"><alt id="alt_id3149750" xml-lang="en-US">Icon</alt>
+<image id="img_id3149750" src="res/sc06301.png" width="0.564cm" height="0.564cm"><alt id="alt_id3149750" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -92,7 +90,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="E">
-<image id="img_id3152948" src="res/sc06300.png" width="0.222in" height="0.222in"><alt id="alt_id3152948" xml-lang="en-US">Icon</alt>
+<image id="img_id3152948" src="res/sc06300.png" width="0.564cm" height="0.564cm"><alt id="alt_id3152948" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -130,9 +128,7 @@
<paragraph role="heading" id="hd_id3151248" xml-lang="en-US" level="2" l10n="U" oldref="50">Apply to</paragraph>
<paragraph role="paragraph" id="par_id3154827" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SW_LISTBOX_DLG_COLUMN_LB_APPLY_TO">Select the item that you want to apply the column layout to.</ahelp> This option is only available if you access this dialog by choosing <emph>Format - Columns</emph>.</paragraph>
<section id="textflow">
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_FORMAT_TABLE_LB_TEXTDIRECTION" id="bm_id3149791" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXPAGE_EXT_PARAGRAPH_LB_TEXTDIRECTION" id="bm_id3149797" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_COLUMN_LB_TEXTDIRECTION" id="bm_id3148971" localize="false"/><embed href="text/shared/01/05030700.xhp#textflow"/>
+<embed href="text/shared/01/05030700.xhp#textflow"/>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05060200.xhp b/helpcontent2/source/text/swriter/01/05060200.xhp
index afdf86768c..7657c504ff 100644
--- a/helpcontent2/source/text/swriter/01/05060200.xhp
+++ b/helpcontent2/source/text/swriter/01/05060200.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05060200.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,29 +32,26 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0105060200xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0105060200xml" indexer="include">
<title id="tit" xml-lang="en-US">Wrap</title>
<filename>/text/swriter/01/05060200.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-06-26T14:51:26">FPE: Fixed a missing heading</lastedited>
-</history>
</meta>
<body>
<section id="umlauf">
<bookmark xml-lang="en-US" branch="hid/HID_FRM_EXT" id="bm_id3153538" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_DRAW_WRAP_DLG" id="bm_id6339381" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:TextWrap" id="bm_id3154564" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:WrapMenu" id="bm_id0801200803335347" localize="false"/>
<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05060200.xhp" name="Wrap">Wrap</link></paragraph>
<paragraph role="paragraph" id="par_id3154478" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="umlauftext"><ahelp hid=".uno:TextWrap">Specify the way you want text to wrap around an object.</ahelp> You can also specify the spacing between the text and the object.
</variable></paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#grafikumlauf"/>
+<embed href="text/swriter/00/00000405.xhp#grafikumlauf"/>
</section>
<paragraph role="tip" id="par_id3151249" xml-lang="en-US" l10n="U" oldref="56">To wrap text around a table, place the table in a frame, and then wrap the text around the frame.</paragraph>
<paragraph role="heading" id="hd_id3154829" xml-lang="en-US" level="2" l10n="U" oldref="3">Settings</paragraph>
@@ -66,12 +63,12 @@
</variable></paragraph>
<table id="tbl_id3152738">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149038" xml-lang="en-US" l10n="E">
-<image id="img_id3149044" src="sw/imglst/wr07.png" width="0.4307inch" height="0.4307inch"><alt id="alt_id3149044" xml-lang="en-US">Icon</alt>
+<image id="img_id3149044" src="sw/imglst/wr07.png" width="0.82cm" height="0.82cm"><alt id="alt_id3149044" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155139" xml-lang="en-US" l10n="U" oldref="49">None</paragraph>
</tablecell>
</tablerow>
@@ -82,12 +79,12 @@
<paragraph role="paragraph" id="par_id3149171" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_LEFT">Wraps text on the left side of the object if there is enough space.</ahelp></paragraph>
<table id="tbl_id3151031">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3145774" xml-lang="en-US" l10n="E">
-<image id="img_id3145780" src="sw/imglst/wr02.png" width="0.4307inch" height="0.4307inch"><alt id="alt_id3145780" xml-lang="en-US">Icon</alt>
+<image id="img_id3145780" src="sw/imglst/wr02.png" width="0.82cm" height="0.82cm"><alt id="alt_id3145780" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="CHG" oldref="43">Before</paragraph>
</tablecell>
</tablerow>
@@ -98,12 +95,12 @@
<paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_RIGHT">Wraps text on the right side of the object if there is enough space.</ahelp></paragraph>
<table id="tbl_id3147426">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="E">
-<image id="img_id3149567" src="sw/imglst/wr03.png" width="0.4307inch" height="0.4307inch"><alt id="alt_id3149567" xml-lang="en-US">Icon</alt>
+<image id="img_id3149567" src="sw/imglst/wr03.png" width="0.82cm" height="0.82cm"><alt id="alt_id3149567" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3155966" xml-lang="en-US" l10n="CHG" oldref="44">After</paragraph>
</tablecell>
</tablerow>
@@ -111,17 +108,18 @@
<bookmark xml-lang="en-US" branch="hid/.uno:WrapOn" id="bm_id3149224" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_PARALLEL" id="bm_id3149228" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAP" id="bm_id0801200803382855" localize="false"/>
<paragraph role="heading" id="hd_id3149213" xml-lang="en-US" level="3" l10n="U" oldref="21">Parallel</paragraph>
<paragraph role="paragraph" id="par_id3147740" xml-lang="en-US" l10n="U" oldref="22"><variable id="seitenumlauftext"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_PARALLEL">Wraps text on all four sides of the border frame of the object.</ahelp>
</variable></paragraph>
<table id="tbl_id3146337">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148845" xml-lang="en-US" l10n="E">
-<image id="img_id3148851" src="sw/imglst/wr04.png" width="0.4307inch" height="0.4307inch"><alt id="alt_id3148851" xml-lang="en-US">Icon</alt>
+<image id="img_id3148851" src="sw/imglst/wr04.png" width="0.82cm" height="0.82cm"><alt id="alt_id3148851" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3148442" xml-lang="en-US" l10n="U" oldref="45">Parallel</paragraph>
</tablecell>
</tablerow>
@@ -135,12 +133,12 @@
</variable></paragraph>
<table id="tbl_id3145320">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150162" xml-lang="en-US" l10n="E">
-<image id="img_id3150169" src="sw/imglst/wr05.png" width="0.4307inch" height="0.4307inch"><alt id="alt_id3150169" xml-lang="en-US">Icon</alt>
+<image id="img_id3150169" src="sw/imglst/wr05.png" width="0.82cm" height="0.82cm"><alt id="alt_id3150169" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3156104" xml-lang="en-US" l10n="U" oldref="50">Through</paragraph>
</tablecell>
</tablerow>
@@ -154,12 +152,12 @@
</variable></paragraph>
<table id="tbl_id3156129">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3150904" xml-lang="en-US" l10n="E">
-<image id="img_id3150910" src="sw/imglst/wr06.png" width="0.4307inch" height="0.4307inch"><alt id="alt_id3150910" xml-lang="en-US">Icon</alt>
+<image id="img_id3150910" src="sw/imglst/wr06.png" width="0.82cm" height="0.82cm"><alt id="alt_id3150910" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149237" xml-lang="en-US" l10n="U" oldref="46">Optimal</paragraph>
</tablecell>
</tablerow>
@@ -177,7 +175,7 @@
<bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAPTHRU_TRANSP" id="bm_id7503356" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapThroughTransparent" id="bm_id3150090" localize="false"/>
<paragraph role="heading" id="hd_id3148790" xml-lang="en-US" level="3" l10n="U" oldref="30">In Background</paragraph>
-<paragraph role="paragraph" id="par_id3150100" xml-lang="en-US" l10n="U" oldref="31"><variable id="hintergrundtext"><ahelp hid=".uno:WrapThroughTransparent">Moves the selected object to the background. This options is only available if you selected the<emph> Through</emph> wrap type.</ahelp>
+<paragraph role="paragraph" id="par_id3150100" xml-lang="en-US" l10n="U" oldref="31"><variable id="hintergrundtext"><ahelp hid=".uno:WrapThroughTransparent">Moves the selected object to the background. This option is only available if you selected the<emph> Through</emph> wrap type.</ahelp>
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_FRM_WRAP:CB_OUTLINE" id="bm_id3149369" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_FRAME_WRAP_CONTOUR" id="bm_id2682094" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/05060201.xhp b/helpcontent2/source/text/swriter/01/05060201.xhp
index 97959a3efe..6f29d8bf06 100644
--- a/helpcontent2/source/text/swriter/01/05060201.xhp
+++ b/helpcontent2/source/text/swriter/01/05060201.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05060201.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -253,7 +253,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3154058" xml-lang="en-US" l10n="E">
-<image id="img_id3154073" src="res/sc05700.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3154073" xml-lang="en-US">Icon</alt>
+<image id="img_id3154073" src="res/commandimagelist/sc_redo.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3154073" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/01/05090201.xhp b/helpcontent2/source/text/swriter/01/05090201.xhp
index 71062792cc..dbf511c3ae 100644
--- a/helpcontent2/source/text/swriter/01/05090201.xhp
+++ b/helpcontent2/source/text/swriter/01/05090201.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05090201.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -51,31 +51,31 @@
<paragraph role="heading" id="hd_id3150564" xml-lang="en-US" level="2" l10n="U" oldref="3">Resizing Columns and Rows</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3153920" xml-lang="en-US" l10n="U" oldref="4">To resize a column, place the cursor in a table cell, hold down Alt, and then press the left or the right arrow. To resize the column without changing the width of the table, hold down Alt+Ctrl, and then press the left or the right arrows.</paragraph>
+<paragraph role="listitem" id="par_id3153920" xml-lang="en-US" l10n="U" oldref="4">To resize a column, place the cursor in a table cell, hold down Alt, and then press the left or the right arrow. To resize the column without changing the width of the table, hold down <switchinline select="sys"><caseinline select="MAC">Command+Option</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>, and then press the left or the right arrows.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3147566" xml-lang="en-US" l10n="U" oldref="5">To increase the left indent of the table, hold down Alt+Shift, and then press the right arrow.</paragraph>
+<paragraph role="listitem" id="par_id3147566" xml-lang="en-US" l10n="U" oldref="5">To increase the left indent of the table, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift, and then press the right arrow.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150759" xml-lang="en-US" l10n="U" oldref="11">To resize a row, place the cursor in the row, hold down Alt, and then press the up or the down arrows.</paragraph>
+<paragraph role="listitem" id="par_id3150759" xml-lang="en-US" l10n="U" oldref="11">To resize a row, place the cursor in the row, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press the up or the down arrows.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149286" xml-lang="en-US" l10n="U" oldref="12">To move the table downwards on the page, hold down Alt+Shift, and then press the down arrow.</paragraph>
+<paragraph role="listitem" id="par_id3149286" xml-lang="en-US" l10n="U" oldref="12">To move the table downwards on the page, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift, and then press the down arrow.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3151176" xml-lang="en-US" level="2" l10n="U" oldref="8">Inserting and deleting columns or rows</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3147512" xml-lang="en-US" l10n="U" oldref="9">To insert a column, place the cursor in a table cell, hold down Alt and press Insert, release, and then press the left or the right arrow.</paragraph>
+<paragraph role="listitem" id="par_id3147512" xml-lang="en-US" l10n="U" oldref="9">To insert a column, place the cursor in a table cell, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and press Insert, release, and then press the left or the right arrow.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="13">To delete a column, place the cursor in the column that you want to delete, hold down Alt and press Delete, release, and then press the left or the right arrow.</paragraph>
+<paragraph role="listitem" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="13">To delete a column, place the cursor in the column that you want to delete, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and press Delete, release, and then press the left or the right arrow.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3154105" xml-lang="en-US" l10n="U" oldref="14">To insert a row, place the cursor in a table cell, hold down Alt and press Insert, release, and then press the up or the down arrow.</paragraph>
+<paragraph role="listitem" id="par_id3154105" xml-lang="en-US" l10n="U" oldref="14">To insert a row, place the cursor in a table cell, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and press Insert, release, and then press the up or the down arrow.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153531" xml-lang="en-US" l10n="U" oldref="15">To delete a row, place the cursor in the row that you want to delete, hold down Alt and press Delete, release, and then press the up or the down arrow.</paragraph>
+<paragraph role="listitem" id="par_id3153531" xml-lang="en-US" l10n="U" oldref="15">To delete a row, place the cursor in the row that you want to delete, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and press Delete, release, and then press the up or the down arrow.</paragraph>
</listitem>
</list>
<paragraph role="note" id="par_id3150983" xml-lang="en-US" l10n="U" oldref="10">To change the behavior of tables in a text document, choose <link href="text/shared/optionen/01040500.xhp" name="Tools - Options - Text Document - Table"><emph>Tools - Options - %PRODUCTNAME Writer - Table</emph></link>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05100000.xhp b/helpcontent2/source/text/swriter/01/05100000.xhp
index 3d261e4d11..93afce75b5 100755
--- a/helpcontent2/source/text/swriter/01/05100000.xhp
+++ b/helpcontent2/source/text/swriter/01/05100000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05100000.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -50,12 +50,10 @@
<section id="howtoget">
<embed href="text/swriter/00/00000405.xhp#zelle"/>
</section>
-<embed href="text/swriter/01/05100100.xhp#verbinden"/>
-<paragraph role="heading" id="hd_id3154278" xml-lang="en-US" level="2" l10n="CHG" oldref="4"><link href="text/swriter/01/05100200.xhp" name="Split">Split</link></paragraph>
-<embed href="text/swriter/01/05100200.xhp#teilentext"/>
-<embed href="text/swriter/01/05100500.xhp#oben"/>
-<embed href="text/swriter/01/05100600.xhp#mitte"/>
-<embed href="text/swriter/01/05100700.xhp#unten"/>
+<embed href="text/shared/01/05100100.xhp#verbinden"/>
+<embed href="text/shared/01/05100500.xhp#oben"/>
+<embed href="text/shared/01/05100600.xhp#mitte"/>
+<embed href="text/shared/01/05100700.xhp#unten"/>
<embed href="text/swriter/01/05100300.xhp#schuetzen"/>
<embed href="text/swriter/01/05100400.xhp#aufheben"/>
</body>
diff --git a/helpcontent2/source/text/swriter/01/05100100.xhp b/helpcontent2/source/text/swriter/01/05100100.xhp
index 3b673efa61..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/01/05100100.xhp
+++ b/helpcontent2/source/text/swriter/01/05100100.xhp
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05100100.xhp,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************-->
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105100100xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Merge</title>
-<filename>/text/swriter/01/05100100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-
-
- <section id="verbinden">
- <bookmark xml-lang="en-US" branch="hid/FN_TABLE_MERGE_CELLS" id="bm_id1766491" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:MergeCells" xml-lang="en-US" id="bm_id3149051"/><paragraph id="hd_id3154765" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05100100.xhp" name="Merge">Merge</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3147406" xml-lang="en-US" oldref="2"><variable id="verbindentext"><ahelp hid=".uno:MergeCells" visibility="visible">Combines the contents of the selected table cells into a single cell.</ahelp></variable></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#verbindenze"/>
-</section>
- <paragraph role="warning" id="par_id3153718" l10n="U" xml-lang="en-US" oldref="3">Merging cells can lead to calculation errors in formulas in the table.</paragraph>
-
- </body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05100200.xhp b/helpcontent2/source/text/swriter/01/05100200.xhp
index d15e3f04c0..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/01/05100200.xhp
+++ b/helpcontent2/source/text/swriter/01/05100200.xhp
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- ***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05100200.xhp,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105100200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Split Cells</title>
-<filename>/text/swriter/01/05100200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-24T10:52:43">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="zellenteilen">
-<bookmark xml-lang="en-US" branch="hid/FN_TABLE_SPLIT_CELLS" id="bm_id3525727" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:SplitCell" id="bm_id3147403" localize="false"/><comment>UFI: removed double help ids</comment>
-<paragraph role="heading" id="hd_id3154654" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05100200.xhp" name="Split Cells">Split Cells</link></paragraph>
-<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="2"><variable id="teilentext"><ahelp hid=".uno:SplitCell">Splits the cell or group of cells horizontally or vertically into the number of cells that you enter.</ahelp>
-</variable></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#teilenz"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/SW_NUMERICFIELD_DLG_SPLIT_ED_COUNT" id="bm_id3154507" localize="false"/>
-<paragraph role="heading" id="hd_id3154558" xml-lang="en-US" level="2" l10n="U" oldref="3">Split cell into</paragraph>
-<paragraph role="paragraph" id="par_id3150021" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:NUMERICFIELD:DLG_SPLIT:ED_COUNT">Enter the number of rows or columns that you want to split the selected cell(s) into.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145249" xml-lang="en-US" level="2" l10n="U" oldref="5">Direction</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_HORZ" id="bm_id3149028" localize="false"/>
-<paragraph role="heading" id="hd_id3150568" xml-lang="en-US" level="3" l10n="U" oldref="7">Horizontally</paragraph>
-<paragraph role="paragraph" id="par_id3153927" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:IMAGERADIOBUTTON:DLG_SPLIT:RB_HORZ">Splits the selected cell(s) into the number of rows that you specify in the <emph>Split cell into </emph>box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_SPLIT_CB_PROP" id="bm_id3151185" localize="false"/>
-<paragraph role="heading" id="hd_id3147566" xml-lang="en-US" level="3" l10n="U" oldref="11">Into equal proportions</paragraph>
-<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW_CHECKBOX_DLG_SPLIT_CB_PROP">Splits cells into rows of equal height.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_VERT" id="bm_id3151168" localize="false"/>
-<paragraph role="heading" id="hd_id3150765" xml-lang="en-US" level="3" l10n="U" oldref="9">Vertically</paragraph>
-<paragraph role="paragraph" id="par_id3145410" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:IMAGERADIOBUTTON:DLG_SPLIT:RB_VERT">Splits the selected cell(s) into the number of columns that you specify in the <emph>Split cell into </emph>box.</ahelp></paragraph>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05100500.xhp b/helpcontent2/source/text/swriter/01/05100500.xhp
index ef563f8e10..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/01/05100500.xhp
+++ b/helpcontent2/source/text/swriter/01/05100500.xhp
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05100500.xhp,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************--><helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105100500xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Top</title>
-<filename>/text/swriter/01/05100500.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-
-
- <section id="oben">
- <bookmark xml-lang="en-US" branch="hid/FN_TABLE_VERT_NONE" id="bm_id5466554" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:CellVertTop" xml-lang="en-US" id="bm_id3149048"/><paragraph id="hd_id3154765" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05100500.xhp" name="Top">Top</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3151390" xml-lang="en-US" oldref="2"><ahelp hid=".uno:CellVertTop" visibility="visible">Aligns the contents of the cell to the top edge of the cell.</ahelp></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#zelleoben"/>
-</section>
- </body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05100600.xhp b/helpcontent2/source/text/swriter/01/05100600.xhp
index 5eaf8078ca..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/01/05100600.xhp
+++ b/helpcontent2/source/text/swriter/01/05100600.xhp
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05100600.xhp,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************--><helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105100600xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Middle</title>
-<filename>/text/swriter/01/05100600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-
-
- <section id="mitte">
- <bookmark xml-lang="en-US" branch="hid/FN_TABLE_VERT_CENTER" id="bm_id4218858" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:CellVertCenter" xml-lang="en-US" id="bm_id3154766"/><paragraph id="hd_id3149874" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05100600.xhp" name="Middle">Middle</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3149048" xml-lang="en-US" oldref="2"><ahelp hid=".uno:CellVertCenter" visibility="visible">Centers the contents of the cell horizontally in the cell.</ahelp></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#zellemitte"/>
-</section>
- </body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05100700.xhp b/helpcontent2/source/text/swriter/01/05100700.xhp
index 82cdd52c8e..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/01/05100700.xhp
+++ b/helpcontent2/source/text/swriter/01/05100700.xhp
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05100700.xhp,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************--><helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105100700xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Bottom</title>
-<filename>/text/swriter/01/05100700.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-
-
- <section id="unten">
- <bookmark xml-lang="en-US" branch="hid/FN_TABLE_VERT_BOTTOM" id="bm_id3581992" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:CellVertBottom" xml-lang="en-US" id="bm_id3151244"/><paragraph id="hd_id3150249" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05100700.xhp" name="Bottom">Bottom</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3154764" xml-lang="en-US" oldref="2"><ahelp hid=".uno:CellVertBottom" visibility="visible">Aligns the contents of the cell to the bottom edge of the cell.</ahelp></paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#zelleunten"/>
-</section>
- </body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05110000.xhp b/helpcontent2/source/text/swriter/01/05110000.xhp
index 67aa669e1e..92c8b20c9a 100755
--- a/helpcontent2/source/text/swriter/01/05110000.xhp
+++ b/helpcontent2/source/text/swriter/01/05110000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05110000.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,7 +54,7 @@
<embed href="text/swriter/01/05110100.xhp#hoehetext"/>
<paragraph role="heading" id="hd_id3149349" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/swriter/01/05110200.xhp" name="Optimal Height">Optimal Height</link></paragraph>
<embed href="text/swriter/01/05110200.xhp#zeilenhoehetext"/>
-<embed href="text/swriter/01/05110600.xhp#gleichverteilen"/>
+<embed href="text/shared/01/05110600m.xhp#gleichverteilen"/>
<embed href="text/swriter/01/05110300.xhp#selektieren"/>
<paragraph role="heading" id="hd_id3149883" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/swriter/01/05120400.xhp" name="Insert...">Insert...</link></paragraph>
<embed href="text/swriter/01/05120400.xhp#einfuegentext"/>
diff --git a/helpcontent2/source/text/swriter/01/05110600.xhp b/helpcontent2/source/text/swriter/01/05110600.xhp
index b698c3823f..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/01/05110600.xhp
+++ b/helpcontent2/source/text/swriter/01/05110600.xhp
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05110600.xhp,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105110600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Space Equally</title>
-<filename>/text/swriter/01/05110600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-28T11:27:10">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="gleichverteilen">
-<bookmark xml-lang="en-US" branch="hid/FN_TABLE_BALANCE_ROWS" id="bm_id2550261" localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:DistributeRows" id="bm_id3151240" localize="false"/>
-<paragraph role="heading" id="hd_id3149871" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/01/05110600.xhp" name="Space Equally">Space Rows Equally</link></paragraph>
-<paragraph role="paragraph" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="2"><variable id="verteilentext"><ahelp hid=".uno:DistributeRows">Adjusts the height of the selected rows to match the height of the tallest row in the selection.</ahelp>
-</variable></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#verteilenzeile"/>
-</section>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05120000.xhp b/helpcontent2/source/text/swriter/01/05120000.xhp
index 76053ab981..9851b6389c 100755
--- a/helpcontent2/source/text/swriter/01/05120000.xhp
+++ b/helpcontent2/source/text/swriter/01/05120000.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05120000.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,7 +54,7 @@
<embed href="text/swriter/01/05120100.xhp#breitetext"/>
<paragraph role="heading" id="hd_id3154558" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/swriter/01/05120200.xhp" name="Optimal width">Optimal width</link></paragraph>
<embed href="text/swriter/01/05120200.xhp#spaltenbreitetext"/>
-<embed href="text/swriter/01/05120600.xhp#gleichverteilen"/>
+<embed href="text/shared/01/05120600.xhp#gleichverteilen"/>
<embed href="text/swriter/01/05120300.xhp#selektieren"/>
<paragraph role="heading" id="hd_id3150564" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/swriter/01/05120400.xhp" name="Insert...">Insert...</link></paragraph>
<embed href="text/swriter/01/05120400.xhp#einfuegentext"/>
diff --git a/helpcontent2/source/text/swriter/01/05120600.xhp b/helpcontent2/source/text/swriter/01/05120600.xhp
index c083684767..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/01/05120600.xhp
+++ b/helpcontent2/source/text/swriter/01/05120600.xhp
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 05120600.xhp,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105120600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Space Equally</title>
-<filename>/text/swriter/01/05120600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-28T11:27:56">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="gleichverteilen">
-<bookmark xml-lang="en-US" branch="hid/FN_TABLE_BALANCE_CELLS" id="bm_id2213069" localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:DistributeColumns" id="bm_id3149055" localize="false"/>
-<paragraph role="heading" id="hd_id3153811" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/01/05120600.xhp" name="Space Equally">Space Columns Equally</link></paragraph>
-<paragraph role="paragraph" id="par_id3151389" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="verteilentext"><ahelp hid=".uno:DistributeColumns">Adjusts the width of the selected columns to match the width of the widest column in the selection.</ahelp> The total width of the table cannot exceed the width of the page.
-</variable></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#verteilenspalte"/>
-</section>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/05130100.xhp b/helpcontent2/source/text/swriter/01/05130100.xhp
index c9d863c898..7f1c31c770 100644
--- a/helpcontent2/source/text/swriter/01/05130100.xhp
+++ b/helpcontent2/source/text/swriter/01/05130100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 05130100.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0105130100xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0105130100xml" indexer="include">
<title id="tit" xml-lang="en-US">Condition</title>
<filename>/text/swriter/01/05130100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-22T13:17:40">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="bedingung">
@@ -51,7 +49,7 @@
<paragraph role="paragraph" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="2">Define conditions for conditional styles here.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/swriter/00/00000405.xhp#vorlagenbedingt"/>
+<embed href="text/swriter/00/00000405.xhp#vorlagenbedingt"/>
</section>
<paragraph role="paragraph" id="par_id3151391" xml-lang="en-US" l10n="CHG" oldref="10">Conditional styles are paragraph styles that have different properties depending on the context. Once defined, you cannot change the conditional properties of a conditional style.</paragraph>
<paragraph role="paragraph" id="par_id3149349" xml-lang="en-US" l10n="U" oldref="11">$[officename] applies the paragraph properties of conditional styles as follows (the bold terms correspond to the titles of dialog fields): If a paragraph formatted with a conditional style is in a <emph>Context</emph> that has an <emph>Applied Style</emph> linked to it, then the <emph>Paragraph Style</emph> from that condition is used. If no style is linked to the <emph>Context</emph>, then the attributes defined in the conditional style apply. The following example illustrates this relationship:</paragraph>
@@ -89,7 +87,7 @@
<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_CONDCOLL:LB_STYLE" id="bm_id3159190" localize="false"/>
<paragraph role="heading" id="hd_id3154194" xml-lang="en-US" level="2" l10n="U" oldref="6">Styles</paragraph>
<paragraph role="paragraph" id="par_id3159195" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:LISTBOX:TP_CONDCOLL:LB_STYLE">A list of all Paragraph Styles which can be assigned to a context is contained in the list box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_CONDCOLL:LB_FILTER" id="bm_id3155186" localize="false"/><embed href="text/swriter/01/05130000.xhp#vorlagenbereich"/>
+<embed href="text/swriter/01/05130000.xhp#vorlagenbereich"/>
<bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_CONDCOLL:PB_REMOVE" id="bm_id3151329" localize="false"/>
<paragraph role="heading" id="hd_id3149306" xml-lang="en-US" level="2" l10n="U" oldref="8">Remove</paragraph>
<paragraph role="paragraph" id="par_id3151335" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:PUSHBUTTON:TP_CONDCOLL:PB_REMOVE">Click here to remove the current context assigned to the selected style.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/makefile.mk b/helpcontent2/source/text/swriter/01/makefile.mk
index f1670c9c92..7232a42131 100644
--- a/helpcontent2/source/text/swriter/01/makefile.mk
+++ b/helpcontent2/source/text/swriter/01/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.11 $
+# $Revision: 1.11.4.4 $
#
# This file is part of OpenOffice.org.
#
@@ -152,26 +152,19 @@ XHPFILES = \
05090201.xhp \
05090300.xhp \
05100000.xhp \
- 05100100.xhp \
- 05100200.xhp \
05100300.xhp \
05100400.xhp \
- 05100500.xhp \
- 05100600.xhp \
- 05100700.xhp \
05110000.xhp \
05110100.xhp \
05110200.xhp \
05110300.xhp \
05110500.xhp \
- 05110600.xhp \
05120000.xhp \
05120100.xhp \
05120200.xhp \
05120300.xhp \
05120400.xhp \
05120500.xhp \
- 05120600.xhp \
05130000.xhp \
05130002.xhp \
05130004.xhp \
diff --git a/helpcontent2/source/text/swriter/02/04210000.xhp b/helpcontent2/source/text/swriter/02/04210000.xhp
index 72aa908c29..e69de29bb2 100644
--- a/helpcontent2/source/text/swriter/02/04210000.xhp
+++ b/helpcontent2/source/text/swriter/02/04210000.xhp
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: 04210000.xhp,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter0204210000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Optimize</title>
-<filename>/text/swriter/02/04210000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-28T11:19:34">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="optimieren">
-<bookmark xml-lang="en-US" branch="hid/FN_OPTIMIZE_TABLE" id="bm_id6810577" localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:OptimizeTable" id="bm_id3149292" localize="false"/>
-<paragraph role="heading" id="hd_id3151185" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/02/04210000.xhp" name="Optimize">Optimize</link></paragraph>
-<paragraph role="paragraph" id="par_id3145412" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:OptimizeTable">Opens a toolbar that contains functions for optimizing the rows and columns in a table.</ahelp></paragraph>
-</section>
-<section id="syoptimieren">
-<table id="tbl_id3145760">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155899" xml-lang="en-US" l10n="E">
-<image id="img_id3149684" src="res/commandimagelist/sc_optimizetable.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149684" xml-lang="en-US">Icon</alt>
- </image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3143270" xml-lang="en-US" l10n="U" oldref="4">Optimize</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</section>
-<paragraph role="paragraph" id="par_id3149485" xml-lang="en-US" l10n="U" oldref="5">You can select from the following functions:</paragraph>
-<embed href="text/swriter/01/05120600.xhp#gleichverteilen"/>
-<embed href="text/swriter/00/00000405.xhp#syverteilentext"/>
-<embed href="text/swriter/01/05110600.xhp#gleichverteilen"/>
-<embed href="text/swriter/00/00000405.xhp#syverteilenzeile"/>
-<paragraph role="heading" id="hd_id3153631" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/swriter/01/05110200.xhp" name="Optimal Height">Optimal Height</link></paragraph>
-<embed href="text/swriter/01/05110200.xhp#zeilenhoehetext"/>
-<embed href="text/swriter/00/00000405.xhp#syoptimalzeile"/>
-<paragraph role="heading" id="hd_id3145772" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/swriter/01/05120200.xhp" name="Optimal Column Width">Optimal Column Width</link></paragraph>
-<embed href="text/swriter/01/05120200.xhp#spaltenbreitetext"/>
-<embed href="text/swriter/00/00000405.xhp#syoptimalspalte"/>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/02/makefile.mk b/helpcontent2/source/text/swriter/02/makefile.mk
index a9131dced4..2e0b93dd5a 100644
--- a/helpcontent2/source/text/swriter/02/makefile.mk
+++ b/helpcontent2/source/text/swriter/02/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.10.4.4 $
#
# This file is part of OpenOffice.org.
#
@@ -53,7 +53,6 @@ XHPFILES = \
03220000.xhp \
04090000.xhp \
04100000.xhp \
- 04210000.xhp \
04220000.xhp \
04230000.xhp \
04240000.xhp \
diff --git a/helpcontent2/source/text/swriter/04/01020000.xhp b/helpcontent2/source/text/swriter/04/01020000.xhp
index 5a2f4ed07b..023a0896f7 100755
--- a/helpcontent2/source/text/swriter/04/01020000.xhp
+++ b/helpcontent2/source/text/swriter/04/01020000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01020000.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriter0401020000xml" indexer="include" status="PUBLISH">
+<topic id="textswriter0401020000xml" indexer="include">
<title id="tit" xml-lang="en-US">Shortcut Keys for %PRODUCTNAME Writer</title>
<filename>/text/swriter/04/01020000.xhp</filename>
</topic>
@@ -56,1041 +54,1059 @@
<paragraph role="heading" id="hd_id3149800" xml-lang="en-US" level="2" l10n="U" oldref="3">Function Keys for <item type="productname">%PRODUCTNAME</item> Writer</paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10663" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10668" xml-lang="en-US" l10n="NEW">Effect</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149486" xml-lang="en-US" l10n="U" oldref="7">F2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3143274" xml-lang="en-US" l10n="U" oldref="8">Formula Bar</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149821" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145774" xml-lang="en-US" l10n="U" oldref="10">Insert Fields</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3155912" xml-lang="en-US" l10n="U" oldref="11">F3</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155855" xml-lang="en-US" l10n="U" oldref="12">Complete AutoText</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3147411" xml-lang="en-US" l10n="U" oldref="13"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155060" xml-lang="en-US" l10n="U" oldref="14">Edit AutoText</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149839" xml-lang="en-US" l10n="U" oldref="15">F4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148847" xml-lang="en-US" l10n="U" oldref="16">Open Data Source View</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150097" xml-lang="en-US" l10n="CHG" oldref="19">Shift+F4</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153400" xml-lang="en-US" l10n="U" oldref="20">Select next frame<comment>UFI: see spec "OpenDocumentBehavior"</comment></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3156096" xml-lang="en-US" l10n="U" oldref="17">F5</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156110" xml-lang="en-US" l10n="U" oldref="18">Navigator on/off</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153118" xml-lang="en-US" l10n="U" oldref="21"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F5</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149628" xml-lang="en-US" l10n="CHG" oldref="22">Navigator on, go to page number</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149647" xml-lang="en-US" l10n="U" oldref="24">F7</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149957" xml-lang="en-US" l10n="U" oldref="25">Spellcheck</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149601" xml-lang="en-US" l10n="U" oldref="26"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149850" xml-lang="en-US" l10n="U" oldref="27">Thesaurus</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149869" xml-lang="en-US" l10n="U" oldref="28">F8</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145096" xml-lang="en-US" l10n="U" oldref="29">Extension mode</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3145116" xml-lang="en-US" l10n="U" oldref="30"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F8</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149593" xml-lang="en-US" l10n="U" oldref="31">Field shadings on / off</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3156250" xml-lang="en-US" l10n="U" oldref="32">Shift+F8</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156264" xml-lang="en-US" l10n="CHG" oldref="33">Additional selection mode</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id7121494" xml-lang="en-US" l10n="NEW">Ctrl+Shift+F8</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id9048432" xml-lang="en-US" l10n="CHG">Block selection mode</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3145408" xml-lang="en-US" l10n="U" oldref="34">F9</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155306" xml-lang="en-US" l10n="U" oldref="35">Update fields</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3155324" xml-lang="en-US" l10n="U" oldref="36"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154404" xml-lang="en-US" l10n="U" oldref="37">Show fields</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154423" xml-lang="en-US" l10n="U" oldref="38">Shift+F9</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153375" xml-lang="en-US" l10n="U" oldref="39">Calculate Table</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153394" xml-lang="en-US" l10n="U" oldref="40"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F9</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154865" xml-lang="en-US" l10n="CHG" oldref="41">Update Input Fields and Input Lists<comment>UFI: fixes #i30104#</comment></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3155883" xml-lang="en-US" l10n="U" oldref="43"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F10</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148674" xml-lang="en-US" l10n="U" oldref="44">Nonprinting Characters on/off</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148693" xml-lang="en-US" l10n="U" oldref="45">F11</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149978" xml-lang="en-US" l10n="CHG" oldref="46">Styles and Formatting window on/off</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149997" xml-lang="en-US" l10n="U" oldref="47">Shift+F11</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155926" xml-lang="en-US" l10n="U" oldref="48">Create Style</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
+<paragraph role="tablecontent" id="par_id0905200802191980" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F11</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id0905200802192020" xml-lang="en-US" l10n="NEW">Sets focus to Apply Style box<comment>i81468</comment></paragraph>
+</tablecell>
+</tablerow>
+<tablerow>
+<tablecell>
<paragraph role="tablecontent" id="hd_id3155945" xml-lang="en-US" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F11</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153020" xml-lang="en-US" l10n="U" oldref="50">Update Style</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153039" xml-lang="en-US" l10n="U" oldref="51">F12</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148959" xml-lang="en-US" l10n="U" oldref="52">Numbering on</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148979" xml-lang="en-US" l10n="U" oldref="53"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F12</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153650" xml-lang="en-US" l10n="U" oldref="54">Insert or edit Table</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3152749" xml-lang="en-US" l10n="U" oldref="55">Shift+F12</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152763" xml-lang="en-US" l10n="U" oldref="56">Bullets on</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153876" xml-lang="en-US" l10n="U" oldref="57"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F12</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153901" xml-lang="en-US" l10n="U" oldref="58">Numbering / Bullets off</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3147109" xml-lang="en-US" level="2" l10n="U" oldref="59">Shortcut Keys for <item type="productname">%PRODUCTNAME</item> Writer</paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10ACE" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN10AD3" xml-lang="en-US" l10n="NEW">Effect</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149785" xml-lang="en-US" l10n="U" oldref="60"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150220" xml-lang="en-US" l10n="U" oldref="62">Select All</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150239" xml-lang="en-US" l10n="U" oldref="63"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+J</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145219" xml-lang="en-US" l10n="U" oldref="65">Justify</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3145238" xml-lang="en-US" l10n="U" oldref="66"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+D</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150325" xml-lang="en-US" l10n="U" oldref="68">Double Underline</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148578" xml-lang="en-US" l10n="U" oldref="69"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+E</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148604" xml-lang="en-US" l10n="U" oldref="71">Centered</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3147016" xml-lang="en-US" l10n="U" oldref="72"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147041" xml-lang="en-US" l10n="U" oldref="74">Find and Replace</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150940" xml-lang="en-US" l10n="U" oldref="75"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+P</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150965" xml-lang="en-US" l10n="U" oldref="77">Superscript</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154363" xml-lang="en-US" l10n="U" oldref="78"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+L</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154389" xml-lang="en-US" l10n="U" oldref="80">Align Left</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150519" xml-lang="en-US" l10n="U" oldref="81"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+R</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147519" xml-lang="en-US" l10n="U" oldref="83">Align Right</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3147538" xml-lang="en-US" l10n="U" oldref="84"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+B</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153587" xml-lang="en-US" l10n="U" oldref="86">Subscript</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153606" xml-lang="en-US" l10n="U" oldref="87"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Y</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151268" xml-lang="en-US" l10n="U" oldref="89">Redo last action</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10D39" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+0 (zero)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10D64" xml-lang="en-US" l10n="NEW">Apply Default paragraph style<comment>UFI: see spec "Assign Keyboard Shortcuts to Styles"</comment></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3151287" xml-lang="en-US" l10n="U" oldref="90"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+1</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153731" xml-lang="en-US" l10n="CHG" oldref="92">Apply Heading 1 paragraph style</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153751" xml-lang="en-US" l10n="U" oldref="93"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+2</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150831" xml-lang="en-US" l10n="CHG" oldref="95">Apply Heading 2 paragraph style</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10DF8" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+3</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_idN10E23" xml-lang="en-US" l10n="NEW">Apply Heading 3 paragraph style</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150849" xml-lang="en-US" l10n="U" oldref="96"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+5</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146860" xml-lang="en-US" l10n="U" oldref="98">1.5 Line Spacing</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3146878" xml-lang="en-US" l10n="U" oldref="99"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ Plus Key(+)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155403" xml-lang="en-US" l10n="CHG" oldref="101">Calculates the selected text and copies the result to the clipboard.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3155432" xml-lang="en-US" l10n="U" oldref="102"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Hyphen(-)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150712" xml-lang="en-US" l10n="U" oldref="104">Custom hyphens; hyphenation set by you.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150732" xml-lang="en-US" l10n="U" oldref="303"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+minus sign (-)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148394" xml-lang="en-US" l10n="U" oldref="302">Non-breaking dash (is not used for hyphenation)</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148414" xml-lang="en-US" l10n="U" oldref="105"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+multiplication sign * (only on number pad)</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147302" xml-lang="en-US" l10n="U" oldref="107">Run macro field</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3147321" xml-lang="en-US" l10n="U" oldref="108"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Space</paragraph>
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Space</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150260" xml-lang="en-US" l10n="U" oldref="110">Non-breaking spaces. Non-breaking spaces are not used for hyphenation and are not expanded if the text is justified.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150281" xml-lang="en-US" l10n="U" oldref="111">Shift+Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150294" xml-lang="en-US" l10n="U" oldref="113">Line break without paragraph change</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149422" xml-lang="en-US" l10n="U" oldref="114"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149447" xml-lang="en-US" l10n="U" oldref="116">Manual page break</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3146967" xml-lang="en-US" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146993" xml-lang="en-US" l10n="U" oldref="119">Column break in multicolumnar texts</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3152906" xml-lang="en-US" l10n="U" oldref="301"><switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3152906" xml-lang="en-US" l10n="U" oldref="301"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152932" xml-lang="en-US" l10n="U" oldref="300">Inserting a new paragraph without numbering</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153772" xml-lang="en-US" l10n="U" oldref="291"><switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3153772" xml-lang="en-US" l10n="U" oldref="291"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153798" xml-lang="en-US" l10n="U" oldref="293">Inserting a new paragraph directly before or after a section or a table.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153818" xml-lang="en-US" l10n="U" oldref="120">Arrow Left</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153930" xml-lang="en-US" l10n="U" oldref="121">Move cursor to left</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153949" xml-lang="en-US" l10n="U" oldref="122">Shift+Arrow Left</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153963" xml-lang="en-US" l10n="U" oldref="124">Move cursor with selection to the left</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148631" xml-lang="en-US" l10n="U" oldref="125"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow Left</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148656" xml-lang="en-US" l10n="U" oldref="127">Go to beginning of word</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154244" xml-lang="en-US" l10n="U" oldref="128"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Arrow Left</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154270" xml-lang="en-US" l10n="U" oldref="130">Selecting to the left word by word</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153147" xml-lang="en-US" l10n="U" oldref="131">Arrow Right</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153161" xml-lang="en-US" l10n="U" oldref="132">Move cursor to right</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153180" xml-lang="en-US" l10n="U" oldref="133">Shift+Arrow Right</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154048" xml-lang="en-US" l10n="U" oldref="135">Move cursor with selection to the right</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154067" xml-lang="en-US" l10n="U" oldref="136"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow Right</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154093" xml-lang="en-US" l10n="U" oldref="138">Go to end of word</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3154093" xml-lang="en-US" l10n="CHG" oldref="138">Go to start of next word</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3155272" xml-lang="en-US" l10n="U" oldref="139"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Arrow Right</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155298" xml-lang="en-US" l10n="U" oldref="141">Selecting to the right word by word</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154718" xml-lang="en-US" l10n="U" oldref="142">Arrow Up</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154731" xml-lang="en-US" l10n="CHG" oldref="143">Move cursor up one line</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154750" xml-lang="en-US" l10n="U" oldref="144">Shift+Arrow Up</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153199" xml-lang="en-US" l10n="U" oldref="146">Selecting lines in an upwards direction</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id6452528" xml-lang="en-US" l10n="NEW">Ctrl+Arrow Up<comment>UFI: inserted 4 rows, see i31697</comment></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id1764275" xml-lang="en-US" l10n="NEW">Move cursor to beginning of paragraph</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id778527" xml-lang="en-US" l10n="NEW">Shift+Ctrl+Arrow Up</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id1797235" xml-lang="en-US" l10n="NEW">Select to beginning of paragraph</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153218" xml-lang="en-US" l10n="U" oldref="147">Arrow Down</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153232" xml-lang="en-US" l10n="U" oldref="148">Move cursor down one line</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153317" xml-lang="en-US" l10n="U" oldref="149">Shift+Arrow Down</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153331" xml-lang="en-US" l10n="U" oldref="151">Selecting lines in a downward direction</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id578936" xml-lang="en-US" l10n="NEW">Ctrl+Arrow Down</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id6164433" xml-lang="en-US" l10n="NEW">Move cursor to end of paragraph</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id7405011" xml-lang="en-US" l10n="NEW">Shift+Ctrl+Arrow Down</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3729361" xml-lang="en-US" l10n="NEW">Select to end of paragraph</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153351" xml-lang="en-US" l10n="U" oldref="152">Home</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154512" xml-lang="en-US" l10n="U" oldref="153">Go to beginning of line</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154531" xml-lang="en-US" l10n="U" oldref="154">Shift+Home</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154544" xml-lang="en-US" l10n="U" oldref="156">Go and select to the beginning of a line</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150972" xml-lang="en-US" l10n="U" oldref="157">End</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150986" xml-lang="en-US" l10n="U" oldref="158">Go to end of line</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3151005" xml-lang="en-US" l10n="U" oldref="159">Shift+End</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151019" xml-lang="en-US" l10n="U" oldref="161">Go and select to end of line</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149371" xml-lang="en-US" l10n="U" oldref="162"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Home</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149396" xml-lang="en-US" l10n="U" oldref="164">Go to start of document</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3151030" xml-lang="en-US" l10n="U" oldref="165"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Home</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151055" xml-lang="en-US" l10n="U" oldref="167">Go and select text to start of document</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3151075" xml-lang="en-US" l10n="U" oldref="168"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+End</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149732" xml-lang="en-US" l10n="U" oldref="170">Go to end of document</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149750" xml-lang="en-US" l10n="U" oldref="171"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+End</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147064" xml-lang="en-US" l10n="U" oldref="173">Go and select text to end of document</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3147083" xml-lang="en-US" l10n="U" oldref="174"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PageUp</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153826" xml-lang="en-US" l10n="U" oldref="176">Switch cursor between text and header</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153846" xml-lang="en-US" l10n="U" oldref="177"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+PageDown</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153872" xml-lang="en-US" l10n="U" oldref="179">Switch cursor between text and footer</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150889" xml-lang="en-US" l10n="U" oldref="180">Insert</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150903" xml-lang="en-US" l10n="U" oldref="181">Insert mode on/off</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150922" xml-lang="en-US" l10n="U" oldref="182">PageUp</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3157513" xml-lang="en-US" l10n="U" oldref="183">Screen page up</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3157532" xml-lang="en-US" l10n="U" oldref="184">Shift+PageUp</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3157546" xml-lang="en-US" l10n="U" oldref="186">Move up screen page with selection</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3152957" xml-lang="en-US" l10n="U" oldref="187">PageDown</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3152970" xml-lang="en-US" l10n="U" oldref="188">Move down screen page</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3152990" xml-lang="en-US" l10n="U" oldref="189">Shift+PageDown</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153004" xml-lang="en-US" l10n="U" oldref="191">Move down screen page with selection</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3148448" xml-lang="en-US" l10n="U" oldref="192"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Del</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148474" xml-lang="en-US" l10n="U" oldref="194">Delete text to end of word</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3151080" xml-lang="en-US" l10n="U" oldref="195"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Backspace</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151106" xml-lang="en-US" l10n="U" oldref="197">Delete text to beginning of word</paragraph>
<paragraph role="tablecontent" id="par_id9959715" xml-lang="en-US" l10n="NEW">In a list: delete an empty paragraph in front of the current paragraph</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3151124" xml-lang="en-US" l10n="U" oldref="198"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Del</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3146919" xml-lang="en-US" l10n="U" oldref="200">Delete text to end of sentence</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3146937" xml-lang="en-US" l10n="U" oldref="201"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Backspace</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153532" xml-lang="en-US" l10n="U" oldref="203">Delete text to beginning of sentence</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153551" xml-lang="en-US" l10n="U" oldref="294"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153577" xml-lang="en-US" l10n="U" oldref="296">Next suggestion with <link href="text/shared/01/06040600.xhp" name="Automatic Word Completion">Automatic Word Completion</link></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3147360" xml-lang="en-US" l10n="U" oldref="297"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147386" xml-lang="en-US" l10n="U" oldref="299">Use previous suggestion with <link href="text/shared/01/06040600.xhp" name="Automatic Word Completion">Automatic Word Completion</link></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3145382" xml-lang="en-US" l10n="U" oldref="288"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+ double-click or <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150379" xml-lang="en-US" l10n="U" oldref="290">Use this combination to quickly dock or undock the Navigator, Styles and Formatting window, or other windows</paragraph>
</tablecell>
</tablerow>
</table>
+
<bookmark xml-lang="en-US" branch="index" id="bm_id3150396"><bookmark_value>headings; switching levels by keyboard</bookmark_value>
<bookmark_value>paragraphs; moving by keyboard</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3150396" xml-lang="en-US" level="2" l10n="U" oldref="204">Shortcut Keys for Paragraphs and Heading Levels</paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN11694" xml-lang="en-US" l10n="NEW">Shortcut keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_idN11699" xml-lang="en-US" l10n="NEW">Effect</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153679" xml-lang="en-US" l10n="CHG" oldref="206">Ctrl+Alt+Up Arrow<comment>UFI: see sw-features "Ctrl + Up/Down accelerators added to move paragraphs". See now also i31697</comment></paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3153679" xml-lang="en-US" l10n="CHG" oldref="206"><switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Up Arrow<comment>UFI: see sw-features "Ctrl + Up/Down accelerators added to move paragraphs". See now also i31697</comment></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153693" xml-lang="en-US" l10n="U" oldref="208">Move the active paragraph or selected paragraphs up one paragraph.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3153712" xml-lang="en-US" l10n="CHG" oldref="209">Ctrl+Alt+Down Arrow</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3153712" xml-lang="en-US" l10n="CHG" oldref="209"><switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Down Arrow</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154639" xml-lang="en-US" l10n="U" oldref="211">Move the active paragraph or selected paragraphs down one paragraph.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154658" xml-lang="en-US" l10n="U" oldref="260">Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154672" xml-lang="en-US" l10n="U" oldref="261">The heading in format "Heading X" (X = 1-9) is moved down one level in the outline.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154695" xml-lang="en-US" l10n="U" oldref="262">Shift+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155346" xml-lang="en-US" l10n="U" oldref="263">The heading in format "Heading X" (X = 2-10) is moved up one level in the outline.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3155369" xml-lang="en-US" l10n="U" oldref="265"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155395"><bookmark_value>tab stops; before headings</bookmark_value>
<bookmark_value>headings; starting with tab stops</bookmark_value>
</bookmark>
-<paragraph role="tablecontent" id="par_id3155395" xml-lang="en-US" l10n="U" oldref="266">At the start of a heading: Inserts a tab stop. Depending on the Window Manager in use, Alt+Tab may be used instead.</paragraph>
+<paragraph role="tablecontent" id="par_id3155395" xml-lang="en-US" l10n="U" oldref="266">At the start of a heading: Inserts a tab stop. Depending on the Window Manager in use, <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Tab may be used instead.</paragraph>
<paragraph role="tablecontent" id="par_id3149161" xml-lang="en-US" l10n="U" oldref="264">To change the heading level with the keyboard, first position the cursor in front of the heading.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3149180" xml-lang="en-US" level="2" l10n="U" oldref="212">Shortcut Keys for Tables in <item type="productname">%PRODUCTNAME</item> Writer</paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="hd_id3155978" xml-lang="en-US" l10n="U" oldref="279">Shortcut Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155991" xml-lang="en-US" l10n="U" oldref="281">Effect</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3156014" xml-lang="en-US" l10n="U" oldref="213"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156048" xml-lang="en-US" l10n="U" oldref="215">If the active cell is empty: selects the whole table. Otherwise: selects the contents of the active cell. Pressing again selects the entire table.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3156069" xml-lang="en-US" l10n="U" oldref="216"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Home</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154285" xml-lang="en-US" l10n="U" oldref="218">If the active cell is empty: goes to the beginning of the table. Otherwise: first press goes to beginning of the active cell, second press goes to beginning of the current table, third press goes to beginning of document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3154308" xml-lang="en-US" l10n="U" oldref="219"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+End</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154334" xml-lang="en-US" l10n="U" oldref="221">If the active cell is empty: goes to the end of the table. Otherwise: first press goes to the end of the active cell, second press goes to the end of the current table, third press goes to the end of the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3153255" xml-lang="en-US" l10n="U" oldref="222"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153281" xml-lang="en-US" l10n="U" oldref="224">Inserts a tab stop (only in tables). Depending on the Window Manager in use, Alt+Tab may be used instead.</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3153281" xml-lang="en-US" l10n="U" oldref="224">Inserts a tab stop (only in tables). Depending on the Window Manager in use, <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Tab may be used instead.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154905" xml-lang="en-US" l10n="U" oldref="231"><switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3154905" xml-lang="en-US" l10n="U" oldref="231"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Arrow Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154931" xml-lang="en-US" l10n="U" oldref="233">Increases/decreases the size of the column/row on the right/bottom cell edge<comment>UFI: deleted two rows, see i31697</comment></paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154951" xml-lang="en-US" l10n="U" oldref="234"><switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3154951" xml-lang="en-US" l10n="U" oldref="234"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift+Arrow Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150772" xml-lang="en-US" l10n="U" oldref="236">Increase/decrease the size of the column/row on the left/top cell edge</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3150793" xml-lang="en-US" l10n="U" oldref="237"><switchinline select="sys"><caseinline select="MAC">Option+Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3150793" xml-lang="en-US" l10n="U" oldref="237"><switchinline select="sys"><caseinline select="MAC">Option+Command
</caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>+Arrow Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150818" xml-lang="en-US" l10n="U" oldref="239">Like <switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="par_id3150818" xml-lang="en-US" l10n="U" oldref="239">Like <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>, but only the active cell is modified</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3154451" xml-lang="en-US" l10n="U" oldref="240"><switchinline select="sys"><caseinline select="MAC">Option+Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3154451" xml-lang="en-US" l10n="U" oldref="240"><switchinline select="sys"><caseinline select="MAC">Option+Command
</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Shift+Arrow Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="242">Like <switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="par_id3154477" xml-lang="en-US" l10n="U" oldref="242">Like <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>, but only the active cell is modified</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3145272" xml-lang="en-US" l10n="U" oldref="243"><switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3145272" xml-lang="en-US" l10n="U" oldref="243"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Insert</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145297" xml-lang="en-US" l10n="U" oldref="245">3 seconds in Insert mode, Arrow Key inserts row/column, <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow Key inserts cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155533" xml-lang="en-US" l10n="U" oldref="246"><switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3155533" xml-lang="en-US" l10n="U" oldref="246"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Del</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155559" xml-lang="en-US" l10n="U" oldref="248">3 seconds in Delete mode, Arrow key deletes row/column, <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow key merges cell with neighboring cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155593"><bookmark_value>removing; cell protection in text documents</bookmark_value>
</bookmark>
<paragraph role="tablecontent" id="hd_id3155593" xml-lang="en-US" l10n="U" oldref="267"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+T</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3147474" xml-lang="en-US" l10n="U" oldref="269">Removes cell protection from all selected tables. If no table is selected, then cell protection is removed from all of the tables in the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3147496" xml-lang="en-US" l10n="U" oldref="270">Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Del</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149504" xml-lang="en-US" l10n="CHG" oldref="272">If no whole cell is selected, the text from the cursor to the end of the current sentence is deleted. If the cursor is at the end of a cell, and no whole cell is selected, the contents of the next cell are deleted. </paragraph>
<paragraph role="tablecontent" id="par_id8539384" xml-lang="en-US" l10n="NEW">If no whole cell is selected and the cursor is at the end of the table, the following sentence from below the table will be deleted and the remainder of that paragraph will be moved into the last table cell. If an empty line follows the table, the empty line will be deleted.</paragraph>
<paragraph role="tablecontent" id="par_id5891903" xml-lang="en-US" l10n="NEW">If one or more cells are selected, the whole rows containing the selection will be deleted. If all rows are selected completely or partially, the entire table will be deleted.</paragraph>
</tablecell>
</tablerow>
</table>
+
<paragraph role="heading" id="hd_id3149537" xml-lang="en-US" level="2" l10n="U" oldref="249">Shortcut Keys for Moving and Resizing Frames, Graphics and Objects</paragraph>
<table id="">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="hd_id3149565" xml-lang="en-US" l10n="U" oldref="282">Shortcut Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3148993" xml-lang="en-US" l10n="U" oldref="284">Effect</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149010" xml-lang="en-US" l10n="U" oldref="305">Esc</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149024" xml-lang="en-US" l10n="U" oldref="306">Cursor is inside a text frame and no text is selected: Escape selects the text frame.</paragraph>
<paragraph role="tablecontent" id="par_id3149039" xml-lang="en-US" l10n="U" oldref="307">Text frame is selected: Escape clears the cursor from the text frame.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3149054" xml-lang="en-US" l10n="U" oldref="308">F2 or Enter or any key that produces a character on screen</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149890" xml-lang="en-US" l10n="U" oldref="309">If a text frame is selected: positions the cursor to the end of the text in the text frame. If you press any key that produces a character on screen, and the document is in edit mode, the character is appended to the text.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149913" xml-lang="en-US" l10n="U" oldref="250"><switchinline select="sys"><caseinline select="MAC">Option
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3149913" xml-lang="en-US" l10n="U" oldref="250"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Arrow Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149939" xml-lang="en-US" l10n="U" oldref="252">Move object.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151200" xml-lang="en-US" l10n="U" oldref="253"><switchinline select="sys"><caseinline select="MAC">Option+Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3151200" xml-lang="en-US" l10n="U" oldref="253"><switchinline select="sys"><caseinline select="MAC">Option+Command
</caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>+Arrow Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3151226" xml-lang="en-US" l10n="U" oldref="255">Resizes by moving lower right corner.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3151246" xml-lang="en-US" l10n="U" oldref="256"><switchinline select="sys"><caseinline select="MAC">Option+Command
+<tablecell>
+<paragraph role="tablecontent" id="hd_id3151246" xml-lang="en-US" l10n="U" oldref="256"><switchinline select="sys"><caseinline select="MAC">Option+Command
</caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>+Shift+Arrow Keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150115" xml-lang="en-US" l10n="U" oldref="258">Resizes by moving top left corner.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="hd_id3150129" xml-lang="en-US" l10n="U" oldref="310"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150154" xml-lang="en-US" l10n="U" oldref="311">Selects the anchor of an object (in Edit Points mode).</paragraph>
</tablecell>
</tablerow>
</table>
+
<section id="relatedtopics">
<embed href="text/swriter/guide/text_nav_keyb.xhp#text_nav_keyb"/>
<embed href="text/swriter/guide/keyboard.xhp#keyboard"/>
diff --git a/helpcontent2/source/text/swriter/04/makefile.mk b/helpcontent2/source/text/swriter/04/makefile.mk
index 125c5c3972..14546c7538 100644
--- a/helpcontent2/source/text/swriter/04/makefile.mk
+++ b/helpcontent2/source/text/swriter/04/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/source/text/swriter/guide/arrange_chapters.xhp b/helpcontent2/source/text/swriter/guide/arrange_chapters.xhp
index e0ce5bc4e4..bef88d2c27 100644
--- a/helpcontent2/source/text/swriter/guide/arrange_chapters.xhp
+++ b/helpcontent2/source/text/swriter/guide/arrange_chapters.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: arrange_chapters.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriterguidearrange_chaptersxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidearrange_chaptersxml" indexer="include">
<title id="tit" xml-lang="en-US">Rearranging a Document by Using the Navigator</title>
<filename>/text/swriter/guide/arrange_chapters.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-06T10:23:25">FPE: Deleted screenshot. Cleaned</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149973"><bookmark_value>headings;rearranging</bookmark_value>
@@ -60,34 +56,35 @@
<paragraph role="tip" id="par_id3145652" xml-lang="en-US" l10n="U" oldref="62">To quickly move the text cursor to a heading in the document, double-click the heading in the <emph>Navigator </emph>list.</paragraph>
<paragraph role="paragraph" id="par_id3155461" xml-lang="en-US" l10n="CHG" oldref="60">To dock the <emph>Navigator</emph>, drag the title bar to the edge of the workspace. To undock the <emph>Navigator</emph>, double-click its frame.</paragraph>
<paragraph role="heading" id="hd_id3151184" xml-lang="en-US" level="3" l10n="U" oldref="70">To Move a Heading Up or Down in the Document</paragraph>
+<paragraph role="warning" id="par_id0915200809400790" xml-lang="en-US" l10n="NEW">Ensure that all heading levels are shown in the Navigator. By default all levels are shown. See steps below how to change the heading levels that are shown.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3151206" xml-lang="en-US" l10n="U" oldref="71">On the <emph>Standard Bar</emph>, click the<emph> Navigator</emph> icon
-<image id="img_id5211883" src="res/commandimagelist/sc_navigator.png" width="5.64mm" height="5.64mm"><alt id="alt_id5211883" xml-lang="en-US">Icon</alt>
+<image id="img_id5211883" src="res/commandimagelist/sc_navigator.png" width="0.564cm" height="0.564cm"><alt id="alt_id5211883" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image> to open the <emph>Navigator</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3151238" xml-lang="en-US" l10n="U" oldref="72">On the <emph>Navigator</emph>, click the <emph>Content View </emph>icon
-<image id="img_id3156338" src="sw/imglst/sc20244.png" width="5.64mm" height="5.64mm"><alt id="alt_id3156338" xml-lang="en-US">Icon</alt>
+<image id="img_id3156338" src="sw/imglst/sc20244.png" width="0.564cm" height="0.564cm"><alt id="alt_id3156338" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155089" xml-lang="en-US" l10n="U" oldref="74">Do one of the following:</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3155114" xml-lang="en-US" l10n="U" oldref="63">Drag a heading to a new location in the <emph>Navigator </emph>list.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155139" xml-lang="en-US" l10n="U" oldref="75">Click a heading in the <emph>Navigator </emph>list, and then click the <emph>Promote Chapter</emph>
-<image id="img_id4217546" src="sw/imglst/sc20174.png" width="5.64mm" height="5.64mm"><alt id="alt_id4217546" xml-lang="en-US">Icon</alt>
+<image id="img_id4217546" src="sw/imglst/sc20174.png" width="0.564cm" height="0.564cm"><alt id="alt_id4217546" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image> or <emph>Demote Chapter </emph>icon
-<image id="img_id6505788" src="sw/imglst/sc20171.png" width="5.64mm" height="5.64mm"><alt id="alt_id6505788" xml-lang="en-US">Icon</alt>
+<image id="img_id6505788" src="sw/imglst/sc20171.png" width="0.564cm" height="0.564cm"><alt id="alt_id6505788" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image>.</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id3145758" xml-lang="en-US" l10n="U" oldref="64">To move the heading without the subordinate text, hold down <item type="keycode">Ctrl</item> while you drag or click the <emph>Promote Chapter </emph>or <emph>Demote Chapter </emph>icons.</paragraph>
+<paragraph role="note" id="par_id3145758" xml-lang="en-US" l10n="U" oldref="64">To move the heading without the subordinate text, hold down Ctrl while you drag or click the <emph>Promote Chapter </emph>or <emph>Demote Chapter </emph>icons.</paragraph>
<paragraph role="heading" id="hd_id3155402" xml-lang="en-US" level="3" l10n="U" oldref="76">To Promote or Demote the Level of a Heading</paragraph>
<list type="ordered">
<listitem>
@@ -95,15 +92,15 @@
</listitem>
<listitem>
<paragraph role="listitem" id="par_idN1081C" xml-lang="en-US" l10n="NEW">Click the <emph>Promote Level </emph>
-<image id="img_id5564488" src="sw/imglst/sc20172.png" width="5.64mm" height="5.64mm"><alt id="alt_id5564488" xml-lang="en-US">Icon</alt>
+<image id="img_id5564488" src="sw/imglst/sc20172.png" width="0.564cm" height="0.564cm"><alt id="alt_id5564488" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image> or <emph>Demote Level </emph>icon
-<image id="img_id3159363" src="sw/imglst/sc20173.png" width="5.64mm" height="5.64mm"><alt id="alt_id3159363" xml-lang="en-US">Icon</alt>
+<image id="img_id3159363" src="sw/imglst/sc20173.png" width="0.564cm" height="0.564cm"><alt id="alt_id3159363" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image>.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3155525" xml-lang="en-US" level="3" l10n="U" oldref="78">To Change the Number of Heading Levels That Are Displayed</paragraph>
<paragraph role="paragraph" id="par_id3151352" xml-lang="en-US" l10n="U" oldref="79">Click the <emph>Heading Levels Shown </emph>icon
-<image id="img_id3151310" src="sw/imglst/sc20236.png" width="5.64mm" height="5.64mm"><alt id="alt_id3151310" xml-lang="en-US">Icon</alt>
+<image id="img_id3151310" src="sw/imglst/sc20236.png" width="0.564cm" height="0.564cm"><alt id="alt_id3151310" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image>, and then select a number from the list.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/navigator.xhp#navigator"/>
diff --git a/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp b/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp
index 3341728209..6608cdf0df 100644
--- a/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp
+++ b/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: even_odd_sdw.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -62,7 +62,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3154265" xml-lang="en-US" l10n="E">
-<image id="img_id3155876" src="res/sc05539.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155876" xml-lang="en-US">Icon</alt>
+<image id="img_id3155876" src="res/commandimagelist/sc_designerdialog.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155876" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/swriter/guide/form_letters_main.xhp b/helpcontent2/source/text/swriter/guide/form_letters_main.xhp
index a4eacb131f..ac7298c5eb 100755
--- a/helpcontent2/source/text/swriter/guide/form_letters_main.xhp
+++ b/helpcontent2/source/text/swriter/guide/form_letters_main.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: form_letters_main.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguideform_letters_mainxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguideform_letters_mainxml" indexer="include">
<title id="tit" xml-lang="en-US">Creating a Form Letter</title>
<filename>/text/swriter/guide/form_letters_main.xhp</filename>
</topic>
@@ -52,6 +50,7 @@
</variable>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3150502" xml-lang="en-US" l10n="CHG" oldref="1">To create a form letter, you need a text document that contains fields for address data, and an address database. Then you combine or merge the address data and the text document to either print the letters or send them by e-mail.</paragraph>
+<paragraph role="note" id="par_id0805200801132382" xml-lang="en-US" l10n="NEW">If the document is in HTML format, any embedded or linked images will not be sent with the e-mail.</paragraph>
<paragraph role="paragraph" id="par_idN10653" xml-lang="en-US" l10n="NEW">The <link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link> helps you to create form letters.</paragraph>
<paragraph role="heading" id="par_idN10664" xml-lang="en-US" level="2" l10n="NEW">To create a form letter</paragraph>
<list type="ordered">
@@ -64,10 +63,10 @@
<paragraph role="paragraph" id="par_idN10681" xml-lang="en-US" l10n="NEW">You see the Templates dialog.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_idN10685" xml-lang="en-US" l10n="CHG">Select <item type="literal">Business Correspondence</item> in the left list, and then <item type="literal">Modern letter</item> in the right list. Click OK to close the Templates dialog, and click Next in the wizard.<comment>removed the next two paras</comment></paragraph>
+<paragraph role="paragraph" id="par_idN10685" xml-lang="en-US" l10n="CHG">Select <item type="literal">Business Correspondence</item> in the left list, and then <item type="literal">Modern letter</item> in the right list. Click <emph>OK</emph> to close the Templates dialog, and click <emph>Next</emph> in the wizard.<comment>removed the next two paras</comment></paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_idN106B5" xml-lang="en-US" l10n="NEW">Click Next and select to create letters.</paragraph>
+<paragraph role="paragraph" id="par_id2669759" xml-lang="en-US" l10n="NEW">Select <emph>Letter</emph> and click <emph>Next</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN106BD" xml-lang="en-US" l10n="CHG">On the next step of the wizard, click the <emph>Select Address List</emph> button to check that you are using the correct address list. Select an address block type, match the data fields if necessary, and click <emph>Next</emph>.</paragraph>
@@ -76,7 +75,7 @@
<paragraph role="paragraph" id="par_idN106C5" xml-lang="en-US" l10n="NEW">Next follows the <emph>Create a salutation</emph> step. Deselect the <emph>Insert personalized salutation</emph> box. Under <emph>General salutation</emph>, select the salutation that you want on top of all letters.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_idN106D5" xml-lang="en-US" l10n="CHG">Click <emph>Finish</emph> to create the mail merge.</paragraph>
+<paragraph role="paragraph" id="par_idN106D5" xml-lang="en-US" l10n="CHG">Click <emph>Next</emph> and finally <emph>Finish</emph> to create the mail merge.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/guide/insert_beforetable.xhp b/helpcontent2/source/text/swriter/guide/insert_beforetable.xhp
index 6188d3ff83..871fd84aa0 100755
--- a/helpcontent2/source/text/swriter/guide/insert_beforetable.xhp
+++ b/helpcontent2/source/text/swriter/guide/insert_beforetable.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: insert_beforetable.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -49,8 +49,8 @@
</bookmark>
<paragraph role="heading" id="hd_id3149688" xml-lang="en-US" level="1" l10n="U" oldref="54"><variable id="insert_beforetable"><link href="text/swriter/guide/insert_beforetable.xhp" name="Inserting Text Before a Table at the Top of Page">Inserting Text Before a Table at the Top of Page</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="CHG" oldref="55">If you want to insert text before a table that is at the top of a page, click in the first cell of the table, in front of any contents of that cell, and then press <item type="keycode">Enter</item> or <item type="keycode">Alt+Enter</item>.</paragraph>
-<paragraph role="paragraph" id="par_idN10612" xml-lang="en-US" l10n="NEW">To insert text after a table at the end of the document, go to the last cell of the table and press <item type="keycode">Alt+Enter</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="CHG" oldref="55">If you want to insert text before a table that is at the top of a page, click in the first cell of the table, in front of any contents of that cell, and then press <item type="keycode">Enter</item> or <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter</item>.</paragraph>
+<paragraph role="paragraph" id="par_idN10612" xml-lang="en-US" l10n="NEW">To insert text after a table at the end of the document, go to the last cell of the table and press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter</item>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/insert_line.xhp#insert_line"/>
</body>
diff --git a/helpcontent2/source/text/swriter/guide/keyboard.xhp b/helpcontent2/source/text/swriter/guide/keyboard.xhp
index 3f6ce0dfcc..79fa73fe6a 100755
--- a/helpcontent2/source/text/swriter/guide/keyboard.xhp
+++ b/helpcontent2/source/text/swriter/guide/keyboard.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: keyboard.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -51,7 +51,7 @@
<paragraph role="heading" id="hd_id3151169" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="keyboard"><link href="text/swriter/guide/keyboard.xhp" name="Using Shortcut Keys ($[officename] Writer Accessibility)">Using Shortcut Keys ($[officename] Writer Accessibility)</link>
</variable></paragraph>
<embed href="text/shared/00/00000099.xhp#keys"/>
-<paragraph role="paragraph" id="par_id3149685" xml-lang="en-US" l10n="CHG" oldref="3">Press the keys Alt+&lt;underlined character&gt; to open a menu. In an open menu, press the underlined character to run a command. For example, press Alt+I to open the <emph>Insert </emph>menu, and then T to insert a table.</paragraph>
+<paragraph role="paragraph" id="par_id3149685" xml-lang="en-US" l10n="CHG" oldref="3">Press the keys <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+&lt;underlined character&gt; to open a menu. In an open menu, press the underlined character to run a command. For example, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+I to open the <emph>Insert</emph> menu, and then T to insert a table.</paragraph>
<paragraph role="paragraph" id="par_id3155186" xml-lang="en-US" l10n="U" oldref="4">To open a context menu, press Shift+F10. To close a context menu, press Escape.</paragraph>
<paragraph role="heading" id="hd_id3155918" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Inserting Sections</paragraph>
<list type="ordered">
diff --git a/helpcontent2/source/text/swriter/guide/load_styles.xhp b/helpcontent2/source/text/swriter/guide/load_styles.xhp
index b58d517eb2..af923cdf79 100644
--- a/helpcontent2/source/text/swriter/guide/load_styles.xhp
+++ b/helpcontent2/source/text/swriter/guide/load_styles.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: load_styles.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguideload_stylesxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguideload_stylesxml" indexer="include">
<title id="tit" xml-lang="en-US">Using Styles From Another Document or Template</title>
<filename>/text/swriter/guide/load_styles.xhp</filename>
</topic>
@@ -68,7 +66,7 @@
<paragraph role="listitem" id="par_id3145098" xml-lang="en-US" l10n="U" oldref="16">Do one of the following:</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3156240" xml-lang="en-US" l10n="U" oldref="17">Click an entry in the <emph>Categories </emph>list, then click the template containing the styles that you want to use in the <emph>Templates </emph>list, and then click <emph>OK</emph>.</paragraph>
</listitem>
@@ -79,6 +77,5 @@
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
<embed href="text/swriter/guide/change_header.xhp#change_header"/>
-<embed href="text/swriter/guide/para_style_quickuse.xhp#para_style_quickuse"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/main.xhp b/helpcontent2/source/text/swriter/guide/main.xhp
index 022d74d090..3a4bd68c4d 100755
--- a/helpcontent2/source/text/swriter/guide/main.xhp
+++ b/helpcontent2/source/text/swriter/guide/main.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: main.xhp,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguidemainxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidemainxml" indexer="include">
<title id="tit" xml-lang="en-US">Instructions for Using $[officename] Writer</title>
<filename>/text/swriter/guide/main.xhp</filename>
</topic>
@@ -72,7 +70,6 @@
<embed href="text/swriter/guide/reset_format.xhp#reset_format"/>
<embed href="text/swriter/guide/chapter_numbering.xhp#chapter_numbering"/>
<embed href="text/swriter/guide/arrange_chapters.xhp#arrange_chapters"/>
-<embed href="text/swriter/guide/para_style_quickuse.xhp#para_style_quickuse"/>
<embed href="text/swriter/guide/jump2statusbar.xhp#jump2statusbar"/>
<embed href="text/swriter/guide/sections.xhp#sections"/>
<embed href="text/swriter/guide/section_insert.xhp#section_insert"/>
@@ -109,7 +106,6 @@
<embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
<embed href="text/swriter/guide/page_break.xhp#page_break"/>
<embed href="text/swriter/guide/pagestyles.xhp#pagestyles"/>
-<embed href="text/swriter/guide/para_style_quickuse.xhp#para_style_quickuse"/>
<embed href="text/swriter/guide/fields.xhp#fields"/>
<embed href="text/swriter/guide/fields_enter.xhp#fields_enter"/>
<embed href="text/swriter/guide/fields_userdata.xhp#fields_userdata"/>
diff --git a/helpcontent2/source/text/swriter/guide/makefile.mk b/helpcontent2/source/text/swriter/guide/makefile.mk
index 60a259d123..7c065b6131 100644
--- a/helpcontent2/source/text/swriter/guide/makefile.mk
+++ b/helpcontent2/source/text/swriter/guide/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.18 $
+# $Revision: 1.18.4.4 $
#
# This file is part of OpenOffice.org.
#
@@ -130,7 +130,6 @@ XHPFILES = \
pagenumbers.xhp \
pageorientation.xhp \
pagestyles.xhp \
- para_style_quickuse.xhp \
print_brochure.xhp \
print_preview.xhp \
print_small.xhp \
diff --git a/helpcontent2/source/text/swriter/guide/navigator.xhp b/helpcontent2/source/text/swriter/guide/navigator.xhp
index a9397aa62b..f1e8346412 100755
--- a/helpcontent2/source/text/swriter/guide/navigator.xhp
+++ b/helpcontent2/source/text/swriter/guide/navigator.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: navigator.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriterguidenavigatorxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidenavigatorxml" indexer="include">
<title id="tit" xml-lang="en-US">Navigator for Text Documents</title>
<filename>/text/swriter/guide/navigator.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-16T15:09:34">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154897"><bookmark_value>Navigator; overview in texts</bookmark_value>
@@ -51,18 +47,19 @@
<bookmark_value>frames;jumping to</bookmark_value>
<bookmark_value>tables;jumping to</bookmark_value>
<bookmark_value>headings;jumping to</bookmark_value>
+<bookmark_value>pages;jumping to</bookmark_value>
<bookmark_value>jumping;to text elements</bookmark_value>
<bookmark_value>overviews;Navigator in text documents</bookmark_value>
-</bookmark>
+</bookmark><comment>MW added "pages;"</comment>
<paragraph role="heading" id="hd_id3154897" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="navigator"><link href="text/swriter/guide/navigator.xhp" name="Navigator for Text Documents">Navigator for Text Documents</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153402" xml-lang="en-US" l10n="U" oldref="2">The <emph>Navigator </emph>displays the different parts of your document, such as headings, tables, frames, objects, or hyperlinks.</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3154247" xml-lang="en-US" l10n="U" oldref="3">To open the <emph>Navigator</emph>, press F5.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3155878" xml-lang="en-US" l10n="U" oldref="5">To quickly jump to a location in your document, double-click an item listed in the <emph>Navigator</emph> window.</paragraph>
+<paragraph role="listitem" id="par_id3155878" xml-lang="en-US" l10n="U" oldref="5">To quickly jump to a location in your document, double-click an item listed in the <emph>Navigator</emph> window or enter the respective page number in the spin box.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/guide/para_style_quickuse.xhp b/helpcontent2/source/text/swriter/guide/para_style_quickuse.xhp
index 75795d5ba3..e69de29bb2 100755
--- a/helpcontent2/source/text/swriter/guide/para_style_quickuse.xhp
+++ b/helpcontent2/source/text/swriter/guide/para_style_quickuse.xhp
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: para_style_quickuse.xhp,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriterguidepara_style_quickusexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Quickly Applying Paragraph Styles</title>
-<filename>/text/swriter/guide/para_style_quickuse.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-08-23T15:18:31">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3155868"><bookmark_value>paragraph styles; applying to adjacent paragraphs</bookmark_value>
-<bookmark_value>formatting; with adjacent paragraph format</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3155868" xml-lang="en-US" level="1" l10n="U" oldref="47"><variable id="para_style_quickuse"><link href="text/swriter/guide/para_style_quickuse.xhp" name="Quickly Applying Paragraph Styles">Quickly Applying Paragraph Styles</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155060" xml-lang="en-US" l10n="U" oldref="48">You can use the keyboard to quickly apply the same paragraph style to two consecutive paragraphs.</paragraph>
-<paragraph role="heading" id="hd_id3156098" xml-lang="en-US" level="2" l10n="U" oldref="51">To apply the paragraph style of the first paragraph to the second paragraph:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149282" xml-lang="en-US" l10n="U" oldref="52">Click at the end of the first paragraph.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153399" xml-lang="en-US" l10n="U" oldref="49">Press Delete until the second paragraph is added to the end of the first paragraph.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153418" xml-lang="en-US" l10n="U" oldref="50">Press Enter.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153132" xml-lang="en-US" level="2" l10n="U" oldref="53">To apply the paragraph style of the second paragraph to the first paragraph:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149640" xml-lang="en-US" l10n="U" oldref="54">Click at the beginning of the second paragraph.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149606" xml-lang="en-US" l10n="U" oldref="55">Press Backspace until the second paragraph is added to the end of the first paragraph.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="56">Press Enter.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
-<embed href="text/swriter/guide/load_styles.xhp#load_styles"/>
-<embed href="text/swriter/guide/change_header.xhp#change_header"/>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/references.xhp b/helpcontent2/source/text/swriter/guide/references.xhp
index 60418099e6..ae2eb6e90f 100755
--- a/helpcontent2/source/text/swriter/guide/references.xhp
+++ b/helpcontent2/source/text/swriter/guide/references.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: references.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguidereferencesxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidereferencesxml" indexer="include">
<title id="tit" xml-lang="en-US">Inserting Cross-References</title>
<filename>/text/swriter/guide/references.xhp</filename>
</topic>
@@ -93,7 +91,7 @@
<paragraph role="listitem" id="par_id3154256" xml-lang="en-US" l10n="U" oldref="47">In the <emph>Selection</emph> list, select the target that you want to cross-reference.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3154856" xml-lang="en-US" l10n="CHG" oldref="48">In the <emph>Insert reference to</emph> list, select the format for the cross-reference. The <link href="text/swriter/01/04090002.xhp" name="format">format</link> specifies the type of information that is displayed as the cross-reference. For example, "Reference" inserts the target text, and "Page" inserts the page number where the target is located.</paragraph>
+<paragraph role="listitem" id="par_id3154856" xml-lang="en-US" l10n="CHG" oldref="48">In the <emph>Insert reference to</emph> list, select the format for the cross-reference. The <link href="text/swriter/01/04090002.xhp" name="format">format</link> specifies the type of information that is displayed as the cross-reference. For example, "Reference" inserts the target text, and "Page" inserts the page number where the target is located. For footnotes the footnote number is inserted.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155895" xml-lang="en-US" l10n="U" oldref="49">Click <emph>Insert</emph>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/ruler.xhp b/helpcontent2/source/text/swriter/guide/ruler.xhp
index bcb1953fad..67c50de502 100644
--- a/helpcontent2/source/text/swriter/guide/ruler.xhp
+++ b/helpcontent2/source/text/swriter/guide/ruler.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ruler.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguiderulerxhp" indexer="include" status="PUBLISH">
+<topic id="textswriterguiderulerxhp" indexer="include">
<title id="tit" xml-lang="en-US">Using Rulers</title>
<filename>/text/swriter/guide/ruler.xhp</filename>
</topic>
@@ -52,14 +50,15 @@
<bookmark_value>showing;rulers</bookmark_value>
<bookmark_value>hiding;rulers</bookmark_value>
<bookmark_value>adjusting page margins and cell widths</bookmark_value>
-</bookmark><comment>mw made "indent settings..." a two level entry and cut "changing;indents"</comment><paragraph role="heading" id="par_idN1065F" xml-lang="en-US" level="1" l10n="NEW"><variable id="ruler"><link href="text/swriter/guide/ruler.xhp">Using Rulers</link>
+</bookmark><comment>mw made "indent settings..." a two level entry and cut "changing;indents"</comment>
+<paragraph role="heading" id="par_idN1065F" xml-lang="en-US" level="1" l10n="NEW"><variable id="ruler"><link href="text/swriter/guide/ruler.xhp">Using Rulers</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1067D" xml-lang="en-US" l10n="NEW">To show or hide rulers, choose <emph>View - Ruler</emph>. To show the vertical ruler, choose <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - View"><emph>Tools - Options - %PRODUCTNAME Writer - View</emph></link>, and then select <emph>Vertical ruler</emph> in the <emph>Ruler</emph> area.</paragraph>
<paragraph role="heading" id="hd_id3149686" xml-lang="en-US" level="2" l10n="U" oldref="20">Adjusting Page Margins</paragraph>
<paragraph role="paragraph" id="par_id3155175" xml-lang="en-US" l10n="U" oldref="3">The margins of a page are indicated by the filled areas at the ends of the rulers.</paragraph>
<paragraph role="heading" id="hd_id3149038" xml-lang="en-US" level="2" l10n="U" oldref="22">Changing Indents</paragraph>
<paragraph role="paragraph" id="par_id3153631" xml-lang="en-US" l10n="U" oldref="23">Indents are adjusted with the three small triangles on the horizontal ruler.</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3152776" xml-lang="en-US" l10n="U" oldref="26">To change the left or the right paragraph indent, select the paragraph(s) that you want change the indent for, drag the bottom left or the bottom right triangle on the horizontal ruler to a new location. </paragraph>
</listitem>
@@ -68,21 +67,6 @@
</listitem>
</list>
<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="12">You can also double-click anywhere on the horizontal ruler, and adjust the indents in the <link href="text/shared/01/05030000.xhp" name="Paragraph"><emph>Paragraph</emph></link> dialog.</paragraph>
-<paragraph role="heading" id="hd_id3156273" xml-lang="en-US" level="2" l10n="U" oldref="24">Adjusting the Width of Table Cells</paragraph>
-<table id="tbl_id3145775">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="E">
-<image id="img_id3155911" src="res/helpimg/hsizebar.png" width="0.3335inch" height="0.3335inch"><alt id="alt_id3155911" xml-lang="en-US">Mouse cursor when changing column width</alt>
- </image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155865" xml-lang="en-US" l10n="U" oldref="7">To adjust the width of a table cell, click in the cell, and then drag one of its column dividers (double vertical line) on the horizontal ruler to a new location.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="paragraph" id="par_id3150120" xml-lang="en-US" l10n="U" oldref="8">To maintain the proportion of the columns in the opposite direction that you drag, hold down <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you drag.</paragraph>
<section id="relatedtopics">
<embed href="text/swriter/guide/table_sizing.xhp#table_sizing"/>
<embed href="text/shared/guide/tabs.xhp#tabs"/>
diff --git a/helpcontent2/source/text/swriter/guide/sections.xhp b/helpcontent2/source/text/swriter/guide/sections.xhp
index 08cb0802b6..2f012ca263 100644
--- a/helpcontent2/source/text/swriter/guide/sections.xhp
+++ b/helpcontent2/source/text/swriter/guide/sections.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: sections.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -74,8 +74,7 @@
</list>
<paragraph xml-lang="en-US" id="par_id3149855" role="paragraph" l10n="U" oldref="7">A section contains at least one paragraph. When you select a text and create a section, a paragraph break is automatically inserted at the end of the text.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149872" role="paragraph" l10n="U" oldref="8">You can insert sections from a text document, or an entire text document as a section into another text document. You can also insert sections from a text document as links in another text document, or in the same document.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153367" role="note" l10n="U" oldref="39">To insert a new paragraph immediately before or after a section, click in front or behind the section, and then press <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153367" role="note" l10n="U" oldref="39">To insert a new paragraph immediately before or after a section, click in front or behind the section, and then press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3154242" role="heading" level="2" l10n="U" oldref="44">Sections and Columns</paragraph>
<paragraph xml-lang="en-US" id="par_id3154255" role="paragraph" l10n="U" oldref="41">You can insert sections into an existing section. For example, you can insert a section containing two columns into a section that contains one column.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154845" role="paragraph" l10n="U" oldref="42">A section layout, for example on the number of columns, has priority over the page layout defined in a page style.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp b/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
index 003dd37d2c..4ab2c5e90e 100644
--- a/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
+++ b/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: spellcheck_dialog.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguidespellcheck_dialogxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidespellcheck_dialogxml" indexer="include">
<title id="tit" xml-lang="en-US">Checking Spelling Manually</title>
<filename>/text/swriter/guide/spellcheck_dialog.xhp</filename>
</topic>
@@ -55,7 +53,7 @@
<paragraph role="listitem" id="par_id3155859" xml-lang="en-US" l10n="U" oldref="43">Click in the document, or select the text that you want to check.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149836" xml-lang="en-US" l10n="CHG" oldref="44">Choose <emph>Tools - Spellcheck</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3149836" xml-lang="en-US" l10n="CHG" oldref="44">Choose <emph>Tools - Spelling and Grammar</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3156104" xml-lang="en-US" l10n="CHG" oldref="45">When a possible spelling error is encountered, the <emph>Spellcheck </emph>dialog opens and $[officename] offers some suggested corrections.</paragraph>
@@ -66,7 +64,7 @@
<paragraph role="listitem" id="par_id3149861" xml-lang="en-US" l10n="U" oldref="46">Do one of the following:</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3145099" xml-lang="en-US" l10n="CHG" oldref="47">To accept a correction, click the suggestion, and then click <emph>Change</emph>.</paragraph>
</listitem>
@@ -74,7 +72,7 @@
<paragraph role="listitem" id="par_id3156241" xml-lang="en-US" l10n="CHG" oldref="48">Edit the sentence in the upper text box, and then click <emph>Change</emph>.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3155886" xml-lang="en-US" l10n="CHG" oldref="40">To add the unknown word to a user-defined dictionary, click <emph>Add</emph>.</paragraph>
</listitem>
@@ -82,11 +80,11 @@
<section id="relatedtopics">
<embed href="text/swriter/guide/auto_spellcheck.xhp#auto_spellcheck"/>
<embed href="text/swriter/guide/select_language.xhp#select_language"/>
-<paragraph role="paragraph" id="par_id3147107" xml-lang="en-US" l10n="U" oldref="49"><link href="text/shared/01/06010000.xhp" name="Spellcheck dialog">Spellcheck dialog</link></paragraph>
+<paragraph role="paragraph" id="par_id3147107" xml-lang="en-US" l10n="U" oldref="49"><link href="text/shared/01/06010000.xhp" name="Spellcheck dialog">Spelling and Grammar dialog</link></paragraph>
<embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
<embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/>
-<paragraph role="paragraph" id="par_id9625843" xml-lang="en-US" l10n="NEW"><link href="http://blogs.sun.com/oootnt/entry/adding_more_languages_to_ooo">Wiki page: Adding more languages</link></paragraph>
-<paragraph role="paragraph" id="par_id1683706" xml-lang="en-US" l10n="NEW"><link href="http://blogs.sun.com/oootnt/entry/spellchecking_text_in_multi_languages">Wiki page: Multiple language spellchecking</link></paragraph>
+<paragraph role="paragraph" id="par_id9625843" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Adding_More_Languages">Wiki page: Adding more languages</link></paragraph>
+<paragraph role="paragraph" id="par_id1683706" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Spellchecking_in_More_Languages">Wiki page: Multiple language spellchecking</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/table_cells.xhp b/helpcontent2/source/text/swriter/guide/table_cells.xhp
index e58fd748a3..44b28ea6b7 100755
--- a/helpcontent2/source/text/swriter/guide/table_cells.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_cells.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: table_cells.xhp,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -61,30 +61,22 @@
<paragraph xml-lang="en-US" id="par_id3149487" role="paragraph" l10n="U" oldref="27">You can add or delete rows or columns in table as well as split or merge table cells using the keyboard.</paragraph>
<list type="unordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3155906" role="listitem" l10n="U" oldref="28">To insert a new row in a table, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Ins, and then press the up or down arrow key. You can also move the cursor to the last cell in the table, and then press Tab.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155906" role="listitem" l10n="U" oldref="28">To insert a new row in a table, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Insert, and then press the up or down arrow key. You can also move the cursor to the last cell in the table, and then press Tab.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3147412" role="listitem" l10n="U" oldref="25">To insert a new column, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Ins, and then press the left or right arrow key.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147412" role="listitem" l10n="U" oldref="25">To insert a new column, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Insert, and then press the left or right arrow key.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3156096" role="listitem" l10n="U" oldref="29">To split a table cell instead of adding a column, press <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Ins, and then hold down <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you press the left or right arrow key.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156096" role="listitem" l10n="U" oldref="29">To split a table cell instead of adding a column, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Insert, and then hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you press the left or right arrow key.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153408" role="listitem" l10n="U" oldref="26">To delete a row, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Del, and then press the up or down arrow key.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153408" role="listitem" l10n="U" oldref="26">To delete a row, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Delete, and then press the up or down arrow key.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149626" role="listitem" l10n="U" oldref="30">To delete a column, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Del, and then press the left or the right arrow key.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149626" role="listitem" l10n="U" oldref="30">To delete a column, place the cursor in a table cell, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Delete, and then press the left or the right arrow key.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149612" role="listitem" l10n="U" oldref="31">To merge a table into an adjacent cell, place the cursor in the cell, press <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Del, hold down <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, and then press the left or the right arrow key.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149612" role="listitem" l10n="U" oldref="31">To merge a table into an adjacent cell, place the cursor in the cell, press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Delete, hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, and then press the left or the right arrow key.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/guide/table_delete.xhp b/helpcontent2/source/text/swriter/guide/table_delete.xhp
index c897f26723..8ea49b888f 100755
--- a/helpcontent2/source/text/swriter/guide/table_delete.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_delete.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: table_delete.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,8 +54,7 @@
<paragraph role="paragraph" id="par_id3155863" xml-lang="en-US" l10n="CHG" oldref="5">To delete a whole table, click in the table, and then choose <emph>Table - Delete - Table</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3153415" xml-lang="en-US" l10n="CHG" oldref="6">To delete the contents of a table, click in the table, press <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A <comment>UFI: Ctrl+A once is not enough</comment>until all cells are selected, and then press Delete or Backspace.</paragraph>
+<paragraph role="paragraph" id="par_id3153415" xml-lang="en-US" l10n="CHG" oldref="6">To delete the contents of a table, click in the table, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A <comment>UFI: Ctrl+A once is not enough</comment>until all cells are selected, and then press Delete or Backspace.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/swriter/guide/table_insert.xhp b/helpcontent2/source/text/swriter/guide/table_insert.xhp
index 91d8101e8f..7339607a94 100755
--- a/helpcontent2/source/text/swriter/guide/table_insert.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_insert.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: table_insert.xhp,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -122,7 +122,7 @@ checked - yj</lastedited>
<paragraph role="tablecontent" id="par_id3155893" xml-lang="en-US" l10n="U" oldref="51">$[officename] $[officeversion] Spreadsheet</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149986" xml-lang="en-US" l10n="U" oldref="52">OLE object - as with Ctrl+V or drag-and-drop</paragraph>
+<paragraph role="tablecontent" id="par_id3149986" xml-lang="en-US" l10n="U" oldref="52">OLE object - as with <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V or drag-and-drop</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/swriter/guide/table_select.xhp b/helpcontent2/source/text/swriter/guide/table_select.xhp
index 2113e2799c..113f7ee0be 100644
--- a/helpcontent2/source/text/swriter/guide/table_select.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_select.xhp
@@ -10,7 +10,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: table_select.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -54,8 +54,7 @@ DEDR: Reviewed</lastedited>
<paragraph role="paragraph" id="par_idN1060E" xml-lang="en-US" l10n="NEW">You can select a table in a text document with a keyboard or with a mouse.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="paragraph" id="par_idN10614" xml-lang="en-US" l10n="NEW">To select a table with the keyboard, move the cursor into the table, and then press <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A until all the cells are selected.</paragraph>
+<paragraph role="paragraph" id="par_idN10614" xml-lang="en-US" l10n="NEW">To select a table with the keyboard, move the cursor into the table, and then press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A until all the cells are selected.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN10633" xml-lang="en-US" l10n="NEW">To select a table with the mouse, move the mouse pointer to a position just above and left of the table. The mouse pointer becomes a diagonal arrow. Click to select the table.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/table_sizing.xhp b/helpcontent2/source/text/swriter/guide/table_sizing.xhp
index bee3ebb172..b0b0b94325 100644
--- a/helpcontent2/source/text/swriter/guide/table_sizing.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_sizing.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: table_sizing.xhp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +32,13 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriterguidetable_sizingxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidetable_sizingxml" indexer="include">
<title id="tit" xml-lang="en-US">Resizing Rows and Columns in a Text Table </title>
<filename>/text/swriter/guide/table_sizing.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-19T12:18:03">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3156108"><bookmark_value>cells; enlarging and reducing in text tables</bookmark_value>
@@ -58,12 +54,12 @@
<paragraph role="paragraph" id="par_id3153140" xml-lang="en-US" l10n="U" oldref="13">You can resize the width of table cells and columns, as well as change the height of table rows.</paragraph>
<table id="tbl_id3149640">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3149615" xml-lang="en-US" l10n="E">
-<image id="img_id3149622" src="res/commandimagelist/sc_optimizetable.png" width="0.222inch" height="0.222inch"><alt id="alt_id3149622" xml-lang="en-US">Icon</alt>
+<image id="img_id3149622" src="res/commandimagelist/sc_optimizetable.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149622" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="paragraph" id="par_id3146497" xml-lang="en-US" l10n="U" oldref="22">You can also distribute rows and columns evenly using the icons on the <emph>Optimize</emph> toolbar on the <emph>Table Bar</emph>.</paragraph>
</tablecell>
</tablerow>
@@ -72,7 +68,7 @@
<paragraph role="heading" id="hd_id3145109" xml-lang="en-US" level="2" l10n="U" oldref="24">Changing the Width of Columns and Cells</paragraph>
<paragraph role="heading" id="hd_id3149574" xml-lang="en-US" level="3" l10n="U" oldref="25">To change the width of a column:</paragraph>
<paragraph role="paragraph" id="par_id3149587" xml-lang="en-US" l10n="U" oldref="26">Do one of the following:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3156246" xml-lang="en-US" l10n="U" oldref="21">Rest the mouse pointer over the column dividing line until the pointer becomes a separator icon, and then drag the line to a new location.</paragraph>
</listitem>
@@ -80,34 +76,38 @@
<paragraph role="listitem" id="par_id3145390" xml-lang="en-US" l10n="U" oldref="27">Rest the mouse pointer over the column dividing line on the ruler until the pointer becomes a separator icon, and then drag the line to a new location.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145411" xml-lang="en-US" l10n="U" oldref="14">Place the cursor in a cell in the column, hold down the <switchinline select="sys"><caseinline select="MAC">Option
+<paragraph role="listitem" id="par_id0918200811260957" xml-lang="en-US" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and then click and drag a line to scale all cells right or below the line.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3145411" xml-lang="en-US" l10n="U" oldref="14">Place the cursor in a cell in the column, hold down the <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> key, and then press the left or the right arrow key.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153364" xml-lang="en-US" l10n="U" oldref="28">To increase the distance from the left edge of the page to the edge of the table, hold down <switchinline select="sys"><caseinline select="MAC">Option
+<paragraph role="listitem" id="par_id3153364" xml-lang="en-US" l10n="U" oldref="28">To increase the distance from the left edge of the page to the edge of the table, hold down <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift, and then press the right arrow key.</paragraph>
</listitem>
</list>
<paragraph role="note" id="par_id3155891" xml-lang="en-US" l10n="U" oldref="29">You can specify the behavior for the arrow keys by choosing <emph>Tools - Options - %PRODUCTNAME Writer - Table</emph>, and selecting the options that you want in the <emph>Keyboard handling</emph> area.</paragraph>
<paragraph role="heading" id="hd_id3149993" xml-lang="en-US" level="3" l10n="U" oldref="30">To change the width of a cell:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3148676" xml-lang="en-US" l10n="U" oldref="31">Hold down <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Ctrl, and then press the left or the right arrow key</paragraph>
+<paragraph role="listitem" id="par_id3148676" xml-lang="en-US" l10n="U" oldref="31">Hold down <switchinline select="sys"><caseinline select="MAC">Option+Command
+</caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>, and then press the left or the right arrow key</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id3153014" xml-lang="en-US" level="2" l10n="U" oldref="32">Changing the Height of a Row</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153035" xml-lang="en-US" l10n="U" oldref="33">To change the height of a row, place the cursor in a cell in the row, hold down the <switchinline select="sys"><caseinline select="MAC">Option
+<paragraph role="listitem" id="par_id3153035" xml-lang="en-US" l10n="U" oldref="33">To change the height of a row, place the cursor in a cell in the row, hold down the <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> key, and then press the up or the down arrow key.</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id8478041" xml-lang="en-US" level="2" l10n="NEW">Resizing a whole Table</paragraph>
<paragraph role="paragraph" id="par_id3358867" xml-lang="en-US" l10n="NEW">To change the width and height of a table, do one of the following:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id5366679" xml-lang="en-US" l10n="NEW">Click inside the table. In the rulers, drag the border between the white and the gray area to resize the table.</paragraph>
</listitem>
@@ -115,11 +115,13 @@
<paragraph role="paragraph" id="par_id1279030" xml-lang="en-US" l10n="NEW">Click inside the table. Choose <item type="menuitem">Table - Table Properties</item> to open a dialog and set the properties to the numbers.</paragraph>
</listitem>
</list>
-<paragraph role="tip" id="par_id5009308" xml-lang="en-US" l10n="NEW">To wrap text to the sides of a table, and to arrange two tables next to another, you must insert the tables into a frame. Click inside the table, press <item type="keycode">Ctrl+A</item> twice to select the whole table, then choose <emph>Insert - Frame</emph>.</paragraph>
+<paragraph role="tip" id="par_id5009308" xml-lang="en-US" l10n="NEW">To wrap text to the sides of a table, and to arrange two tables next to another, you must insert the tables into a frame. Click inside the table, press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A twice to select the whole table, then choose <emph>Insert - Frame</emph>.</paragraph>
<paragraph role="note" id="par_id4190496" xml-lang="en-US" l10n="NEW">Tables within HTML pages do not offer the full range of properties and commands as tables in OpenDocument format.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/tablemode.xhp#tablemode"/>
<embed href="text/swriter/guide/table_cells.xhp#table_cells"/>
<embed href="text/swriter/guide/table_cellmerge.xhp#table_cellmerge"/>
+<embed href="text/swriter/guide/ruler.xhp#ruler"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/templates_styles.xhp b/helpcontent2/source/text/swriter/guide/templates_styles.xhp
index b3ade20fb2..f64b26f08f 100644
--- a/helpcontent2/source/text/swriter/guide/templates_styles.xhp
+++ b/helpcontent2/source/text/swriter/guide/templates_styles.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -12,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: templates_styles.xhp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -33,11 +32,10 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textswriterguidetemplates_stylesxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidetemplates_stylesxml" indexer="include">
<title id="tit" xml-lang="en-US">Templates and Styles</title>
<filename>/text/swriter/guide/templates_styles.xhp</filename>
</topic>
@@ -50,11 +48,11 @@
</bookmark>
<paragraph role="heading" id="hd_id3153396" xml-lang="en-US" level="1" l10n="U" oldref="15"><variable id="templates_styles"><link href="text/swriter/guide/templates_styles.xhp" name="Templates and Styles">Templates and Styles</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149635" xml-lang="en-US" l10n="U" oldref="2">A template is a document that contains specific formatting styles, graphics, tables, object, and other information. A template is used as the basis for creating other documents. For example, you can define paragraph and character styles in a document, save the document as a template, and then use the template to create a new document with the same styles.</paragraph>
+<paragraph role="paragraph" id="par_id3149635" xml-lang="en-US" l10n="U" oldref="2">A template is a document that contains specific formatting styles, graphics, tables, objects, and other information. A template is used as the basis for creating other documents. For example, you can define paragraph and character styles in a document, save the document as a template, and then use the template to create a new document with the same styles.</paragraph>
<paragraph role="paragraph" id="par_id3149957" xml-lang="en-US" l10n="CHG" oldref="18">Unless you specify otherwise, every new $[officename] text document is based on the default template.</paragraph>
<paragraph role="paragraph" id="par_id3149974" xml-lang="en-US" l10n="U" oldref="3">$[officename] has a number of <link href="text/swriter/01/05130000.xhp" name="predefined templates">predefined templates</link> that you can use to create different types or text documents, such as business letters.</paragraph>
<paragraph role="heading" id="hd_id3149613" xml-lang="en-US" level="2" l10n="U" oldref="4">Viewing and Organizing Styles in Templates</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN106B0" xml-lang="en-US" l10n="NEW">Use the <link href="text/shared/01/01110100.xhp" name="Template Management">Template Management</link> dialog to copy styles from one document to another.</paragraph>
</listitem>
@@ -65,7 +63,6 @@
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/load_styles.xhp#load_styles"/>
<embed href="text/swriter/guide/change_header.xhp#change_header"/>
-<embed href="text/swriter/guide/para_style_quickuse.xhp#para_style_quickuse"/>
<embed href="text/swriter/guide/stylist_fillformat.xhp#stylist_fillformat"/>
<embed href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/>
<embed href="text/swriter/guide/template_default.xhp#template_default"/>
diff --git a/helpcontent2/source/text/swriter/guide/text_emphasize.xhp b/helpcontent2/source/text/swriter/guide/text_emphasize.xhp
index e8f55ebdec..bb8f2fbfb4 100644
--- a/helpcontent2/source/text/swriter/guide/text_emphasize.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_emphasize.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: text_emphasize.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriterguidetext_emphasizexml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidetext_emphasizexml" indexer="include">
<title id="tit" xml-lang="en-US">Emphasizing Text</title>
<filename>/text/swriter/guide/text_emphasize.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-07T16:39:19">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149820"><bookmark_value>text; emphasizing</bookmark_value>
@@ -49,7 +47,7 @@
<paragraph role="heading" id="hd_id3149820" xml-lang="en-US" level="1" l10n="U" oldref="65"><variable id="text_emphasize"><link href="text/swriter/guide/text_emphasize.xhp" name="Emphasizing Text">Emphasizing Text</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="66">Here are a few examples of how to emphasize text in a document:</paragraph>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3147412" xml-lang="en-US" l10n="U" oldref="67">Select the text and apply a different font style or effect, such as <emph>bold</emph>.</paragraph>
</listitem>
@@ -60,12 +58,12 @@
<paragraph role="listitem" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="69">Select the text, and then choose <emph>Insert Frame</emph>.</paragraph>
</listitem>
</list>
-<list type="unordered">
+<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id6924649" xml-lang="en-US" l10n="CHG">Use the Text tool on the Drawing toolbar. </paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_idN106E7" xml-lang="en-US" l10n="NEW">Use Fontwork. To open the Fontwork window, click the Fontwork icon on the Drawing bar.</paragraph>
+<paragraph role="paragraph" id="par_idN106E7" xml-lang="en-US" l10n="NEW">Use Fontwork. To open the Fontwork window, click the Fontwork Gallery icon on the Drawing bar.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/guide/text_nav_keyb.xhp b/helpcontent2/source/text/swriter/guide/text_nav_keyb.xhp
index d519ed9001..783c010b22 100755
--- a/helpcontent2/source/text/swriter/guide/text_nav_keyb.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_nav_keyb.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: text_nav_keyb.xhp,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,20 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriterguidetext_nav_keybxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguidetext_nav_keybxml" indexer="include">
<title id="tit" xml-lang="en-US">Navigating and Selecting With the Keyboard</title>
<filename>/text/swriter/guide/text_nav_keyb.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-28T12:18:52">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3159260"><bookmark_value>text; navigating and selecting with keyboard</bookmark_value>
@@ -53,15 +49,23 @@
<paragraph role="heading" id="hd_id3159260" xml-lang="en-US" level="1" l10n="U" oldref="33"><variable id="text_nav_keyb"><link href="text/swriter/guide/text_nav_keyb.xhp" name="Navigating and Selecting With the Keyboard">Navigating and Selecting With the Keyboard</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3155179" xml-lang="en-US" l10n="U" oldref="13">You can navigate through a document and make selections with the keyboard.</paragraph>
+<list type="unordered">
+<listitem>
+<paragraph role="paragraph" id="par_id1031200810571916" xml-lang="en-US" l10n="NEW">To move the cursor, press the key or key combination given in the following table.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id1031200810571929" xml-lang="en-US" l10n="NEW">To select the characters under the moving cursor, additionally hold down the Shift key when you move the cursor.</paragraph>
+</listitem>
+</list>
<table id="tbl_id3149487">
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155918" xml-lang="en-US" l10n="U" oldref="23">Key</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3155870" xml-lang="en-US" l10n="U" oldref="24">Function</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablehead" id="par_id3156220" xml-lang="en-US" l10n="U" oldref="25">
<emph>+</emph><switchinline select="sys"><caseinline select="MAC"><emph>Command key</emph>
</caseinline><defaultinline>
@@ -69,92 +73,93 @@
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="26">Right, left arrow keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3150105" xml-lang="en-US" l10n="U" oldref="27">Moves the cursor one character to the left or to the right.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153418" xml-lang="en-US" l10n="U" oldref="28">Moves the cursor one word to the left or to the right.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149629" xml-lang="en-US" l10n="U" oldref="29">Up, down arrow keys</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149949" xml-lang="en-US" l10n="U" oldref="30">Moves the cursor up or down one line.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149972" xml-lang="en-US" l10n="U" oldref="31">(Ctrl+Alt) Moves the current paragraph up or down.</paragraph>
+<tablecell>
+<paragraph role="tablecontent" id="par_id3149972" xml-lang="en-US" l10n="U" oldref="31">(<switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>) Moves the current paragraph up or down.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149624" xml-lang="en-US" l10n="U" oldref="32">Home</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149871" xml-lang="en-US" l10n="U" oldref="56">Moves the cursor to the beginning of the current line.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145108" xml-lang="en-US" l10n="U" oldref="34">Moves the cursor to the beginning of the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149586" xml-lang="en-US" l10n="U" oldref="35">Home</paragraph>
<paragraph role="tablecontent" id="par_id3156237" xml-lang="en-US" l10n="U" oldref="36">In a table</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3156260" xml-lang="en-US" l10n="U" oldref="37">Moves the cursor to the beginning of the contents in the current cell.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3145409" xml-lang="en-US" l10n="U" oldref="38">Moves the cursor to the beginning of the contents of the current cell. Press again to move the cursor to the first cell in the table. Press again to move the cursor to the beginning of the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154410" xml-lang="en-US" l10n="U" oldref="41">End</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153372" xml-lang="en-US" l10n="U" oldref="42">Moves the cursor to the end of the current line.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154235" xml-lang="en-US" l10n="U" oldref="43">Moves the cursor to the end of the document</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154262" xml-lang="en-US" l10n="U" oldref="44">End</paragraph>
<paragraph role="tablecontent" id="par_id3154850" xml-lang="en-US" l10n="U" oldref="45">In a table</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3154873" xml-lang="en-US" l10n="U" oldref="46">Moves to the end of the contents in the current cell.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155894" xml-lang="en-US" l10n="U" oldref="47">Moves the cursor to the end of the contents of the current cell. Press again to move the cursor to the last cell in the table. Press again to move the cursor to the end of the document.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3155944" xml-lang="en-US" l10n="U" oldref="50">PgUp</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148678" xml-lang="en-US" l10n="U" oldref="54">Scrolls up one page.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148701" xml-lang="en-US" l10n="U" oldref="52">Moves the cursor to the header.</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3149998" xml-lang="en-US" l10n="U" oldref="53">PgDn</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3153018" xml-lang="en-US" l10n="U" oldref="51">Scroll down one page.</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
<paragraph role="tablecontent" id="par_id3148949" xml-lang="en-US" l10n="U" oldref="55">Moves the cursor to the footer.</paragraph>
</tablecell>
</tablerow>
diff --git a/helpcontent2/source/text/swriter/guide/using_hyphen.xhp b/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
index 658e9b9027..e56b4dfb73 100644
--- a/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
+++ b/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: using_hyphen.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -94,8 +94,7 @@
<paragraph role="paragraph" id="par_id3154400" xml-lang="en-US" l10n="U" oldref="23">You can insert a hyphen where you want on a line, or let $[officename] search for the words to hyphenate, and then offer a suggested hyphenation.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3153363" xml-lang="en-US" l10n="U" oldref="24">To quickly insert a hyphen, click in the word where you want to add the hyphen, and then press <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Hyphen(-).</paragraph>
+<paragraph role="listitem" id="par_id3153363" xml-lang="en-US" l10n="U" oldref="24">To quickly insert a hyphen, click in the word where you want to add the hyphen, and then press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Hyphen(-).</paragraph>
</listitem>
</list>
<list type="unordered">
diff --git a/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp b/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp
index 578f8e9c11..b9400f50b4 100644
--- a/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp
+++ b/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: using_thesaurus.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.2 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriterguideusing_thesaurusxml" indexer="include" status="PUBLISH">
+<topic id="textswriterguideusing_thesaurusxml" indexer="include">
<title id="tit" xml-lang="en-US">Thesaurus</title>
<filename>/text/swriter/guide/using_thesaurus.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-08-29T12:18:54">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3145576"><bookmark_value>thesaurus; related words</bookmark_value>
@@ -59,7 +57,7 @@
<paragraph role="listitem" id="par_id3155920" xml-lang="en-US" l10n="U" oldref="17">Click in the word that you want to look up.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3155867" xml-lang="en-US" l10n="U" oldref="39">Choose <emph>Tools - Thesaurus</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="listitem" id="par_id3155867" xml-lang="en-US" l10n="CHG" oldref="39">Choose <emph>Tools - Language - Thesaurus</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7.</paragraph>
</listitem>
<listitem>
diff --git a/helpcontent2/source/text/swriter/guide/word_completion.xhp b/helpcontent2/source/text/swriter/guide/word_completion.xhp
index a7261f8e1f..40c9eaa09b 100755
--- a/helpcontent2/source/text/swriter/guide/word_completion.xhp
+++ b/helpcontent2/source/text/swriter/guide/word_completion.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: word_completion.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -55,7 +55,7 @@
</bookmark><comment>mw made a two level entry of "switching off..." and "word completion", copied two entries to word_completion_adjust.xhp and added a new entry</comment><paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="1" l10n="NEW"><variable id="word_completion"><link href="text/swriter/guide/word_completion.xhp">Word Completion for Text Documents</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1076F" xml-lang="en-US" l10n="NEW">$[officename] collects words that you frequently use in the current session. When you later type the first three letters of a collected word, $[officename] automatically completes the word. </paragraph>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="91">If there is more than one word in the AutoCorrect memory that matches the three letters that you type, press <item type="keycode">Ctrl+Tab</item> to cycle through the available words. To cycle in the opposite direction, press <item type="keycode">Ctrl+Shift+Tab</item>. </paragraph>
+<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="91">If there is more than one word in the AutoCorrect memory that matches the three letters that you type, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</item> to cycle through the available words. To cycle in the opposite direction, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Tab</item>. </paragraph>
<paragraph role="heading" id="par_idN1078D" xml-lang="en-US" level="2" l10n="NEW"> Using word completion </paragraph>
<list type="unordered">
<listitem>
diff --git a/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp b/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp
index a9f9a2810a..99d080035d 100644
--- a/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp
+++ b/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: word_completion_adjust.xhp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -98,7 +98,7 @@
<paragraph xml-lang="en-US" id="par_idN107ED" role="paragraph" l10n="NEW"> Select all or some of the words in the list. </paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_idN107F4" role="paragraph" l10n="NEW"> Use Ctrl+C to copy all selected words into the clipboard. Paste the clipboard into a new document and save it to get a reference list of collected words. </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107F4" role="paragraph" l10n="NEW"> Use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C to copy all selected words into the clipboard. Paste the clipboard into a new document and save it to get a reference list of collected words. </paragraph>
<paragraph xml-lang="en-US" id="par_idN10BC6" role="paragraph" l10n="NEW"> Later you can open the reference list and automatically collect the words, so that the word completion feature starts with a defined set of words. </paragraph>
</listitem>
</list>
diff --git a/helpcontent2/source/text/swriter/main0103.xhp b/helpcontent2/source/text/swriter/main0103.xhp
index ce34e7e85e..c9c248921e 100755
--- a/helpcontent2/source/text/swriter/main0103.xhp
+++ b/helpcontent2/source/text/swriter/main0103.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: main0103.xhp,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -50,7 +50,6 @@
<embed href="text/swriter/01/03130000.xhp#drucklayout"/>
<embed href="text/swriter/01/03120000.xhp#webbrowser"/>
<embed href="text/shared/02/19090000.xhp#htmlsource"/>
-<embed href="text/shared/01/03990000.xhp#symbolleisten"/>
<embed href="text/shared/01/03060000.xhp#taskleiste"/>
<embed href="text/shared/01/03040000.xhp#ime"/>
<embed href="text/swriter/01/03050000.xhp#lineal"/>
diff --git a/helpcontent2/source/text/swriter/main0110.xhp b/helpcontent2/source/text/swriter/main0110.xhp
index 7a6e2f303f..fe88a53de0 100755
--- a/helpcontent2/source/text/swriter/main0110.xhp
+++ b/helpcontent2/source/text/swriter/main0110.xhp
@@ -12,7 +12,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: main0110.xhp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -73,10 +73,10 @@
<bookmark xml-lang="en-US" branch="hid/FN_TABLE_SELECT_CELL" id="bm_id6264534" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:EntireCell" id="bm_id6957914" localize="false"/><paragraph role="heading" id="par_idN10635" xml-lang="en-US" level="3" l10n="NEW">Cell</paragraph>
<paragraph role="paragraph" id="par_idN10638" xml-lang="en-US" l10n="NEW"><ahelp hid="20530">Selects the current cell.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="2" l10n="NEW"><link href="text/swriter/01/05100100.xhp">Merge Cells</link></paragraph>
-<embed href="text/swriter/01/05100100.xhp#verbindentext"/>
-<paragraph role="heading" id="par_idN105BB" xml-lang="en-US" level="2" l10n="NEW"><link href="text/swriter/01/05100200.xhp">Split Cells</link></paragraph>
-<embed href="text/swriter/01/05100200.xhp#teilentext"/>
+<paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/05100100.xhp">Merge Cells</link></paragraph>
+<embed href="text/shared/01/05100100.xhp#verbindentext"/>
+<paragraph role="heading" id="par_idN105BB" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/05100200.xhp">Split Cells</link></paragraph>
+<embed href="text/shared/01/05100200.xhp#teilentext"/>
<embed href="text/swriter/01/05200000.xhp#tabelleverb"/>
<embed href="text/swriter/01/05190000.xhp#tabelleauf"/>
<paragraph role="heading" id="par_idN105F7" xml-lang="en-US" level="2" l10n="NEW"><link href="text/swriter/01/05150101.xhp">Table AutoFormat</link></paragraph>
@@ -86,14 +86,14 @@
<paragraph role="paragraph" id="par_idN106B8" xml-lang="en-US" l10n="NEW">Opens the Column Width dialog where you can change the width of a column.</paragraph>
<paragraph role="heading" id="par_idN106BB" xml-lang="en-US" level="3" l10n="NEW"><link href="text/swriter/01/05120200.xhp">Optimal Column Width</link></paragraph>
<embed href="text/swriter/01/05120200.xhp#spaltenbreitetext"/>
-<paragraph role="heading" id="par_idN106D2" xml-lang="en-US" level="3" l10n="NEW"><link href="text/swriter/01/05120600.xhp">Distribute Columns Evenly</link></paragraph>
-<embed href="text/swriter/01/05120600.xhp#verteilentext"/>
+<paragraph role="heading" id="par_idN106D2" xml-lang="en-US" level="3" l10n="NEW"><link href="text/shared/01/05120600.xhp">Distribute Columns Evenly</link></paragraph>
+<embed href="text/shared/01/05120600.xhp#verteilentext"/>
<paragraph role="heading" id="par_idN106E9" xml-lang="en-US" level="3" l10n="NEW">Row Height</paragraph>
<paragraph role="paragraph" id="par_idN106EC" xml-lang="en-US" l10n="NEW">Opens the Row Height dialog where you can change the height of a row.</paragraph>
<paragraph role="heading" id="par_idN106EF" xml-lang="en-US" level="3" l10n="NEW"><link href="text/swriter/01/05110200.xhp">Optimal Row Height</link></paragraph>
<embed href="text/swriter/01/05110200.xhp#zeilenhoehetext"/>
-<paragraph role="heading" id="par_idN10706" xml-lang="en-US" level="3" l10n="NEW"><link href="text/swriter/01/05110600.xhp">Distribute Rows Evenly</link></paragraph>
-<embed href="text/swriter/01/05110600.xhp#verteilentext"/><comment>UFI: removed help ids</comment><paragraph role="heading" id="par_idN1071D" xml-lang="en-US" level="3" l10n="NEW">Allow Row to Break Across Pages and Columns</paragraph>
+<paragraph role="heading" id="par_idN10706" xml-lang="en-US" level="3" l10n="NEW"><link href="text/shared/01/05110600m.xhp">Distribute Rows Evenly</link></paragraph>
+<embed href="text/shared/01/05110600m.xhp#verteilentext"/><comment>UFI: removed help ids</comment><paragraph role="heading" id="par_idN1071D" xml-lang="en-US" level="3" l10n="NEW">Allow Row to Break Across Pages and Columns</paragraph>
<paragraph role="paragraph" id="par_idN10720" xml-lang="en-US" l10n="NEW"><ahelp hid="21753">Allows a page break within the current row.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_TABLE_HEADLINE_REPEAT" id="bm_id7787408" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HeadingRowsRepeat" id="bm_id6419568" localize="false"/><paragraph role="heading" id="par_idN105FF" xml-lang="en-US" level="2" l10n="NEW">Heading Rows Repeat</paragraph>
diff --git a/helpcontent2/source/text/swriter/main0204.xhp b/helpcontent2/source/text/swriter/main0204.xhp
index e1cd188aa3..a1c1b61a1d 100755
--- a/helpcontent2/source/text/swriter/main0204.xhp
+++ b/helpcontent2/source/text/swriter/main0204.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: main0204.xhp,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,18 +30,15 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswritermain0204xml" indexer="include" status="PUBLISH">
+<topic id="textswritermain0204xml" indexer="include">
<title id="tit" xml-lang="en-US">Table Bar</title>
<filename>/text/swriter/main0204.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-11T15:17:15">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="objektleistetabellen">
@@ -62,13 +60,13 @@
<embed href="text/swriter/02/04230000.xhp#sytabellefixprop"/>
<embed href="text/swriter/02/04240000.xhp#tabellevariabel"/>
<embed href="text/swriter/02/04240000.xhp#sytabellevariabel"/>
-<paragraph role="heading" id="hd_id3147592" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/swriter/01/05100100.xhp" name="Merge Cells">Merge Cells</link></paragraph>
-<embed href="text/swriter/01/05100100.xhp#verbindentext"/>
-<embed href="text/swriter/00/00000405.xhp#syzellenverbinden"/>
-<embed href="text/swriter/01/05100200.xhp#zellenteilen"/>
-<embed href="text/swriter/00/00000405.xhp#syzellenteilen"/>
-<embed href="text/swriter/02/04210000.xhp#optimieren"/>
-<embed href="text/swriter/02/04210000.xhp#syoptimieren"/>
+<paragraph role="heading" id="hd_id3147592" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/01/05100100.xhp" name="Merge Cells">Merge Cells</link></paragraph>
+<embed href="text/shared/01/05100100.xhp#verbindentext"/>
+<embed href="text/shared/01/05100100.xhp#syzellenverbinden"/>
+<embed href="text/shared/01/05100200.xhp#zellenteilen"/>
+<embed href="text/shared/01/05100200.xhp#syzellenteilen"/>
+<embed href="text/shared/02/04210000.xhp#optimieren"/>
+<embed href="text/shared/02/04210000.xhp#syoptimieren"/>
<embed href="text/swriter/02/04090000.xhp#zeileeinfuegen"/>
<embed href="text/swriter/02/04090000.xhp#syzeileeinfuegen"/>
<embed href="text/swriter/02/04100000.xhp#spalteeinfuegen"/>
diff --git a/helpcontent2/source/text/swriter/main0503.xhp b/helpcontent2/source/text/swriter/main0503.xhp
index eab52ecd60..ad021c9a97 100755
--- a/helpcontent2/source/text/swriter/main0503.xhp
+++ b/helpcontent2/source/text/swriter/main0503.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: main0503.xhp,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -29,26 +30,21 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswritermain0503xml" indexer="include" status="PUBLISH">
+<topic id="textswritermain0503xml" indexer="include">
<title id="tit" xml-lang="en-US">$[officename] Writer Features</title>
<filename>/text/swriter/main0503.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-11-24T11:08:41">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="waskann">
<paragraph role="heading" id="hd_id3154243" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="main0503"><link href="text/swriter/main0503.xhp" name="$[officename] Writer Features">$[officename] Writer Features</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154263" xml-lang="en-US" l10n="U" oldref="2">$[officename] Writer lets you design and produce text documents that can include graphics, tables, or charts. You can then save the documents in a variety of formats, including Microsoft Word, HTML, or Adobe's Portable Document Format (PDF).</paragraph>
+<paragraph role="paragraph" id="par_id3154263" xml-lang="en-US" l10n="CHG" oldref="2">$[officename] Writer lets you design and produce text documents that can include graphics, tables, or charts. You can then save the documents in a variety of formats, including the standardized OpenDocument format (ODF), Microsoft Word .doc format, or HTML. And you can easily export your document to the Portable Document Format (PDF).</paragraph>
</section>
<paragraph role="heading" id="hd_id3147755" xml-lang="en-US" level="2" l10n="U" oldref="4">Writing</paragraph>
<paragraph role="paragraph" id="par_id3147768" xml-lang="en-US" l10n="U" oldref="5">$[officename] Writer lets you create both basic documents, such as memos, <link href="text/shared/guide/fax.xhp" name="faxes">faxes</link>, letters , resumes and <link href="text/swriter/01/01150000.xhp" name="merge documents">merge documents</link>, as well as long and complex or multi-part documents, complete with bibliographies, reference tables and indexes.</paragraph>
@@ -63,7 +59,7 @@
<paragraph role="heading" id="hd_id3151192" xml-lang="en-US" level="2" l10n="U" oldref="15">Creating Drawings</paragraph>
<paragraph role="paragraph" id="par_id3151206" xml-lang="en-US" l10n="U" oldref="16">The $[officename] Writer <link href="text/shared/02/01140000.xhp" name="drawing tool">drawing tool</link> lets you create drawings, graphics, legends, and other types of drawings directly in text documents.</paragraph>
<paragraph role="heading" id="hd_id3151229" xml-lang="en-US" level="2" l10n="U" oldref="17">Inserting Graphics</paragraph>
-<paragraph role="paragraph" id="par_id3151243" xml-lang="en-US" l10n="U" oldref="18">You can insert pictures with <link href="text/shared/00/00000020.xhp" name="different formats">different formats</link> into a text document, including graphics with a JPG or GIF format. The most common formats can be edited directly in a text document with the image editor. In addition, the <link href="text/shared/01/gallery.xhp" name="Gallery">Gallery</link> provides a collection of clipart graphics organized by theme.</paragraph>
+<paragraph role="paragraph" id="par_id3151243" xml-lang="en-US" l10n="CHG" oldref="18">You can insert pictures with <link href="text/shared/00/00000020.xhp" name="different formats">different formats</link> into a text document, including graphics with a JPG or GIF format. In addition, the <link href="text/shared/01/gallery.xhp" name="Gallery">Gallery</link> provides a collection of clipart graphics, and the <link href="text/shared/guide/fontwork.xhp">Fontwork Gallery</link> creates stunning font effects.</paragraph>
<paragraph role="heading" id="hd_id3155084" xml-lang="en-US" level="2" l10n="U" oldref="21">Flexible Application Interface</paragraph>
<paragraph role="paragraph" id="par_id3155098" xml-lang="en-US" l10n="U" oldref="22">The program interface is designed so that you can configure it according to your preferences, including customizing icons and menus. You can position various program windows, such as the Styles and Formatting window or the Navigator as floating windows anywhere on the screen. You can also <link href="text/shared/guide/autohide.xhp" name="dock">dock</link> some windows to the edge of the workspace.</paragraph>
<paragraph role="heading" id="hd_id3155123" xml-lang="en-US" level="2" l10n="U" oldref="23">Drag&amp;Drop</paragraph>
diff --git a/helpcontent2/source/text/swriter/makefile.mk b/helpcontent2/source/text/swriter/makefile.mk
index 05a95d5272..86b290ab8a 100644
--- a/helpcontent2/source/text/swriter/makefile.mk
+++ b/helpcontent2/source/text/swriter/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.9.4.4 $
#
# This file is part of OpenOffice.org.
#
diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk
index 602173831d..e48d06ae0a 100644
--- a/helpcontent2/util/sbasic/makefile.mk
+++ b/helpcontent2/util/sbasic/makefile.mk
@@ -521,19 +521,25 @@ LINKLINKFILES= \
text$/shared$/01$/05080400.xhp \
text$/shared$/01$/05090000.xhp \
text$/shared$/01$/05100000.xhp \
+ text$/shared$/01$/05100100.xhp \
+ text$/shared$/01$/05100200.xhp \
+ text$/shared$/01$/05100500.xhp \
+ text$/shared$/01$/05100600.xhp \
+ text$/shared$/01$/05100700.xhp \
text$/shared$/01$/05110000.xhp \
text$/shared$/01$/05110100.xhp \
text$/shared$/01$/05110200.xhp \
text$/shared$/01$/05110300.xhp \
text$/shared$/01$/05110400.xhp \
text$/shared$/01$/05110500.xhp \
- text$/shared$/01$/05110600.xhp \
+ text$/shared$/01$/05110600m.xhp \
text$/shared$/01$/05110700.xhp \
text$/shared$/01$/05110800.xhp \
text$/shared$/01$/05120000.xhp \
text$/shared$/01$/05120100.xhp \
text$/shared$/01$/05120200.xhp \
text$/shared$/01$/05120300.xhp \
+ text$/shared$/01$/05120600.xhp \
text$/shared$/01$/05140100.xhp \
text$/shared$/01$/05150101.xhp \
text$/shared$/01$/05190000.xhp \
@@ -722,6 +728,7 @@ LINKLINKFILES= \
text$/shared$/02$/03140000.xhp \
text$/shared$/02$/03150000.xhp \
text$/shared$/02$/03200000.xhp \
+ text$/shared$/02$/04210000.xhp \
text$/shared$/02$/05020000.xhp \
text$/shared$/02$/05090000.xhp \
text$/shared$/02$/05110000.xhp \
@@ -1122,6 +1129,7 @@ LINKLINKFILES= \
text$/shared$/guide$/spadmin.xhp \
text$/shared$/guide$/standard_template.xhp \
text$/shared$/guide$/start_parameters.xhp \
+ text$/shared$/guide$/startcenter.xhp \
text$/shared$/guide$/tabs.xhp \
text$/shared$/guide$/text_color.xhp \
text$/shared$/guide$/textmode_change.xhp \
diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk
index 5d6212c4e2..42af25601d 100644
--- a/helpcontent2/util/scalc/makefile.mk
+++ b/helpcontent2/util/scalc/makefile.mk
@@ -535,19 +535,25 @@ LINKLINKFILES= \
text$/shared$/01$/05080400.xhp \
text$/shared$/01$/05090000.xhp \
text$/shared$/01$/05100000.xhp \
+ text$/shared$/01$/05100100.xhp \
+ text$/shared$/01$/05100200.xhp \
+ text$/shared$/01$/05100500.xhp \
+ text$/shared$/01$/05100600.xhp \
+ text$/shared$/01$/05100700.xhp \
text$/shared$/01$/05110000.xhp \
text$/shared$/01$/05110100.xhp \
text$/shared$/01$/05110200.xhp \
text$/shared$/01$/05110300.xhp \
text$/shared$/01$/05110400.xhp \
text$/shared$/01$/05110500.xhp \
- text$/shared$/01$/05110600.xhp \
+ text$/shared$/01$/05110600m.xhp \
text$/shared$/01$/05110700.xhp \
text$/shared$/01$/05110800.xhp \
text$/shared$/01$/05120000.xhp \
text$/shared$/01$/05120100.xhp \
text$/shared$/01$/05120200.xhp \
text$/shared$/01$/05120300.xhp \
+ text$/shared$/01$/05120600.xhp \
text$/shared$/01$/05140100.xhp \
text$/shared$/01$/05150101.xhp \
text$/shared$/01$/05190000.xhp \
@@ -736,6 +742,7 @@ LINKLINKFILES= \
text$/shared$/02$/03140000.xhp \
text$/shared$/02$/03150000.xhp \
text$/shared$/02$/03200000.xhp \
+ text$/shared$/02$/04210000.xhp \
text$/shared$/02$/05020000.xhp \
text$/shared$/02$/05090000.xhp \
text$/shared$/02$/05110000.xhp \
@@ -1136,6 +1143,7 @@ LINKLINKFILES= \
text$/shared$/guide$/spadmin.xhp \
text$/shared$/guide$/standard_template.xhp \
text$/shared$/guide$/start_parameters.xhp \
+ text$/shared$/guide$/startcenter.xhp \
text$/shared$/guide$/tabs.xhp \
text$/shared$/guide$/text_color.xhp \
text$/shared$/guide$/textmode_change.xhp \
diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk
index ccae08617a..6e068c798b 100644
--- a/helpcontent2/util/schart/makefile.mk
+++ b/helpcontent2/util/schart/makefile.mk
@@ -224,19 +224,25 @@ LINKLINKFILES= \
text$/shared$/01$/05080400.xhp \
text$/shared$/01$/05090000.xhp \
text$/shared$/01$/05100000.xhp \
+ text$/shared$/01$/05100100.xhp \
+ text$/shared$/01$/05100200.xhp \
+ text$/shared$/01$/05100500.xhp \
+ text$/shared$/01$/05100600.xhp \
+ text$/shared$/01$/05100700.xhp \
text$/shared$/01$/05110000.xhp \
text$/shared$/01$/05110100.xhp \
text$/shared$/01$/05110200.xhp \
text$/shared$/01$/05110300.xhp \
text$/shared$/01$/05110400.xhp \
text$/shared$/01$/05110500.xhp \
- text$/shared$/01$/05110600.xhp \
+ text$/shared$/01$/05110600m.xhp \
text$/shared$/01$/05110700.xhp \
text$/shared$/01$/05110800.xhp \
text$/shared$/01$/05120000.xhp \
text$/shared$/01$/05120100.xhp \
text$/shared$/01$/05120200.xhp \
text$/shared$/01$/05120300.xhp \
+ text$/shared$/01$/05120600.xhp \
text$/shared$/01$/05140100.xhp \
text$/shared$/01$/05150101.xhp \
text$/shared$/01$/05190000.xhp \
@@ -425,6 +431,7 @@ LINKLINKFILES= \
text$/shared$/02$/03140000.xhp \
text$/shared$/02$/03150000.xhp \
text$/shared$/02$/03200000.xhp \
+ text$/shared$/02$/04210000.xhp \
text$/shared$/02$/05020000.xhp \
text$/shared$/02$/05090000.xhp \
text$/shared$/02$/05110000.xhp \
@@ -825,6 +832,7 @@ LINKLINKFILES= \
text$/shared$/guide$/spadmin.xhp \
text$/shared$/guide$/standard_template.xhp \
text$/shared$/guide$/start_parameters.xhp \
+ text$/shared$/guide$/startcenter.xhp \
text$/shared$/guide$/tabs.xhp \
text$/shared$/guide$/text_color.xhp \
text$/shared$/guide$/textmode_change.xhp \
diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk
index 318985f908..329d470439 100644
--- a/helpcontent2/util/sdatabase/makefile.mk
+++ b/helpcontent2/util/sdatabase/makefile.mk
@@ -222,19 +222,25 @@ LINKLINKFILES= \
text$/shared$/01$/05080400.xhp \
text$/shared$/01$/05090000.xhp \
text$/shared$/01$/05100000.xhp \
+ text$/shared$/01$/05100100.xhp \
+ text$/shared$/01$/05100200.xhp \
+ text$/shared$/01$/05100500.xhp \
+ text$/shared$/01$/05100600.xhp \
+ text$/shared$/01$/05100700.xhp \
text$/shared$/01$/05110000.xhp \
text$/shared$/01$/05110100.xhp \
text$/shared$/01$/05110200.xhp \
text$/shared$/01$/05110300.xhp \
text$/shared$/01$/05110400.xhp \
text$/shared$/01$/05110500.xhp \
- text$/shared$/01$/05110600.xhp \
+ text$/shared$/01$/05110600m.xhp \
text$/shared$/01$/05110700.xhp \
text$/shared$/01$/05110800.xhp \
text$/shared$/01$/05120000.xhp \
text$/shared$/01$/05120100.xhp \
text$/shared$/01$/05120200.xhp \
text$/shared$/01$/05120300.xhp \
+ text$/shared$/01$/05120600.xhp \
text$/shared$/01$/05140100.xhp \
text$/shared$/01$/05150101.xhp \
text$/shared$/01$/05190000.xhp \
@@ -423,6 +429,7 @@ LINKLINKFILES= \
text$/shared$/02$/03140000.xhp \
text$/shared$/02$/03150000.xhp \
text$/shared$/02$/03200000.xhp \
+ text$/shared$/02$/04210000.xhp \
text$/shared$/02$/05020000.xhp \
text$/shared$/02$/05090000.xhp \
text$/shared$/02$/05110000.xhp \
@@ -823,6 +830,7 @@ LINKLINKFILES= \
text$/shared$/guide$/spadmin.xhp \
text$/shared$/guide$/standard_template.xhp \
text$/shared$/guide$/start_parameters.xhp \
+ text$/shared$/guide$/startcenter.xhp \
text$/shared$/guide$/tabs.xhp \
text$/shared$/guide$/text_color.xhp \
text$/shared$/guide$/textmode_change.xhp \
diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk
index 5690c85f1f..83a303def8 100644
--- a/helpcontent2/util/sdraw/makefile.mk
+++ b/helpcontent2/util/sdraw/makefile.mk
@@ -117,7 +117,9 @@ LINKLINKFILES= \
text$/simpress$/01$/04010000.xhp \
text$/simpress$/01$/04020000.xhp \
text$/simpress$/01$/04030000.xhp \
+ text$/simpress$/01$/04030000m.xhp \
text$/simpress$/01$/04030100.xhp \
+ text$/simpress$/01$/04040000m.xhp \
text$/simpress$/01$/04080100.xhp \
text$/simpress$/01$/04110000.xhp \
text$/simpress$/01$/04110100.xhp \
@@ -133,9 +135,12 @@ LINKLINKFILES= \
text$/simpress$/01$/04990500.xhp \
text$/simpress$/01$/04990600.xhp \
text$/simpress$/01$/04990700.xhp \
+ text$/simpress$/01$/05090000m.xhp \
text$/simpress$/01$/05100000.xhp \
+ text$/simpress$/01$/05110500m.xhp \
text$/simpress$/01$/05120000.xhp \
text$/simpress$/01$/05120100.xhp \
+ text$/simpress$/01$/05120500m.xhp \
text$/simpress$/01$/05130000.xhp \
text$/simpress$/01$/05140000.xhp \
text$/simpress$/01$/05150000.xhp \
@@ -227,6 +232,7 @@ LINKLINKFILES= \
text$/simpress$/guide$/background.xhp \
text$/simpress$/guide$/change_scale.xhp \
text$/simpress$/guide$/footer.xhp \
+ text$/simpress$/guide$/gluepoints.xhp \
text$/simpress$/guide$/html_export.xhp \
text$/simpress$/guide$/html_import.xhp \
text$/simpress$/guide$/individual.xhp \
@@ -451,19 +457,25 @@ LINKLINKFILES= \
text$/shared$/01$/05080400.xhp \
text$/shared$/01$/05090000.xhp \
text$/shared$/01$/05100000.xhp \
+ text$/shared$/01$/05100100.xhp \
+ text$/shared$/01$/05100200.xhp \
+ text$/shared$/01$/05100500.xhp \
+ text$/shared$/01$/05100600.xhp \
+ text$/shared$/01$/05100700.xhp \
text$/shared$/01$/05110000.xhp \
text$/shared$/01$/05110100.xhp \
text$/shared$/01$/05110200.xhp \
text$/shared$/01$/05110300.xhp \
text$/shared$/01$/05110400.xhp \
text$/shared$/01$/05110500.xhp \
- text$/shared$/01$/05110600.xhp \
+ text$/shared$/01$/05110600m.xhp \
text$/shared$/01$/05110700.xhp \
text$/shared$/01$/05110800.xhp \
text$/shared$/01$/05120000.xhp \
text$/shared$/01$/05120100.xhp \
text$/shared$/01$/05120200.xhp \
text$/shared$/01$/05120300.xhp \
+ text$/shared$/01$/05120600.xhp \
text$/shared$/01$/05140100.xhp \
text$/shared$/01$/05150101.xhp \
text$/shared$/01$/05190000.xhp \
@@ -652,6 +664,7 @@ LINKLINKFILES= \
text$/shared$/02$/03140000.xhp \
text$/shared$/02$/03150000.xhp \
text$/shared$/02$/03200000.xhp \
+ text$/shared$/02$/04210000.xhp \
text$/shared$/02$/05020000.xhp \
text$/shared$/02$/05090000.xhp \
text$/shared$/02$/05110000.xhp \
@@ -1052,6 +1065,7 @@ LINKLINKFILES= \
text$/shared$/guide$/spadmin.xhp \
text$/shared$/guide$/standard_template.xhp \
text$/shared$/guide$/start_parameters.xhp \
+ text$/shared$/guide$/startcenter.xhp \
text$/shared$/guide$/tabs.xhp \
text$/shared$/guide$/text_color.xhp \
text$/shared$/guide$/textmode_change.xhp \
diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk
index e5e9ee0e10..b445220555 100644
--- a/helpcontent2/util/simpress/makefile.mk
+++ b/helpcontent2/util/simpress/makefile.mk
@@ -119,7 +119,9 @@ LINKLINKFILES= \
text$/simpress$/01$/04010000.xhp \
text$/simpress$/01$/04020000.xhp \
text$/simpress$/01$/04030000.xhp \
+ text$/simpress$/01$/04030000m.xhp \
text$/simpress$/01$/04030100.xhp \
+ text$/simpress$/01$/04040000m.xhp \
text$/simpress$/01$/04080100.xhp \
text$/simpress$/01$/04110000.xhp \
text$/simpress$/01$/04110100.xhp \
@@ -135,9 +137,12 @@ LINKLINKFILES= \
text$/simpress$/01$/04990500.xhp \
text$/simpress$/01$/04990600.xhp \
text$/simpress$/01$/04990700.xhp \
+ text$/simpress$/01$/05090000m.xhp \
text$/simpress$/01$/05100000.xhp \
+ text$/simpress$/01$/05110500m.xhp \
text$/simpress$/01$/05120000.xhp \
text$/simpress$/01$/05120100.xhp \
+ text$/simpress$/01$/05120500m.xhp \
text$/simpress$/01$/05130000.xhp \
text$/simpress$/01$/05140000.xhp \
text$/simpress$/01$/05150000.xhp \
@@ -229,6 +234,7 @@ LINKLINKFILES= \
text$/simpress$/guide$/background.xhp \
text$/simpress$/guide$/change_scale.xhp \
text$/simpress$/guide$/footer.xhp \
+ text$/simpress$/guide$/gluepoints.xhp \
text$/simpress$/guide$/html_export.xhp \
text$/simpress$/guide$/html_import.xhp \
text$/simpress$/guide$/individual.xhp \
@@ -453,19 +459,25 @@ LINKLINKFILES= \
text$/shared$/01$/05080400.xhp \
text$/shared$/01$/05090000.xhp \
text$/shared$/01$/05100000.xhp \
+ text$/shared$/01$/05100100.xhp \
+ text$/shared$/01$/05100200.xhp \
+ text$/shared$/01$/05100500.xhp \
+ text$/shared$/01$/05100600.xhp \
+ text$/shared$/01$/05100700.xhp \
text$/shared$/01$/05110000.xhp \
text$/shared$/01$/05110100.xhp \
text$/shared$/01$/05110200.xhp \
text$/shared$/01$/05110300.xhp \
text$/shared$/01$/05110400.xhp \
text$/shared$/01$/05110500.xhp \
- text$/shared$/01$/05110600.xhp \
+ text$/shared$/01$/05110600m.xhp \
text$/shared$/01$/05110700.xhp \
text$/shared$/01$/05110800.xhp \
text$/shared$/01$/05120000.xhp \
text$/shared$/01$/05120100.xhp \
text$/shared$/01$/05120200.xhp \
text$/shared$/01$/05120300.xhp \
+ text$/shared$/01$/05120600.xhp \
text$/shared$/01$/05140100.xhp \
text$/shared$/01$/05150101.xhp \
text$/shared$/01$/05190000.xhp \
@@ -654,6 +666,7 @@ LINKLINKFILES= \
text$/shared$/02$/03140000.xhp \
text$/shared$/02$/03150000.xhp \
text$/shared$/02$/03200000.xhp \
+ text$/shared$/02$/04210000.xhp \
text$/shared$/02$/05020000.xhp \
text$/shared$/02$/05090000.xhp \
text$/shared$/02$/05110000.xhp \
@@ -1054,6 +1067,7 @@ LINKLINKFILES= \
text$/shared$/guide$/spadmin.xhp \
text$/shared$/guide$/standard_template.xhp \
text$/shared$/guide$/start_parameters.xhp \
+ text$/shared$/guide$/startcenter.xhp \
text$/shared$/guide$/tabs.xhp \
text$/shared$/guide$/text_color.xhp \
text$/shared$/guide$/textmode_change.xhp \
diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk
index 78f56fb90b..dca2dc7cef 100644
--- a/helpcontent2/util/smath/makefile.mk
+++ b/helpcontent2/util/smath/makefile.mk
@@ -302,19 +302,25 @@ LINKLINKFILES= \
text$/shared$/01$/05080400.xhp \
text$/shared$/01$/05090000.xhp \
text$/shared$/01$/05100000.xhp \
+ text$/shared$/01$/05100100.xhp \
+ text$/shared$/01$/05100200.xhp \
+ text$/shared$/01$/05100500.xhp \
+ text$/shared$/01$/05100600.xhp \
+ text$/shared$/01$/05100700.xhp \
text$/shared$/01$/05110000.xhp \
text$/shared$/01$/05110100.xhp \
text$/shared$/01$/05110200.xhp \
text$/shared$/01$/05110300.xhp \
text$/shared$/01$/05110400.xhp \
text$/shared$/01$/05110500.xhp \
- text$/shared$/01$/05110600.xhp \
+ text$/shared$/01$/05110600m.xhp \
text$/shared$/01$/05110700.xhp \
text$/shared$/01$/05110800.xhp \
text$/shared$/01$/05120000.xhp \
text$/shared$/01$/05120100.xhp \
text$/shared$/01$/05120200.xhp \
text$/shared$/01$/05120300.xhp \
+ text$/shared$/01$/05120600.xhp \
text$/shared$/01$/05140100.xhp \
text$/shared$/01$/05150101.xhp \
text$/shared$/01$/05190000.xhp \
@@ -503,6 +509,7 @@ LINKLINKFILES= \
text$/shared$/02$/03140000.xhp \
text$/shared$/02$/03150000.xhp \
text$/shared$/02$/03200000.xhp \
+ text$/shared$/02$/04210000.xhp \
text$/shared$/02$/05020000.xhp \
text$/shared$/02$/05090000.xhp \
text$/shared$/02$/05110000.xhp \
@@ -903,6 +910,7 @@ LINKLINKFILES= \
text$/shared$/guide$/spadmin.xhp \
text$/shared$/guide$/standard_template.xhp \
text$/shared$/guide$/start_parameters.xhp \
+ text$/shared$/guide$/startcenter.xhp \
text$/shared$/guide$/tabs.xhp \
text$/shared$/guide$/text_color.xhp \
text$/shared$/guide$/textmode_change.xhp \
diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk
index 47312fbcdf..caf3bc42b3 100644
--- a/helpcontent2/util/swriter/makefile.mk
+++ b/helpcontent2/util/swriter/makefile.mk
@@ -159,26 +159,19 @@ LINKLINKFILES= \
text$/swriter$/01$/05090201.xhp \
text$/swriter$/01$/05090300.xhp \
text$/swriter$/01$/05100000.xhp \
- text$/swriter$/01$/05100100.xhp \
- text$/swriter$/01$/05100200.xhp \
text$/swriter$/01$/05100300.xhp \
text$/swriter$/01$/05100400.xhp \
- text$/swriter$/01$/05100500.xhp \
- text$/swriter$/01$/05100600.xhp \
- text$/swriter$/01$/05100700.xhp \
text$/swriter$/01$/05110000.xhp \
text$/swriter$/01$/05110100.xhp \
text$/swriter$/01$/05110200.xhp \
text$/swriter$/01$/05110300.xhp \
text$/swriter$/01$/05110500.xhp \
- text$/swriter$/01$/05110600.xhp \
text$/swriter$/01$/05120000.xhp \
text$/swriter$/01$/05120100.xhp \
text$/swriter$/01$/05120200.xhp \
text$/swriter$/01$/05120300.xhp \
text$/swriter$/01$/05120400.xhp \
text$/swriter$/01$/05120500.xhp \
- text$/swriter$/01$/05120600.xhp \
text$/swriter$/01$/05130000.xhp \
text$/swriter$/01$/05130002.xhp \
text$/swriter$/01$/05130004.xhp \
@@ -242,7 +235,6 @@ LINKLINKFILES= \
text$/swriter$/02$/03220000.xhp \
text$/swriter$/02$/04090000.xhp \
text$/swriter$/02$/04100000.xhp \
- text$/swriter$/02$/04210000.xhp \
text$/swriter$/02$/04220000.xhp \
text$/swriter$/02$/04230000.xhp \
text$/swriter$/02$/04240000.xhp \
@@ -368,7 +360,6 @@ LINKLINKFILES= \
text$/swriter$/guide$/pagenumbers.xhp \
text$/swriter$/guide$/pageorientation.xhp \
text$/swriter$/guide$/pagestyles.xhp \
- text$/swriter$/guide$/para_style_quickuse.xhp \
text$/swriter$/guide$/print_brochure.xhp \
text$/swriter$/guide$/print_preview.xhp \
text$/swriter$/guide$/print_small.xhp \
@@ -624,19 +615,25 @@ LINKLINKFILES= \
text$/shared$/01$/05080400.xhp \
text$/shared$/01$/05090000.xhp \
text$/shared$/01$/05100000.xhp \
+ text$/shared$/01$/05100100.xhp \
+ text$/shared$/01$/05100200.xhp \
+ text$/shared$/01$/05100500.xhp \
+ text$/shared$/01$/05100600.xhp \
+ text$/shared$/01$/05100700.xhp \
text$/shared$/01$/05110000.xhp \
text$/shared$/01$/05110100.xhp \
text$/shared$/01$/05110200.xhp \
text$/shared$/01$/05110300.xhp \
text$/shared$/01$/05110400.xhp \
text$/shared$/01$/05110500.xhp \
- text$/shared$/01$/05110600.xhp \
+ text$/shared$/01$/05110600m.xhp \
text$/shared$/01$/05110700.xhp \
text$/shared$/01$/05110800.xhp \
text$/shared$/01$/05120000.xhp \
text$/shared$/01$/05120100.xhp \
text$/shared$/01$/05120200.xhp \
text$/shared$/01$/05120300.xhp \
+ text$/shared$/01$/05120600.xhp \
text$/shared$/01$/05140100.xhp \
text$/shared$/01$/05150101.xhp \
text$/shared$/01$/05190000.xhp \
@@ -825,6 +822,7 @@ LINKLINKFILES= \
text$/shared$/02$/03140000.xhp \
text$/shared$/02$/03150000.xhp \
text$/shared$/02$/03200000.xhp \
+ text$/shared$/02$/04210000.xhp \
text$/shared$/02$/05020000.xhp \
text$/shared$/02$/05090000.xhp \
text$/shared$/02$/05110000.xhp \
@@ -1225,6 +1223,7 @@ LINKLINKFILES= \
text$/shared$/guide$/spadmin.xhp \
text$/shared$/guide$/standard_template.xhp \
text$/shared$/guide$/start_parameters.xhp \
+ text$/shared$/guide$/startcenter.xhp \
text$/shared$/guide$/tabs.xhp \
text$/shared$/guide$/text_color.xhp \
text$/shared$/guide$/textmode_change.xhp \